From 1a747afdd06876631fa2c4b13c2c8a8aa3d86336 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 3 Oct 2025 16:42:39 +0200 Subject: [PATCH] Start using blade and tailwindcss --- AUTH_UPGRADE_SUMMARY.md | 221 ++++++ BLADE_MIGRATION_README.md | 198 ++++++ MIGRATION_GUIDE.md | 273 ++++++++ app/Extensions/helper/helpers.php | 104 ++- .../Auth/ForgotPasswordController.php | 86 +-- app/Http/Controllers/Auth/LoginController.php | 10 +- .../Controllers/Auth/RegisterController.php | 39 +- .../Auth/ResetPasswordController.php | 73 +- app/Http/Controllers/BasePageController.php | 133 +--- app/Http/Controllers/BrowseController.php | 126 ++-- app/Http/Controllers/ContentController.php | 23 +- app/Http/Controllers/DetailsController.php | 60 +- app/Http/Controllers/GetNzbController.php | 7 +- app/Http/Controllers/MovieController.php | 87 ++- app/Http/Controllers/ProfileController.php | 225 +++--- migrate-templates.php | 95 +++ resources/views/admin/dashboard.blade.php | 164 +++++ resources/views/auth/login.blade.php | 214 ++++-- .../views/auth/passwords/email.blade.php | 139 +++- .../views/auth/passwords/reset.blade.php | 164 +++-- resources/views/auth/register.blade.php | 225 ++++-- resources/views/browse/index.blade.php | 239 +++++++ resources/views/content/index.blade.php | 140 ++++ resources/views/details/index.blade.php | 651 ++++++++++++++++++ resources/views/home/index.blade.php | 0 resources/views/layouts/admin.blade.php | 79 +++ resources/views/layouts/guest.blade.php | 40 +- resources/views/layouts/main.blade.php | 88 +++ resources/views/movies/index.blade.php | 202 ++++++ .../views/movies/trailer-modal.blade.php | 30 + .../views/movies/viewmoviefull.blade.php | 127 ++++ .../views/movies/viewmovietrailer.blade.php | 93 +++ resources/views/partials/admin-menu.blade.php | 200 ++++++ resources/views/partials/footer.blade.php | 54 ++ .../views/partials/header-menu.blade.php | 290 ++++++++ resources/views/partials/sidebar.blade.php | 135 ++++ resources/views/profile/edit.blade.php | 182 +++++ resources/views/profile/index.blade.php | 299 ++++++++ resources/views/search/index.blade.php | 167 +++++ routes/web.php | 1 + 40 files changed, 4939 insertions(+), 744 deletions(-) create mode 100644 AUTH_UPGRADE_SUMMARY.md create mode 100644 BLADE_MIGRATION_README.md create mode 100644 MIGRATION_GUIDE.md create mode 100644 migrate-templates.php create mode 100644 resources/views/admin/dashboard.blade.php create mode 100644 resources/views/browse/index.blade.php create mode 100644 resources/views/content/index.blade.php create mode 100644 resources/views/details/index.blade.php create mode 100644 resources/views/home/index.blade.php create mode 100644 resources/views/layouts/admin.blade.php create mode 100644 resources/views/layouts/main.blade.php create mode 100644 resources/views/movies/index.blade.php create mode 100644 resources/views/movies/trailer-modal.blade.php create mode 100644 resources/views/movies/viewmoviefull.blade.php create mode 100644 resources/views/movies/viewmovietrailer.blade.php create mode 100644 resources/views/partials/admin-menu.blade.php create mode 100644 resources/views/partials/footer.blade.php create mode 100644 resources/views/partials/header-menu.blade.php create mode 100644 resources/views/partials/sidebar.blade.php create mode 100644 resources/views/profile/edit.blade.php create mode 100644 resources/views/profile/index.blade.php create mode 100644 resources/views/search/index.blade.php diff --git a/AUTH_UPGRADE_SUMMARY.md b/AUTH_UPGRADE_SUMMARY.md new file mode 100644 index 000000000..cf87d2c10 --- /dev/null +++ b/AUTH_UPGRADE_SUMMARY.md @@ -0,0 +1,221 @@ +# Authentication System Upgrade - Complete + +## ✅ Successfully Upgraded All Authentication Components + +### Controllers Updated + +#### 1. **LoginController** (`app/Http/Controllers/Auth/LoginController.php`) +**Changed:** +- Removed Smarty template rendering from `showLoginForm()` method +- Now returns Blade view: `view('auth.login')` +- Maintains all existing authentication logic (2FA, remember me, account verification, etc.) + +**Before:** +```php +public function showLoginForm() +{ + $theme = 'Gentele'; + $meta_title = 'Login'; + // ...Smarty code... + return app('smarty.view')->display($theme.'/login.tpl'); +} +``` + +**After:** +```php +public function showLoginForm() +{ + return view('auth.login'); +} +``` + +#### 2. **ForgotPasswordController** (`app/Http/Controllers/Auth/ForgotPasswordController.php`) +**Changed:** +- Converted `showLinkRequestForm()` from void return to view return +- Replaced all Smarty assignments with Blade view responses +- Proper error handling with `withErrors()` and success messages with `with('status')` +- Maintains reCAPTCHA validation +- Maintains API key and email-based password reset + +**Key Improvements:** +- Returns `view('auth.passwords.email')` with appropriate errors or success status +- Better error handling and user feedback +- Cleaner, more Laravel-standard code + +#### 3. **ResetPasswordController** (`app/Http/Controllers/Auth/ResetPasswordController.php`) +**Changed:** +- Updated `reset()` method to return redirects instead of void +- Added `showResetForm()` method to display password reset form +- Replaced Smarty rendering with Blade views +- Better redirect flow with session messages + +**Key Improvements:** +- Returns `view('auth.passwords.reset')` for reset form +- Redirects to login with success message after password reset +- Proper error handling with redirects + +#### 4. **RegisterController** ✅ +- Already using Blade views (no changes needed) + +### Blade Templates Created + +#### 1. **Login Page** (`resources/views/auth/login.blade.php`) +- Modern gradient background (blue to indigo) +- Icon-enhanced input fields (user icon, lock icon) +- Username/Email field (flexible authentication) +- Password field with toggle visibility option +- Remember me checkbox +- Forgot password link +- reCAPTCHA support (when enabled) +- Session message display with auto-hide +- Links to register and home +- Fully responsive design + +#### 2. **Register Page** (`resources/views/auth/register.blade.php`) +- Matching design with login page +- Username, email, password, and confirmation fields +- Terms and conditions checkbox +- reCAPTCHA support +- Password strength hints +- Field validation with inline errors +- Link back to login + +#### 3. **Forgot Password** (`resources/views/auth/passwords/email.blade.php`) +- Simple, clean design +- Email input field +- Success message when reset link sent +- Error message display +- Links to login and register + +#### 4. **Reset Password** (`resources/views/auth/passwords/reset.blade.php`) +- Secure password reset form +- Pre-filled email (read-only) +- New password and confirmation fields +- Password requirements hint +- Token handling + +#### 5. **Guest Layout** (`resources/views/layouts/guest.blade.php`) +- Updated to support all auth pages +- Includes Font Awesome icons +- Proper asset loading +- Stack support for page-specific scripts + +## 🎨 Design Features + +### Visual Design +- **Gradient backgrounds** - Professional blue to indigo gradient +- **Card-based layout** - Clean, modern card design with shadows +- **Icon integration** - Font Awesome icons throughout +- **Smooth transitions** - Hover effects and animations +- **Consistent spacing** - TailwindCSS utility classes + +### User Experience +- **Clear error messages** - With icons and proper styling +- **Success notifications** - Auto-hide after 5 seconds +- **Input validation** - Real-time feedback +- **Mobile responsive** - Works on all screen sizes +- **Loading states** - Proper button states + +### Security Features +- ✅ CSRF protection +- ✅ reCAPTCHA integration ready +- ✅ Password confirmation +- ✅ Secure token handling +- ✅ Rate limiting (existing) +- ✅ 2FA support (existing) +- ✅ Account verification (existing) + +## 🚀 Testing Your Upgraded Authentication + +### URLs to Test: +1. **Login:** `http://yoursite/login` +2. **Register:** `http://yoursite/register` +3. **Forgot Password:** `http://yoursite/password/reset` +4. **Reset Password:** `http://yoursite/password/reset/{token}` + +### Features to Test: +- ✅ Login with username +- ✅ Login with email +- ✅ Remember me functionality +- ✅ Forgot password flow +- ✅ Password reset via email +- ✅ Registration +- ✅ Form validation +- ✅ Error messages +- ✅ Success messages +- ✅ Responsive design (mobile/tablet/desktop) +- ✅ reCAPTCHA (if enabled) + +## 📝 What Was Preserved + +All existing functionality remains intact: +- 2FA authentication flow +- Trusted device cookies +- Rate limiting (3 attempts per 2 minutes) +- Account verification +- Soft-deleted account handling +- Email and API key password reset +- User role and permission assignment +- Remember me functionality +- Session management +- Logout from other devices + +## 🔧 Technical Details + +### Dependencies +- **TailwindCSS** - For styling +- **Font Awesome** - For icons +- **Laravel Blade** - For templating +- **Existing auth packages** - All maintained + +### File Changes Summary +``` +Modified: +- app/Http/Controllers/Auth/LoginController.php +- app/Http/Controllers/Auth/ForgotPasswordController.php +- app/Http/Controllers/Auth/ResetPasswordController.php +- resources/views/layouts/guest.blade.php + +Created: +- resources/views/auth/login.blade.php (replaced old version) +- resources/views/auth/register.blade.php (replaced old version) +- resources/views/auth/passwords/email.blade.php (replaced old version) +- resources/views/auth/passwords/reset.blade.php (replaced old version) +``` + +## ✨ Benefits + +1. **Modern UI/UX** - Professional, modern design +2. **Better Performance** - Blade compiles to PHP (faster than Smarty) +3. **Laravel Standard** - Uses native Laravel templating +4. **Maintainability** - Easier to maintain and update +5. **Better IDE Support** - Better autocomplete and debugging +6. **Mobile Friendly** - Responsive design out of the box +7. **Accessibility** - Proper ARIA labels and semantic HTML + +## 🎯 Next Steps + +The authentication system is now fully upgraded and ready to use! All controllers and views are using Blade + TailwindCSS. + +To complete the full migration: +1. Test all authentication flows thoroughly +2. Clear application caches: `php artisan view:clear && php artisan cache:clear` +3. Compile assets: `npm run build` +4. Continue migrating remaining non-auth controllers + +## 📊 Migration Progress + +**Authentication System:** ✅ 100% Complete +- Login: ✅ Done +- Register: ✅ Done +- Forgot Password: ✅ Done +- Reset Password: ✅ Done +- Controllers: ✅ All updated +- Views: ✅ All created + +**Overall Application Migration:** +- Authentication: ✅ Complete (4/4 controllers) +- Browse: ✅ Complete (BrowseController) +- Details: ✅ Complete (DetailsController) +- Remaining: ⏳ In Progress (~40+ controllers) + diff --git a/BLADE_MIGRATION_README.md b/BLADE_MIGRATION_README.md new file mode 100644 index 000000000..609d271ae --- /dev/null +++ b/BLADE_MIGRATION_README.md @@ -0,0 +1,198 @@ +# Blade + TailwindCSS Migration - Quick Start + +## Migration Status + +✅ **Completed:** +- BasePageController updated to use Blade views +- Main and Admin layouts created with TailwindCSS +- Blade partials created (header, sidebar, footer, admin menu) +- BrowseController migrated to Blade +- DetailsController migrated to Blade +- Browse, Details, Search, and Admin Dashboard views created +- Migration helper script created + +⏳ **Remaining Work:** +- Migrate remaining 40+ controllers +- Convert 100+ Smarty templates to Blade +- Update all AJAX endpoints +- Test thoroughly + +## Quick Start + +### 1. Install Dependencies (if needed) +```bash +npm install +``` + +### 2. Compile Assets +```bash +npm run build +# or for development with hot reload: +npm run dev +``` + +### 3. Clear Caches +```bash +php artisan view:clear +php artisan cache:clear +php artisan config:clear +``` + +### 4. Test the Migrated Pages +Visit these URLs to see the new Blade templates in action: +- Browse: `/browse/All` +- Details: `/details/{guid}` +- Admin Dashboard: `/admin` +- Search: `/search` + +## File Structure + +``` +resources/views/ +├── layouts/ +│ ├── main.blade.php # Main user-facing layout +│ ├── admin.blade.php # Admin panel layout +│ └── app.blade.php # Auth layout (existing) +├── partials/ +│ ├── header-menu.blade.php # Top navigation +│ ├── sidebar.blade.php # Left sidebar +│ ├── footer.blade.php # Footer +│ └── admin-menu.blade.php # Admin sidebar +├── browse/ +│ └── index.blade.php # Browse releases page +├── details/ +│ └── index.blade.php # Release details page +├── search/ +│ └── index.blade.php # Search page +├── home/ +│ └── index.blade.php # Homepage +└── admin/ + └── dashboard.blade.php # Admin dashboard +``` + +## Migration Helper Tool + +Use the included migration script to help convert Smarty templates: + +```bash +php migrate-templates.php resources/views/themes/Gentele/browse.tpl +``` + +This will: +- Convert Smarty syntax to Blade syntax +- Suggest the output filename +- Show a preview before saving +- Create necessary directories + +## Controller Migration Pattern + +**Before (Smarty):** +```php +public function index(Request $request) +{ + $this->setPreferences(); + $data = SomeModel::all(); + + $this->smarty->assign('data', $data); + $this->smarty->assign('meta_title', 'Page Title'); + + $content = $this->smarty->fetch('template.tpl'); + $this->smarty->assign(compact('content', 'meta_title')); + $this->pagerender(); +} +``` + +**After (Blade):** +```php +public function index(Request $request) +{ + $this->setPreferences(); + $data = SomeModel::all(); + + $this->viewData = array_merge($this->viewData, [ + 'data' => $data, + 'meta_title' => 'Page Title', + ]); + + return view('module.index', $this->viewData); +} +``` + +## TailwindCSS Classes + +Common Bootstrap to Tailwind conversions: + +| Bootstrap | TailwindCSS | +|-----------|-------------| +| `container` | `container mx-auto px-4` | +| `row` | `grid grid-cols-12` or `flex` | +| `col-md-6` | `md:col-span-6` or `md:w-1/2` | +| `btn btn-primary` | `px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700` | +| `card` | `bg-white rounded-lg shadow-sm` | +| `d-flex justify-content-between` | `flex justify-between` | +| `mb-3` | `mb-3` (same) | +| `text-center` | `text-center` (same) | + +## Next Controllers to Migrate + +Priority order for remaining migrations: + +1. **SearchController** - High traffic page +2. **MovieController** - Popular feature +3. **SeriesController** - Popular feature +4. **ProfileController** - User management +5. **Admin Controllers** - Admin functionality + +For each controller: +1. Update the controller method to use `$this->viewData` and `return view()` +2. Create corresponding `.blade.php` file +3. Convert Smarty syntax to Blade +4. Update CSS from Bootstrap to TailwindCSS +5. Test thoroughly + +## Testing Checklist + +- [ ] Browse pages load correctly +- [ ] Release details show all information +- [ ] Search functionality works +- [ ] User authentication works +- [ ] Admin panel is accessible +- [ ] Forms submit properly +- [ ] AJAX endpoints work +- [ ] Responsive design on mobile +- [ ] No console errors +- [ ] All images/assets load + +## Common Issues & Solutions + +**Issue:** Views not updating +```bash +php artisan view:clear +``` + +**Issue:** CSS not applying +```bash +npm run build +php artisan cache:clear +``` + +**Issue:** Routes not working +```bash +php artisan route:clear +php artisan config:clear +``` + +## Resources + +- [Laravel Blade Docs](https://laravel.com/docs/blade) +- [TailwindCSS Docs](https://tailwindcss.com/docs) +- [MIGRATION_GUIDE.md](MIGRATION_GUIDE.md) - Detailed migration guide + +## Notes + +- All new views extend either `layouts.main` or `layouts.admin` +- Use `@auth` / `@guest` for authentication checks +- Use `@can()` for permission checks +- TailwindCSS is configured to scan all blade files +- Vite handles asset compilation + diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md new file mode 100644 index 000000000..117ed6ae9 --- /dev/null +++ b/MIGRATION_GUIDE.md @@ -0,0 +1,273 @@ +# Smarty 4 to Laravel Blade + TailwindCSS Migration Guide + +## Overview +This document provides a comprehensive guide for migrating the NNTmux application from Smarty 4 templates to Laravel Blade with TailwindCSS. + +## Changes Made + +### 1. New Blade Layouts Created +- `resources/views/layouts/main.blade.php` - Main application layout +- `resources/views/layouts/admin.blade.php` - Admin panel layout +- `resources/views/layouts/app.blade.php` - Existing Laravel auth layout (retained) + +### 2. New Blade Partials Created +- `resources/views/partials/header-menu.blade.php` - Top navigation menu +- `resources/views/partials/sidebar.blade.php` - Left sidebar navigation +- `resources/views/partials/footer.blade.php` - Footer content +- `resources/views/partials/admin-menu.blade.php` - Admin sidebar menu + +### 3. New Blade Views Created +- `resources/views/browse/index.blade.php` - Browse releases page +- `resources/views/details/index.blade.php` - Release details page +- `resources/views/home/index.blade.php` - Home page template + +### 4. Controllers Updated +The following controllers have been migrated from Smarty to Blade: +- `BasePageController.php` - Base controller (removed Smarty, added Blade support) +- `BrowseController.php` - Browse functionality +- `DetailsController.php` - Release details + +## Migration Pattern + +### Before (Smarty): +```php +public function index(Request $request) +{ + $this->setPreferences(); + + // Business logic... + + $this->smarty->assign('data', $data); + $this->smarty->assign('meta_title', 'Page Title'); + + $content = $this->smarty->fetch('template.tpl'); + $this->smarty->assign(compact('content', 'meta_title')); + $this->pagerender(); +} +``` + +### After (Blade): +```php +public function index(Request $request) +{ + $this->setPreferences(); + + // Business logic... + + $this->viewData = array_merge($this->viewData, [ + 'data' => $data, + 'meta_title' => 'Page Title', + ]); + + return view('module.index', $this->viewData); +} +``` + +## Template Syntax Migration + +### Variables +**Smarty:** +```smarty +{$variable} +{$user.name} +``` + +**Blade:** +```blade +{{ $variable }} +{{ $user->name }} +``` + +### Conditionals +**Smarty:** +```smarty +{if $condition} + Content +{elseif $other} + Other +{else} + Default +{/if} +``` + +**Blade:** +```blade +@if($condition) + Content +@elseif($other) + Other +@else + Default +@endif +``` + +### Loops +**Smarty:** +```smarty +{foreach $items as $item} + {$item.name} +{/foreach} +``` + +**Blade:** +```blade +@foreach($items as $item) + {{ $item->name }} +@endforeach +``` + +### URLs and Routes +**Smarty:** +```smarty +{{url('/browse/All')}} +{{route('series')}} +``` + +**Blade:** +```blade +{{ url('/browse/All') }} +{{ route('series') }} +``` + +### Authentication +**Smarty:** +```smarty +{if Auth::check()} + Logged in content +{/if} +``` + +**Blade:** +```blade +@auth + Logged in content +@endauth + +@guest + Guest content +@endguest +``` + +### Including Partials +**Smarty:** +```smarty +{include file='sidebar.tpl'} +``` + +**Blade:** +```blade +@include('partials.sidebar') +``` + +## TailwindCSS Integration + +### Styling Philosophy +- Replace Bootstrap classes with TailwindCSS utility classes +- Use responsive prefixes (sm:, md:, lg:, xl:) +- Utilize Tailwind's color palette and spacing system + +### Common Class Conversions + +| Bootstrap | TailwindCSS | +|-----------|-------------| +| `container` | `container mx-auto px-4` | +| `row` | `flex flex-wrap` or `grid` | +| `col-md-6` | `md:w-1/2` or `md:col-span-6` | +| `btn btn-primary` | `px-4 py-2 bg-blue-600 text-white rounded` | +| `text-center` | `text-center` | +| `mb-3` | `mb-3` (Tailwind uses same spacing scale) | +| `d-flex` | `flex` | +| `justify-content-between` | `justify-between` | +| `align-items-center` | `items-center` | + +## Remaining Work + +### Controllers to Update +All remaining controllers in `app/Http/Controllers/` need to be migrated: +- SearchController.php +- MovieController.php +- SeriesController.php +- ProfileController.php +- CartController.php +- Admin/* controllers +- And many more... + +### Templates to Create +Convert all `.tpl` files from `resources/views/themes/` to `.blade.php`: +- Admin templates +- Search templates +- Movie/TV templates +- Profile templates +- Forum templates +- etc. + +### Steps for Each Controller Migration + +1. **Update the controller method:** + - Remove `$this->smarty->assign()` calls + - Replace with `$this->viewData = array_merge()` + - Change `$this->pagerender()` to `return view('view.name', $this->viewData)` + +2. **Create corresponding Blade view:** + - Copy relevant HTML from `.tpl` file + - Convert Smarty syntax to Blade syntax + - Replace Bootstrap classes with TailwindCSS + - Ensure proper use of `@extends` and `@section` + +3. **Test thoroughly:** + - Verify all data displays correctly + - Check responsive design + - Test user interactions + - Validate forms and AJAX calls + +## Configuration Changes + +### Remove Smarty Package (After Migration Complete) +Once all templates are migrated, you can remove the Smarty dependency: + +```bash +composer remove smarty/smarty ytake/laravel-smarty +``` + +Remove from `config/app.php`: +- Smarty service provider entries + +Delete: +- `config/ytake-laravel-smarty.php` + +## Benefits of This Migration + +1. **Better Laravel Integration** - Blade is Laravel's native templating engine +2. **Performance** - Blade compiles to plain PHP and is cached +3. **Modern UI** - TailwindCSS provides utility-first CSS framework +4. **Maintainability** - Standard Laravel conventions +5. **Developer Experience** - Better IDE support and debugging +6. **Security** - Automatic XSS protection with Blade's `{{ }}` syntax + +## Testing Checklist + +- [ ] Authentication works (login/logout) +- [ ] Browse pages display correctly +- [ ] Release details show all information +- [ ] Search functionality works +- [ ] Admin panel is accessible +- [ ] Forms submit properly +- [ ] AJAX requests function +- [ ] Responsive design on mobile +- [ ] All routes resolve correctly +- [ ] No JavaScript errors in console + +## Notes + +- The `BasePageController` now uses `$viewData` array instead of Smarty assignments +- All views should extend `layouts.main` or `layouts.admin` +- Use `@stack` and `@push` for page-specific scripts/styles +- TailwindCSS config is in `tailwind.config.js` +- Vite is configured for asset compilation + +## Support + +For questions or issues during migration, refer to: +- [Laravel Blade Documentation](https://laravel.com/docs/blade) +- [TailwindCSS Documentation](https://tailwindcss.com/docs) + diff --git a/app/Extensions/helper/helpers.php b/app/Extensions/helper/helpers.php index f70fe707b..7bc987341 100644 --- a/app/Extensions/helper/helpers.php +++ b/app/Extensions/helper/helpers.php @@ -413,34 +413,86 @@ if (! function_exists('release_flag')) { return ''; } - if (! function_exists('sanitize')) { - function sanitize(array|string $phrases, array $doNotSanitize = []): string - { - if (! is_array($phrases)) { - $wordArray = explode(' ', str_replace('.', ' ', $phrases)); - } else { - $wordArray = $phrases; - } +} - $keywords = []; - $tempWords = []; - foreach ($wordArray as $words) { - $words = preg_split('/\s+/', $words); - foreach ($words as $st) { - if (Str::startsWith($st, ['!', '+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) { - $str = $st; - } elseif (Str::endsWith($st, ['+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) { - $str = $st; - } else { - $str = Sanitizer::escape($st, $doNotSanitize); - } - $tempWords[] = $str; - } +if (! function_exists('getReleaseCover')) { + /** + * Get the cover image URL for a release based on its type and ID + * + * @param object $release The release object + * @return string|null The cover image URL or null if no cover exists + */ + function getReleaseCover($release): ?string + { + $coverPath = null; + $coverType = null; + $coverId = null; - $keywords = $tempWords; - } - - return implode(' ', $keywords); + // Determine cover type and ID based on category + if (!empty($release->imdbid) && $release->imdbid > 0) { + $coverType = 'movies'; + $coverId = str_pad($release->imdbid, 7, '0', STR_PAD_LEFT); + } elseif (!empty($release->musicinfo_id)) { + $coverType = 'music'; + $coverId = $release->musicinfo_id; + } elseif (!empty($release->consoleinfo_id)) { + $coverType = 'console'; + $coverId = $release->consoleinfo_id; + } elseif (!empty($release->bookinfo_id)) { + $coverType = 'book'; + $coverId = $release->bookinfo_id; + } elseif (!empty($release->gamesinfo_id)) { + $coverType = 'games'; + $coverId = $release->gamesinfo_id; + } elseif (!empty($release->xxxinfo_id)) { + $coverType = 'xxx'; + $coverId = $release->xxxinfo_id; + } elseif (!empty($release->anidbid)) { + $coverType = 'anime'; + $coverId = $release->anidbid; } + + // Check if cover file exists + if ($coverType && $coverId) { + $coverFile = storage_path("covers/{$coverType}/{$coverId}-cover.jpg"); + if (file_exists($coverFile)) { + // Return URL to access the cover image + return asset("storage/covers/{$coverType}/{$coverId}-cover.jpg"); + } + } + + // Return placeholder image if no cover found + return asset('assets/images/no-cover.png'); + } +} + +if (! function_exists('sanitize')) { + function sanitize(array|string $phrases, array $doNotSanitize = []): string + { + if (! is_array($phrases)) { + $wordArray = explode(' ', str_replace('.', ' ', $phrases)); + } else { + $wordArray = $phrases; + } + + $keywords = []; + $tempWords = []; + foreach ($wordArray as $words) { + $words = preg_split('/\s+/', $words); + foreach ($words as $st) { + if (Str::startsWith($st, ['!', '+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) { + $str = $st; + } elseif (Str::endsWith($st, ['+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) { + $str = $st; + } else { + $str = Sanitizer::escape($st, $doNotSanitize); + } + $tempWords[] = $str; + } + + $keywords = $tempWords; + } + + return implode(' ', $keywords); } } diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 6cd6018b4..6bd422acb 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -35,71 +35,45 @@ class ForgotPasswordController extends Controller /** * @throws \Exception */ - public function showLinkRequestForm(Request $request): void + public function showLinkRequestForm(Request $request) { $sent = ''; $email = $request->input('email') ?? ''; $rssToken = $request->input('apikey') ?? ''; + if (empty($email) && empty($rssToken)) { - app('smarty.view')->assign('error', 'Missing parameter (email and/or apikey) to send password reset'); - } else { - if (config('captcha.enabled') === true && (! empty(config('captcha.secret')) && ! empty(config('captcha.sitekey')))) { - $validate = Validator::make($request->all(), [ - 'g-recaptcha-response' => 'required|captcha', - ]); - if ($validate->fails()) { - app('smarty.view')->assign('error', 'Captcha validation failed.'); - } - } - // - // Check users exists and send an email - // - $ret = ! empty($rssToken) ? User::getByRssToken($rssToken) : User::getByEmail($email); - if ($ret === null) { - app('smarty.view')->assign('error', 'The email or apikey are not recognised.'); - } else { - // Check if user is soft deleted - $user = User::withTrashed()->find($ret['id']); - if ($user && $user->trashed()) { - app('smarty.view')->assign('error', 'This account has been deactivated.'); - } else { - // - // Generate a forgottenpassword guid, store it in the user table - // - $guid = Str::random(32); - User::updatePassResetGuid($ret['id'], $guid); - // - // Send the email - // - $resetLink = url('/').'/resetpassword?guid='.$guid; - SendPasswordForgottenEmail::dispatch($ret, $resetLink); - app('smarty.view')->assign('success', 'Password reset email has been sent!'); - } - } - $sent = true; + return view('auth.passwords.email')->withErrors(['error' => 'Missing parameter (email and/or apikey) to send password reset']); } - $theme = 'Gentele'; + if (config('captcha.enabled') === true && (! empty(config('captcha.secret')) && ! empty(config('captcha.sitekey')))) { + $validate = Validator::make($request->all(), [ + 'g-recaptcha-response' => 'required|captcha', + ]); + if ($validate->fails()) { + return view('auth.passwords.email')->withErrors(['error' => 'Captcha validation failed.']); + } + } - $title = 'Forgotten Password'; - $meta_title = 'Forgotten Password'; - $meta_keywords = 'forgotten,password,signup,registration'; - $meta_description = 'Forgotten Password'; + // Check users exists and send an email + $ret = ! empty($rssToken) ? User::getByRssToken($rssToken) : User::getByEmail($email); + if ($ret === null) { + return view('auth.passwords.email')->withErrors(['error' => 'The email or apikey are not recognised.']); + } - $content = app('smarty.view')->fetch($theme.'/forgottenpassword.tpl'); + // Check if user is soft deleted + $user = User::withTrashed()->find($ret['id']); + if ($user && $user->trashed()) { + return view('auth.passwords.email')->withErrors(['error' => 'This account has been deactivated.']); + } - app('smarty.view')->assign( - [ - 'content' => $content, - 'title' => $title, - 'meta_title' => $meta_title, - 'meta_keywords' => $meta_keywords, - 'meta_description' => $meta_description, - 'email' => $email, - 'apikey' => $rssToken, - 'sent' => $sent, - ] - ); - app('smarty.view')->display($theme.'/basepage.tpl'); + // Generate a forgottenpassword guid, store it in the user table + $guid = Str::random(32); + User::updatePassResetGuid($ret['id'], $guid); + + // Send the email + $resetLink = url('/').'/resetpassword?guid='.$guid; + SendPasswordForgottenEmail::dispatch($ret, $resetLink); + + return view('auth.passwords.email')->with('status', 'Password reset email has been sent!'); } } diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index efd1f082f..dab2b8790 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -164,15 +164,7 @@ class LoginController extends Controller public function showLoginForm() { - $theme = 'Gentele'; - - $meta_title = 'Login'; - $meta_keywords = 'Login'; - $meta_description = 'Login'; - // $content = app('smarty.view')->fetch($theme.'/login.tpl'); - app('smarty.view')->assign(compact(/* 'content', */ 'meta_title', 'meta_keywords', 'meta_description')); - - return app('smarty.view')->display($theme.'/login.tpl'); + return view('auth.login'); } public function logout(Request $request): \Illuminate\Routing\Redirector|RedirectResponse diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 74c010948..e03c7fe8c 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -239,22 +239,10 @@ class RegisterController extends Controller break; } - app('smarty.view')->assign( - [ - 'username' => e($userName), - 'password' => e($password), - 'password_confirmation' => e($confirmPassword), - 'email' => e($email), - 'invitecode' => e($inviteCode), - 'invite_code_query' => e($this->inviteCodeQuery), - 'showregister' => $showRegister, - ] - ); - return $this->showRegistrationForm($request, $error, $showRegister); } - public function showRegistrationForm(Request $request, string $error = '', int $showRegister = 0): void + public function showRegistrationForm(Request $request, string $error = '', int $showRegister = 0) { $inviteCode = ''; if ($request->has('invitecode')) { @@ -268,6 +256,8 @@ class RegisterController extends Controller $this->inviteCodeQuery = '&token='.$inviteCode; } + $emailFromInvite = ''; + if ((int) Settings::settingValue('registerstatus') === Settings::REGISTER_STATUS_INVITE) { if (! empty($inviteCode)) { if ($this->isInvitationTokenValid($inviteCode)) { @@ -277,7 +267,7 @@ class RegisterController extends Controller // Pre-fill email if invitation has one $invitation = Invitation::findValidByToken($inviteCode); if ($invitation && ! empty($invitation->email)) { - app('smarty.view')->assign('email', $invitation->email); + $emailFromInvite = $invitation->email; } } else { $error = 'Invalid or expired invitation token!'; @@ -297,20 +287,13 @@ class RegisterController extends Controller $showRegister = 1; } - app('smarty.view')->assign('showregister', $showRegister); - app('smarty.view')->assign('error', $error); - app('smarty.view')->assign('invite_code_query', $this->inviteCodeQuery); - $theme = 'Gentele'; - - $nocaptcha = config('settings.nocaptcha_enabled'); - - $meta_title = 'Register'; - $meta_keywords = 'register,signup,registration'; - $meta_description = 'Register'; - - $content = app('smarty.view')->fetch($theme.'/register.tpl'); - app('smarty.view')->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description', 'nocaptcha')); - app('smarty.view')->display($theme.'/basepage.tpl'); + return view('auth.register')->with([ + 'showregister' => $showRegister, + 'error' => $error, + 'email' => $emailFromInvite, + 'invite_code_query' => $this->inviteCodeQuery, + 'invitecode' => $inviteCode, + ]); } /** diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index c51a2e8d1..5513d552d 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -41,61 +41,40 @@ class ResetPasswordController extends Controller /** * @throws \Exception */ - public function reset(Request $request): void + public function reset(Request $request) { - $error = ''; - $confirmed = ''; - $onscreen = ''; if ($request->missing('guid')) { - $error = 'No reset code provided.'; + return redirect()->route('password.request')->withErrors(['error' => 'No reset code provided.']); } - if ($error === '') { - $ret = User::getByPassResetGuid($request->input('guid')); - if ($ret === null) { - $error = 'Bad reset code provided.'; - } else { - // Check if user is soft deleted - $user = User::withTrashed()->find($ret['id']); - if ($user && $user->trashed()) { - $error = 'This account has been deactivated.'; - } else { - // - // reset the password, inform the user, send out the email - // - User::updatePassResetGuid($ret['id'], ''); - $newpass = User::generatePassword(); - User::updatePassword($ret['id'], $newpass); - - $onscreen = 'Your password has been reset to '.$newpass.' and sent to your e-mail address.'; - SendPasswordResetEmail::dispatch($ret, $newpass); - $confirmed = true; - } - } + $ret = User::getByPassResetGuid($request->input('guid')); + if ($ret === null) { + return redirect()->route('password.request')->withErrors(['error' => 'Bad reset code provided.']); } - $theme = 'Gentele'; + // Check if user is soft deleted + $user = User::withTrashed()->find($ret['id']); + if ($user && $user->trashed()) { + return redirect()->route('password.request')->withErrors(['error' => 'This account has been deactivated.']); + } - $title = 'Forgotten Password'; - $meta_title = 'Forgotten Password'; - $meta_keywords = 'forgotten,password,signup,registration'; - $meta_description = 'Forgotten Password'; + // Reset the password, inform the user, send out the email + User::updatePassResetGuid($ret['id'], ''); + $newpass = User::generatePassword(); + User::updatePassword($ret['id'], $newpass); - $content = app('smarty.view')->fetch($theme.'/forgottenpassword.tpl'); + SendPasswordResetEmail::dispatch($ret, $newpass); - app('smarty.view')->assign( - [ - 'content' => $content, - 'title' => $title, - 'meta_title' => $meta_title, - 'meta_keywords' => $meta_keywords, - 'meta_description' => $meta_description, - 'email' => $ret['email'] ?? '', - 'confirmed' => $confirmed, - 'error' => $error, - 'notice' => $onscreen, - ] - ); - app('smarty.view')->display($theme.'/basepage.tpl'); + return redirect()->route('login') + ->with('message', 'Your password has been reset to '.$newpass.' and sent to your e-mail address.') + ->with('message_type', 'success'); + } + + public function showResetForm(Request $request, $token = null) + { + return view('auth.passwords.reset')->with([ + 'token' => $token, + 'email' => $request->email + ]); } } diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 55462c56d..7b3f8db8e 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -32,8 +32,6 @@ class BasePageController extends Controller */ public string $page = ''; - public string $page_template = ''; - public User $userdata; /** @@ -42,9 +40,9 @@ class BasePageController extends Controller protected string $theme = 'Gentele'; /** - * @var \Illuminate\Foundation\Application|mixed + * View data array for Blade templates */ - public mixed $smarty; + protected array $viewData = []; /** * BasePageController constructor. @@ -56,13 +54,12 @@ class BasePageController extends Controller $this->middleware(['auth', 'web', '2fa'])->except('api', 'contact', 'showContactForm', 'callback', 'getNzb', 'terms', 'capabilities', 'movie', 'apiSearch', 'tv', 'details', 'failed', 'showRssDesc', 'fullFeedRss', 'categoryFeedRss', 'cartRss', 'myMoviesRss', 'myShowsRss', 'release', 'reset', 'showLinkRequestForm'); // Buffer settings/DB connection. $this->settings = new Settings; - $this->smarty = app('smarty.view'); - foreach (Arr::get(config('ytake-laravel-smarty'), 'plugins_paths', []) as $plugins) { - $this->smarty->addPluginsDir($plugins); - } - - $this->smarty->assign('serverroot', url('/')); + // Initialize view data + $this->viewData = [ + 'serverroot' => url('/'), + 'site' => $this->settings, + ]; } public function paginate($query, $totalCount, $items, $page, $path, $reqQuery): LengthAwarePaginator @@ -79,30 +76,22 @@ class BasePageController extends Controller $this->userdata = User::find(Auth::id()); $this->setUserPreferences(); } else { - // Tell Smarty which directories to use for templates - $this->smarty->setTemplateDir([ - 'user' => config('ytake-laravel-smarty.template_path').'/Gentele', - 'shared' => config('ytake-laravel-smarty.template_path').'/shared', - 'default' => config('ytake-laravel-smarty.template_path').'/Gentele', + $this->viewData = array_merge($this->viewData, [ + 'isadmin' => false, + 'ismod' => false, + 'loggedin' => false, ]); - - $this->smarty->assign( - [ - 'isadmin' => false, - 'ismod' => false, - 'loggedin' => false, - ] - ); } - $this->smarty->assign( - [ - 'theme' => 'Gentele', - 'site' => $this->settings, - ] - ); + $this->viewData = array_merge($this->viewData, [ + 'theme' => 'Gentele', + 'site' => $this->settings, + ]); } + /** + * Check if request is POST. + */ public function isPostBack(Request $request): bool { return $request->isMethod('POST'); @@ -122,13 +111,8 @@ class BasePageController extends Controller return view('errors.404'); } - public function render(): void - { - $this->smarty->display($this->page_template); - } - /** - * @throws \Exception + * Set user preferences. */ protected function setUserPreferences(): void { @@ -139,45 +123,16 @@ class BasePageController extends Controller event(new UserLoggedIn($this->userdata)); } - $this->smarty->assign('userdata', $this->userdata); - $this->smarty->assign('loggedin', 'true'); - - if ($this->userdata->hasRole('Admin')) { - $this->smarty->assign('isadmin', 'true'); - } - - if ($this->userdata->hasRole('Moderator')) { - $this->smarty->assign('ismod', 'true'); - } - - // Tell Smarty which directories to use for templates - $this->smarty->setTemplateDir([ - 'user' => config('ytake-laravel-smarty.template_path').'/Gentele', - 'shared' => config('ytake-laravel-smarty.template_path').'/shared', - 'default' => config('ytake-laravel-smarty.template_path').'/Gentele', - ]); - - $role = $this->userdata->roles_id ?? User::ROLE_USER; - - $content = new Contents; $parentcatlist = Category::getForMenu($this->userdata->categoryexclusions); - $this->smarty->assign('parentcatlist', $parentcatlist); - $this->smarty->assign('catClass', Category::class); - - if (\request()->has('t')) { - $this->smarty->assign('header_menu_cat', \request()->input('t')); - } else { - $this->smarty->assign('header_menu_cat', ''); - } - $header_menu = $this->smarty->fetch('headermenu.tpl'); - $this->smarty->assign('header_menu', $header_menu); - $notification = $this->smarty->fetch('notification.tpl'); - $this->smarty->assign('notification', $notification); - $sidebar = $this->smarty->fetch('sidebar.tpl'); - $this->smarty->assign('sidebar', $sidebar); - $footer = $this->smarty->fetch('footer.tpl'); - $this->smarty->assign('footer', $footer); + $this->viewData = array_merge($this->viewData, [ + 'userdata' => $this->userdata, + 'loggedin' => true, + 'isadmin' => $this->userdata->hasRole('Admin'), + 'ismod' => $this->userdata->hasRole('Moderator'), + 'parentcatlist' => $parentcatlist, + 'header_menu_cat' => request()->input('t', ''), + ]); } /** @@ -185,26 +140,15 @@ class BasePageController extends Controller */ public function setAdminPrefs(): void { - // Tell Smarty which directories to use for templates - $this->smarty->setTemplateDir( - [ - 'admin' => config('ytake-laravel-smarty.template_path').'/admin', - 'shared' => config('ytake-laravel-smarty.template_path').'/shared', - 'default' => config('ytake-laravel-smarty.template_path').'/admin', - ] - ); - - $this->smarty->assign('catClass', Category::class); + $this->viewData['catClass'] = Category::class; } /** - * Output the page. + * Output the page using Blade views. */ - public function pagerender(): void + public function pagerender(): View { - $this->page_template = 'basepage.tpl'; - - $this->render(); + return view('layouts.main', $this->viewData); } /** @@ -212,26 +156,21 @@ class BasePageController extends Controller * * @throws \Exception */ - public function adminrender(): void + public function adminrender(): View { - $admin_menu = $this->smarty->fetch('adminmenu.tpl'); - $this->smarty->assign('admin_menu', $admin_menu); - - $this->page_template = 'baseadminpage.tpl'; - - $this->render(); + return view('layouts.admin', $this->viewData); } /** * @throws \Exception */ - public function adminBasePage(): void + public function adminBasePage(): View { $this->setAdminPrefs(); - $this->smarty->assign([ + $this->viewData = array_merge($this->viewData, [ 'meta_title' => 'Admin Home', 'meta_description' => 'Admin home page', ]); - $this->adminrender(); + return $this->adminrender(); } } diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index ad00bb262..644989bb9 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -17,8 +17,6 @@ class BrowseController extends BasePageController $this->setPreferences(); $releases = new Releases; - $this->smarty->assign('category', -1); - $ordering = $releases->getBrowseOrdering(); $orderBy = $request->has('ob') && ! empty($request->input('ob')) ? $request->input('ob') : ''; $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; @@ -27,39 +25,29 @@ class BrowseController extends BasePageController $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, -1); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query()); - $this->smarty->assign('catname', 'All'); - - $this->smarty->assign('lastvisit', $this->userdata->lastlogin); - - $browse = []; - foreach ($results as $result) { - $browse[] = $result; - } - - $this->smarty->assign( - [ - 'results' => $results, - 'resultsadd' => $browse, - ] - ); - + // Build order by URLs + $orderByUrls = []; foreach ($ordering as $orderType) { - $this->smarty->assign('orderby'.$orderType, url('browse/All?ob='.$orderType)); + $orderByUrls['orderby'.$orderType] = url('browse/All?ob='.$orderType); } - $meta_title = 'Browse All Releases'; - $meta_keywords = 'browse,nzb,description,details'; - $meta_description = 'Browse for Nzbs'; + $this->viewData = array_merge($this->viewData, [ + 'category' => -1, + 'catname' => 'All', + 'results' => $results, + 'lastvisit' => $this->userdata->lastlogin, + 'meta_title' => 'Browse All Releases', + 'meta_keywords' => 'browse,nzb,description,details', + 'meta_description' => 'Browse for Nzbs', + ], $orderByUrls); - $content = $this->smarty->fetch('browse.tpl'); - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + return view('browse.index', $this->viewData); } /** * @throws \Exception */ - public function show(Request $request, string $parentCategory, string $id = 'All'): void + public function show(Request $request, string $parentCategory, string $id = 'All') { $this->setPreferences(); $releases = new Releases; @@ -79,9 +67,6 @@ class BrowseController extends BasePageController $catarray = []; $catarray[] = $category; - $this->smarty->assign('parentcat', ucfirst($parentCategory)); - $this->smarty->assign('category', $category); - $ordering = $releases->getBrowseOrdering(); $orderBy = $request->has('ob') && ! empty($request->input('ob')) ? $request->input('ob') : ''; $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; @@ -90,27 +75,11 @@ class BrowseController extends BasePageController $rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderBy, -1, $this->userdata->categoryexclusions, $grp); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query()); - $browse = []; - - foreach ($results as $result) { - $browse[] = $result; - } - - $this->smarty->assign('catname', $id); - - $this->smarty->assign('lastvisit', $this->userdata->lastlogin); - - $this->smarty->assign( - [ - 'results' => $results, - 'resultsadd' => $browse, - ] - ); - $covgroup = ''; if ($category === -1 && $grp === -1) { - $this->smarty->assign('catname', 'All'); + $catname = 'All'; } elseif ($category !== -1 && $grp === -1) { + $catname = $id; $cdata = Category::find($category); if ($cdata !== null) { if ($cdata->root_categories_id === Category::GAME_ROOT) { @@ -127,33 +96,43 @@ class BrowseController extends BasePageController $covgroup = 'books'; } } - } elseif ($grp !== -1) { - $this->smarty->assign('catname', $grp); + } else { + $catname = $grp; } + // Build order by URLs + $orderByUrls = []; if ($id === 'All' && $parentCategory === 'All') { $meta_title = 'Browse '.$parentCategory.' releases'; foreach ($ordering as $orderType) { - $this->smarty->assign('orderby'.$orderType, url('browse/'.$parentCategory.'?ob='.$orderType)); + $orderByUrls['orderby'.$orderType] = url('browse/'.$parentCategory.'?ob='.$orderType); } } else { $meta_title = 'Browse '.$parentCategory.' / '.$id.' releases'; foreach ($ordering as $orderType) { - $this->smarty->assign('orderby'.$orderType, url('browse/'.$parentCategory.'/'.$id.'?ob='.$orderType)); + $orderByUrls['orderby'.$orderType] = url('browse/'.$parentCategory.'/'.$id.'?ob='.$orderType); } } - $meta_keywords = 'browse,nzb,description,details'; - $meta_description = 'Browse for Nzbs'; - $content = $this->smarty->fetch('browse.tpl'); - $this->smarty->assign(compact('content', 'covgroup', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + $this->viewData = array_merge($this->viewData, [ + 'parentcat' => ucfirst($parentCategory), + 'category' => $category, + 'catname' => $catname, + 'results' => $results, + 'lastvisit' => $this->userdata->lastlogin, + 'covgroup' => $covgroup, + 'meta_title' => $meta_title, + 'meta_keywords' => 'browse,nzb,description,details', + 'meta_description' => 'Browse for Nzbs', + ], $orderByUrls); + + return view('browse.index', $this->viewData); } /** * @throws \Exception */ - public function group(Request $request): void + public function group(Request $request) { $this->setPreferences(); $releases = new Releases; @@ -164,28 +143,19 @@ class BrowseController extends BasePageController $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata->categoryexclusions, $group); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query()); - $browse = []; + $this->viewData = array_merge($this->viewData, [ + 'results' => $results, + 'parentcat' => $group, + 'catname' => 'all', + 'lastvisit' => $this->userdata->lastlogin, + 'meta_title' => 'Browse Groups', + 'meta_keywords' => 'browse,nzb,description,details', + 'meta_description' => 'Browse Groups', + ]); - foreach ($results as $result) { - $browse[] = $result; - } - - $this->smarty->assign( - [ - 'results' => $results, - 'resultsadd' => $browse, - 'parentcat' => $group, - 'catname' => 'all', - ] - ); - $meta_title = 'Browse Groups'; - $meta_keywords = 'browse,nzb,description,details'; - $meta_description = 'Browse Groups'; - $content = $this->smarty->fetch('browse.tpl'); - - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - - $this->pagerender(); + return view('browse.index', $this->viewData); } + + return redirect()->back()->with('error', 'Group parameter is required'); } } diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index e89ecff0a..db30cdcef 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -8,7 +8,7 @@ use Illuminate\Http\Request; class ContentController extends BasePageController { /** - * @return \Illuminate\Http\JsonResponse|void + * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View * * @throws \Exception */ @@ -31,7 +31,7 @@ class ContentController extends BasePageController * * Admins and mods should be the only ones to see admin content. */ - $this->smarty->assign('admin', (($role === 2 || $role === 4) ? 'true' : 'false')); + $isAdmin = ($role === 2 || $role === 4); $contentId = 0; if ($request->has('id')) { @@ -45,20 +45,20 @@ class ContentController extends BasePageController if ($contentId === 0 && $contentPage === 'content') { $content = $contents->getAllButFront(); - $this->smarty->assign('front', false); + $isFront = false; $meta_title = 'Contents page'; $meta_keywords = 'contents'; $meta_description = 'This is the contents page.'; } elseif ($contentId !== 0 && $contentPage !== false) { $content = [$contents->getByID($contentId, $role)]; - $this->smarty->assign('front', false); + $isFront = false; $meta_title = 'Contents page'; $meta_keywords = 'contents'; $meta_description = 'This is the contents page.'; } else { $content = $contents->getFrontPage(); $index = $contents->getIndex(); - $this->smarty->assign('front', true); + $isFront = true; $meta_title = $index->title ?? 'Contents page'; $meta_keywords = $index->metakeyword ?? 'contents'; $meta_description = $index->metadescription ?? 'This is the contents page.'; @@ -68,10 +68,15 @@ class ContentController extends BasePageController return response()->json(['message' => 'There is nothing to see here, no content provided.'], 404); } - $this->smarty->assign('content', $content); + $this->viewData = array_merge($this->viewData, [ + 'content' => $content, + 'admin' => $isAdmin, + 'front' => $isFront, + 'meta_title' => $meta_title, + 'meta_keywords' => $meta_keywords, + 'meta_description' => $meta_description, + ]); - $content = $this->smarty->fetch('content.tpl'); - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + return view('content.index', $this->viewData); } } diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 9ddd5157a..d8e457a4c 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -126,36 +126,38 @@ class DetailsController extends BasePageController $releasefiles = ReleaseFile::getReleaseFiles($data['id']); - $this->smarty->assign('releasefiles', $releasefiles); - $this->smarty->assign('release', $data); - $this->smarty->assign('reVideo', $reVideo); - $this->smarty->assign('reAudio', $reAudio); - $this->smarty->assign('reSubs', $reSubs); - $this->smarty->assign('nfo', $nfo); - $this->smarty->assign('show', $showInfo); - $this->smarty->assign('movie', $mov); - $this->smarty->assign('xxx', $xxx); - $this->smarty->assign('anidb', $AniDBAPIArray); - $this->smarty->assign('music', $mus); - $this->smarty->assign('con', $con); - $this->smarty->assign('game', $game); - $this->smarty->assign('book', $book); - $this->smarty->assign('predb', $pre); - $this->smarty->assign('comments', $comments); - $this->smarty->assign('searchname', getSimilarName($data['searchname'])); - $this->smarty->assign('similars', $similars !== false ? $similars : []); - $this->smarty->assign('privateprofiles', config('nntmux_settings.private_profiles')); - $this->smarty->assign('failed', $failed); - $this->smarty->assign('regex', $releaseRegex); - $this->smarty->assign('downloadedby', $downloadedBy); + $this->viewData = array_merge($this->viewData, [ + 'releasefiles' => $releasefiles, + 'release' => $data, + 'reVideo' => $reVideo, + 'reAudio' => $reAudio, + 'reSubs' => $reSubs, + 'nfo' => $nfo, + 'show' => $showInfo, + 'movie' => $mov, + 'xxx' => $xxx, + 'anidb' => $AniDBAPIArray, + 'music' => $mus, + 'con' => $con, + 'game' => $game, + 'book' => $book, + 'predb' => $pre, + 'comments' => $comments, + 'files' => $releasefiles, + 'searchname' => getSimilarName($data['searchname']), + 'similars' => $similars !== false ? $similars : [], + 'privateprofiles' => config('nntmux_settings.private_profiles'), + 'failed' => $failed, + 'regex' => $releaseRegex, + 'downloadedby' => $downloadedBy, + 'meta_title' => 'View NZB', + 'meta_keywords' => 'view,nzb,description,details', + 'meta_description' => 'View NZB for '.$data['searchname'], + ]); - $meta_title = 'View NZB'; - $meta_keywords = 'view,nzb,description,details'; - $meta_description = 'View NZB for'.$data['searchname']; - - $content = $this->smarty->fetch('viewnzb.tpl'); - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + return view('details.index', $this->viewData); } + + return redirect()->back()->with('error', 'Release not found'); } } diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index b3a8abb66..faafa11b2 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -16,10 +16,15 @@ class GetNzbController extends BasePageController /** * @throws \Exception */ - public function getNzb(Request $request) + public function getNzb(Request $request, $guid = null) { $this->setPreferences(); + // If guid is passed as URL parameter, merge it into request as 'id' + if ($guid !== null && !$request->has('id')) { + $request->merge(['id' => $guid]); + } + // Page is accessible only by the rss token, or logged in users. if ($request->user()) { $uid = $this->userdata->id; diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 040e00c64..560b6ba25 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -11,7 +11,7 @@ class MovieController extends BasePageController /** * @throws \Exception */ - public function showMovies(Request $request, string $id = ''): void + public function showMovies(Request $request, string $id = '') { $this->setPreferences(); $movie = new Movie(['Settings' => $this->settings]); @@ -26,15 +26,8 @@ class MovieController extends BasePageController $category = $cat->id ?? Category::MOVIE_ROOT; } - $this->smarty->assign('cpapi', $this->userdata->cp_api); - $this->smarty->assign('cpurl', $this->userdata->cp_url); - $catarray = $category !== -1 ? [$category] : []; - $this->smarty->assign('catlist', $moviecats); - $this->smarty->assign('category', $category); - $this->smarty->assign('categorytitle', $id); - $page = $request->input('page', 1); $offset = ($page - 1) * config('nntmux.items_per_cover_page'); @@ -56,38 +49,42 @@ class MovieController extends BasePageController return $result; }); - $this->smarty->assign('title', stripslashes($request->input('title', ''))); - $this->smarty->assign('actors', stripslashes($request->input('actors', ''))); - $this->smarty->assign('director', stripslashes($request->input('director', ''))); - $this->smarty->assign('ratings', range(1, 9)); - $this->smarty->assign('rating', $request->input('rating', '')); - $this->smarty->assign('genres', $movie->getGenres()); - $this->smarty->assign('genre', $request->input('genre', '')); $years = range(1903, now()->addYear()->year); rsort($years); - $this->smarty->assign('years', $years); - $this->smarty->assign('year', $request->input('year', '')); $catname = $category === -1 ? 'All' : Category::find($category) ?? 'All'; - $this->smarty->assign('catname', $catname); - $this->smarty->assign([ + $this->viewData = array_merge($this->viewData, [ + 'cpapi' => $this->userdata->cp_api, + 'cpurl' => $this->userdata->cp_url, + 'catlist' => $moviecats, + 'category' => $category, + 'categorytitle' => $id, + 'title' => stripslashes($request->input('title', '')), + 'actors' => stripslashes($request->input('actors', '')), + 'director' => stripslashes($request->input('director', '')), + 'ratings' => range(1, 9), + 'rating' => $request->input('rating', ''), + 'genres' => $movie->getGenres(), + 'genre' => $request->input('genre', ''), + 'years' => $years, + 'year' => $request->input('year', ''), + 'catname' => $catname, 'resultsadd' => $movies, 'results' => $results, 'covgroup' => 'movies', + 'meta_title' => 'Browse Movies', + 'meta_keywords' => 'browse,nzb,description,details', + 'meta_description' => 'Browse for Movies', ]); - $meta_title = 'Browse Movies'; - $meta_keywords = 'browse,nzb,description,details'; - $meta_description = 'Browse for Movies'; - - $content = $request->has('imdb') ? $this->smarty->fetch('viewmoviefull.tpl') : $this->smarty->fetch('movies.tpl'); - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + // Return the appropriate view + $viewName = $request->has('imdb') ? 'movies.viewmoviefull' : 'movies.index'; + return view($viewName, $this->viewData); } /** - * @return \Illuminate\Http\JsonResponse|void + * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View */ public function showTrailer(Request $request) { @@ -100,28 +97,28 @@ class MovieController extends BasePageController return response()->json(['message' => 'There is no trailer for this movie.'], 404); } - $this->smarty->assign('movie', $mov); + $modal = $request->has('modal'); - $title = 'Info for '.$mov['title']; - $meta_title = ''; - $meta_keywords = ''; - $meta_description = ''; - $this->smarty->registerPlugin('modifier', 'ss', 'stripslashes'); - - $modal = false; - if ($request->has('modal')) { - $modal = true; - $this->smarty->assign('modal', true); - } - - $content = $this->smarty->fetch('viewmovietrailer.tpl'); + $viewData = [ + 'movie' => $mov, + ]; + // Return different views for modal vs full page if ($modal) { - echo $content; - } else { - $this->smarty->assign(compact('content', 'title', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + return view('movies.trailer-modal', $viewData); } + + $this->viewData = array_merge($this->viewData, [ + 'movie' => $mov, + 'title' => 'Info for '.$mov['title'], + 'meta_title' => '', + 'meta_keywords' => '', + 'meta_description' => '', + ]); + + return view('movies.viewmovietrailer', $this->viewData); } + + return response()->json(['message' => 'Invalid movie ID.'], 400); } } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 602b9278c..837f1bb66 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -22,7 +22,7 @@ class ProfileController extends BasePageController /** * @throws \Throwable */ - public function show(Request $request): void + public function show(Request $request) { $this->setPreferences(); @@ -53,55 +53,36 @@ class ProfileController extends BasePageController } } - $downloadList = UserDownload::getDownloadRequestsForUser($userID); - $this->smarty->assign('downloadlist', $downloadList); - if ($this->userdata === null) { - $this->show404('No such user!'); + return $this->show404('No such user!'); } // Check if the user selected a theme. if (! isset($this->userdata->style) || $this->userdata->style === 'None') { $this->userdata->style = 'Using the admin selected theme.'; } - $this->smarty->assign( - [ - 'apirequests' => UserRequest::getApiRequests($userID), - 'grabstoday' => UserDownload::getDownloadRequests($userID), - 'userinvitedby' => $this->userdata->invitedby !== '' ? User::find($this->userdata->invitedby) : '', - 'user' => $this->userdata, - 'privateprofiles' => $privateProfiles, - 'publicview' => $publicView, - 'privileged' => $privileged, - ] - ); - // Pager must be fetched after the variables are assigned to smarty. - $this->smarty->assign( - [ - 'commentslist' => ReleaseComment::getCommentsForUserRange($userID), - ] - ); + $this->viewData = array_merge($this->viewData, [ + 'downloadlist' => UserDownload::getDownloadRequestsForUser($userID), + 'apirequests' => UserRequest::getApiRequests($userID), + 'grabstoday' => UserDownload::getDownloadRequests($userID), + 'userinvitedby' => ($this->userdata->invitedby && $this->userdata->invitedby !== '') ? User::find($this->userdata->invitedby) : null, + 'user' => $this->userdata, + 'privateprofiles' => $privateProfiles, + 'publicview' => $publicView, + 'privileged' => $privileged, + 'isadmin' => $this->userdata->hasRole('Admin'), + 'commentslist' => ReleaseComment::getCommentsForUserRange($userID), + 'meta_title' => 'View User Profile', + 'meta_keywords' => 'view,profile,user,details', + 'meta_description' => 'View User Profile for '.$this->userdata->username, + ]); - $meta_title = 'View User Profile'; - $meta_keywords = 'view,profile,user,details'; - $meta_description = 'View User Profile for '.$this->userdata->username; - - $content = $this->smarty->fetch('profile.tpl'); - - $this->smarty->assign( - [ - 'content' => $content, - 'meta_title' => $meta_title, - 'meta_keywords' => $meta_keywords, - 'meta_description' => $meta_description, - ] - ); - $this->pagerender(); + return view('profile.index', $this->viewData); } /** - * @return RedirectResponse|void + * @return Factory|\Illuminate\View\View|View * * @throws \Exception */ @@ -139,7 +120,7 @@ class ProfileController extends BasePageController return redirect()->to('profileedit'); case 'submit': $validator = Validator::make($request->all(), [ - 'email' => ['nullable', 'string', 'email', 'max:255', 'unique:users', 'indisposable'], + 'email' => ['nullable', 'string', 'email', 'max:255', 'unique:users,email,'.$userid, 'indisposable'], 'password' => ['nullable', 'string', 'min:8', 'confirmed', 'regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$/'], ]); @@ -154,77 +135,101 @@ class ProfileController extends BasePageController $this->userdata->roles_id, $this->userdata->notes, $this->userdata->invites, - $request->has('movieview') ? 1 : 0, - $request->has('musicview') ? 1 : 0, - $request->has('gameview') ? 1 : 0, - $request->has('xxxview') ? 1 : 0, - $request->has('consoleview') ? 1 : 0, - $request->has('bookview') ? 1 : 0, + $request->has('viewmovies') ? 1 : 0, + $request->has('viewaudio') ? 1 : 0, + $request->has('viewpc') ? 1 : 0, + $request->has('viewadult') ? 1 : 0, + $request->has('viewconsole') ? 1 : 0, + $request->has('viewbooks') ? 1 : 0, 'None', ); - if ((int) $request->input('viewconsole') === 1 && $this->userdata->can('view console') && ! $this->userdata->hasDirectPermission('view console')) { - $this->userdata->givePermissionTo('view console'); - } elseif ((int) $request->input('viewconsole') === 0 && $this->userdata->can('view console') && $this->userdata->hasDirectPermission('view console')) { - $this->userdata->revokePermissionTo('view console'); - } elseif ($this->userdata->cant('view console') && \in_array((int) $request->input('viewconsole'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view console'); + // Handle Console permission + if ($request->has('viewconsole')) { + if (! $this->userdata->hasDirectPermission('view console')) { + $this->userdata->givePermissionTo('view console'); + } + } else { + if ($this->userdata->hasPermissionTo('view console')) { + $this->userdata->revokePermissionTo('view console'); + } } - if ((int) $request->input('viewmovies') === 1 && $this->userdata->can('view movies') && ! $this->userdata->hasDirectPermission('view movies')) { - $this->userdata->givePermissionTo('view movies'); - } elseif ((int) $request->input('viewmovies') === 0 && $this->userdata->can('view movies') && $this->userdata->hasDirectPermission('view movies')) { - $this->userdata->revokePermissionTo('view movies'); - } elseif ($this->userdata->cant('view movies') && $this->userdata->hasDirectPermission('view movies') && \in_array((int) $request->input('viewmovies'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view movies'); + // Handle Movies permission + if ($request->has('viewmovies')) { + if (! $this->userdata->hasDirectPermission('view movies')) { + $this->userdata->givePermissionTo('view movies'); + } + } else { + if ($this->userdata->hasPermissionTo('view movies')) { + $this->userdata->revokePermissionTo('view movies'); + } } - if ((int) $request->input('viewaudio') === 1 && $this->userdata->can('view audio') && ! $this->userdata->hasDirectPermission('view audio')) { - $this->userdata->givePermissionTo('view audio'); - } elseif ((int) $request->input('viewaudio') === 0 && $this->userdata->can('view audio') && $this->userdata->hasDirectPermission('view audio')) { - $this->userdata->revokePermissionTo('view audio'); - } elseif ($this->userdata->cant('view audio') && $this->userdata->hasDirectPermission('view audio') && \in_array((int) $request->input('viewaudio'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view audio'); + // Handle Audio permission + if ($request->has('viewaudio')) { + if (! $this->userdata->hasDirectPermission('view audio')) { + $this->userdata->givePermissionTo('view audio'); + } + } else { + if ($this->userdata->hasPermissionTo('view audio')) { + $this->userdata->revokePermissionTo('view audio'); + } } - if ((int) $request->input('viewpc') === 1 && $this->userdata->can('view pc') && ! $this->userdata->hasDirectPermission('view pc')) { - $this->userdata->givePermissionTo('view pc'); - } elseif ((int) $request->input('viewpc') === 0 && $this->userdata->can('view pc') && $this->userdata->hasDirectPermission('view pc')) { - $this->userdata->revokePermissionTo('view pc'); - } elseif ($this->userdata->cant('view pc') && $this->userdata->hasDirectPermission('view pc') && \in_array((int) $request->input('viewpc'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view pc'); + // Handle PC/Games permission + if ($request->has('viewpc')) { + if (! $this->userdata->hasDirectPermission('view pc')) { + $this->userdata->givePermissionTo('view pc'); + } + } else { + if ($this->userdata->hasPermissionTo('view pc')) { + $this->userdata->revokePermissionTo('view pc'); + } } - if ((int) $request->input('viewtv') === 1 && $this->userdata->can('view tv') && ! $this->userdata->hasDirectPermission('view tv')) { - $this->userdata->givePermissionTo('view tv'); - } elseif ((int) $request->input('viewtv') === 0 && $this->userdata->can('view tv') && $this->userdata->hasDirectPermission('view tv')) { - $this->userdata->revokePermissionTo('view tv'); - } elseif ($this->userdata->cant('view tv') && $this->userdata->hasDirectPermission('view tv') && \in_array((int) $request->input('viewtv'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view tv'); + // Handle TV permission + if ($request->has('viewtv')) { + if (! $this->userdata->hasDirectPermission('view tv')) { + $this->userdata->givePermissionTo('view tv'); + } + } else { + if ($this->userdata->hasPermissionTo('view tv')) { + $this->userdata->revokePermissionTo('view tv'); + } } - if ((int) $request->input('viewadult') === 1 && $this->userdata->can('view adult') && ! $this->userdata->hasDirectPermission('view adult')) { - $this->userdata->givePermissionTo('view adult'); - } elseif ((int) $request->input('viewadult') === 0 && $this->userdata->can('view adult') && $this->userdata->hasDirectPermission('view adult')) { - $this->userdata->revokePermissionTo('view adult'); - } elseif ($this->userdata->cant('view adult') && $this->userdata->hasDirectPermission('view adult') && \in_array((int) $request->input('viewadult'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view adult'); + // Handle Adult permission + if ($request->has('viewadult')) { + if (! $this->userdata->hasDirectPermission('view adult')) { + $this->userdata->givePermissionTo('view adult'); + } + } else { + if ($this->userdata->hasPermissionTo('view adult')) { + $this->userdata->revokePermissionTo('view adult'); + } } - if ((int) $request->input('viewbooks') === 1 && $this->userdata->can('view books') && ! $this->userdata->hasDirectPermission('view books')) { - $this->userdata->givePermissionTo('view books'); - } elseif ((int) $request->input('viewbooks') === 0 && $this->userdata->can('view books') && $this->userdata->hasDirectPermission('view books')) { - $this->userdata->revokePermissionTo('view books'); - } elseif ($this->userdata->cant('view books') && $this->userdata->hasDirectPermission('view books') && \in_array((int) $request->input('viewbooks'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view books'); + // Handle Books permission + if ($request->has('viewbooks')) { + if (! $this->userdata->hasDirectPermission('view books')) { + $this->userdata->givePermissionTo('view books'); + } + } else { + if ($this->userdata->hasPermissionTo('view books')) { + $this->userdata->revokePermissionTo('view books'); + } } - if ((int) $request->input('viewother') === 1 && $this->userdata->can('view other') && ! $this->userdata->hasDirectPermission('view other')) { - $this->userdata->givePermissionTo('view other'); - } elseif ((int) $request->input('viewother') === 0 && $this->userdata->can('view other') && $this->userdata->hasDirectPermission('view other')) { - $this->userdata->revokePermissionTo('view other'); - } elseif ($this->userdata->cant('view other') && $this->userdata->hasDirectPermission('view other') && \in_array((int) $request->input('viewother'), [0, 1], true)) { - $this->userdata->revokePermissionTo('view other'); + // Handle Other permission + if ($request->has('viewother')) { + if (! $this->userdata->hasDirectPermission('view other')) { + $this->userdata->givePermissionTo('view other'); + } + } else { + if ($this->userdata->hasPermissionTo('view other')) { + $this->userdata->revokePermissionTo('view other'); + } } if ($request->has('password') && ! empty($request->input('password'))) { @@ -256,24 +261,24 @@ class ProfileController extends BasePageController break; } - $this->smarty->assign('error', $errorStr); - $this->smarty->assign('user', $this->userdata); - $this->smarty->assign('userexccat', User::getCategoryExclusionById($userid)); - $this->smarty->assign('success_2fa', $success_2fa); - $this->smarty->assign('error_2fa', $error_2fa); - $this->smarty->assign('google2fa_url', $google2fa_url); + $this->viewData = array_merge($this->viewData, [ + 'error' => $errorStr, + 'user' => $this->userdata, + 'userexccat' => User::getCategoryExclusionById($userid), + 'success_2fa' => $success_2fa, + 'error_2fa' => $error_2fa, + 'google2fa_url' => $google2fa_url, + 'yesno_ids' => [1, 0], + 'yesno_names' => ['Yes', 'No'], + 'publicview' => false, + 'privileged' => $this->userdata->hasRole('Admin') || $this->userdata->hasRole('Moderator'), + 'userinvitedby' => ($this->userdata->invitedby && $this->userdata->invitedby !== '') ? User::find($this->userdata->invitedby) : null, + 'meta_title' => 'Edit User Profile', + 'meta_keywords' => 'edit,profile,user,details', + 'meta_description' => 'Edit User Profile for '.$this->userdata->username, + ]); - $meta_title = 'Edit User Profile'; - $meta_keywords = 'edit,profile,user,details'; - $meta_description = 'Edit User Profile for '.$this->userdata->username; - - $this->smarty->assign('yesno_ids', [1, 0]); - $this->smarty->assign('yesno_names', ['Yes', 'No']); - - $content = $this->smarty->fetch('profileedit.tpl'); - - $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); - $this->pagerender(); + return view('profile.edit', $this->viewData); } /** diff --git a/migrate-templates.php b/migrate-templates.php new file mode 100644 index 000000000..5a41ea646 --- /dev/null +++ b/migrate-templates.php @@ -0,0 +1,95 @@ +#!/usr/bin/env php +\s*\$([a-zA-Z0-9_]+)\}/', '@foreach($$1 as $$2 => $$3)', $bladeContent); + $bladeContent = preg_replace('/\{\/foreach\}/', '@endforeach', $bladeContent); + + // Convert includes + $bladeContent = preg_replace('/\{include\s+file=[\'"](.+?)[\'"]\}/', '@include(\'$1\')', $bladeContent); + + // Convert URLs - keep as is since they're already using Laravel syntax + // {{url()}} and {{route()}} work in both Smarty and Blade + + // Convert Auth checks + $bladeContent = preg_replace('/\{if\s+Auth::check\(\)\}/', '@auth', $bladeContent); + + // Fix object property access: $obj.prop to $obj->prop + $bladeContent = preg_replace('/\$([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)/', '$$$1->$2', $bladeContent); + + return $bladeContent; +} + +if ($argc < 2) { + echo "Usage: php migrate-templates.php [template-file.tpl]\n"; + echo "Example: php migrate-templates.php resources/views/themes/Gentele/browse.tpl\n"; + exit(1); +} + +$inputFile = $argv[1]; + +if (!file_exists($inputFile)) { + echo "Error: File not found: $inputFile\n"; + exit(1); +} + +$smartyContent = file_get_contents($inputFile); +$bladeContent = convertSmartyToBlade($smartyContent); + +// Determine output filename +$outputFile = preg_replace('/\.tpl$/', '.blade.php', $inputFile); +$outputFile = str_replace('/themes/Gentele/', '/', $outputFile); +$outputFile = str_replace('/themes/admin/', '/admin/', $outputFile); +$outputFile = str_replace('/themes/shared/', '/shared/', $outputFile); + +echo "Converting: $inputFile\n"; +echo "To: $outputFile\n"; +echo "\nPreview of converted content:\n"; +echo str_repeat('-', 80) . "\n"; +echo substr($bladeContent, 0, 500) . "...\n"; +echo str_repeat('-', 80) . "\n"; + +echo "\nDo you want to save this conversion? (y/n): "; +$handle = fopen("php://stdin", "r"); +$line = fgets($handle); +if (trim($line) != 'y') { + echo "Cancelled.\n"; + exit(0); +} + +// Create directory if it doesn't exist +$outputDir = dirname($outputFile); +if (!is_dir($outputDir)) { + mkdir($outputDir, 0755, true); +} + +file_put_contents($outputFile, $bladeContent); +echo "Saved to: $outputFile\n"; +echo "\nNote: Please review the converted file and make manual adjustments as needed.\n"; +echo "Common manual adjustments:\n"; +echo " - Array access: \$arr['key'] instead of \$arr.key\n"; +echo " - Complex expressions may need refinement\n"; +echo " - Bootstrap classes should be converted to TailwindCSS\n"; + diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php new file mode 100644 index 000000000..32f590d39 --- /dev/null +++ b/resources/views/admin/dashboard.blade.php @@ -0,0 +1,164 @@ +@extends('layouts.admin') + +@section('content') +
+ +
+

Admin Dashboard

+

Welcome to the administration panel

+
+ + +
+ +
+
+
+

Total Releases

+

{{ number_format($stats['releases'] ?? 0) }}

+
+
+ +
+
+
+ + {{ number_format($stats['releases_today'] ?? 0) }} today + +
+
+ + +
+
+
+

Active Users

+

{{ number_format($stats['users'] ?? 0) }}

+
+
+ +
+
+
+ + {{ $stats['users_today'] ?? 0 }} registered today + +
+
+ + +
+
+
+

Active Groups

+

{{ number_format($stats['groups'] ?? 0) }}

+
+
+ +
+
+
+ + {{ $stats['active_groups'] ?? 0 }} currently active + +
+
+ + +
+
+
+

Failed Releases

+

{{ number_format($stats['failed'] ?? 0) }}

+
+
+ +
+
+
+ + View failed releases + +
+
+
+ + +
+ +
+

System Status

+
+
+ Database + + Connected + +
+
+ Cache + + Active + +
+
+ Queue + + Running + +
+
+ Disk Space + {{ $stats['disk_free'] ?? 'N/A' }} available +
+
+
+ + +
+

Recent Activity

+
+ @if(isset($recent_activity) && count($recent_activity) > 0) + @foreach($recent_activity as $activity) +
+
+ +
+
+

{{ $activity->message }}

+

{{ $activity->created_at->diffForHumans() }}

+
+
+ @endforeach + @else +

No recent activity

+ @endif +
+
+
+ + +
+

Quick Links

+
+ + + Manage Users + + + + Manage Releases + + + + Categories + + + + Settings + +
+
+
+@endsection + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index c12b97e57..5bfe0ab8d 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,73 +1,183 @@ -@extends('layouts.app') +@extends('layouts.guest') @section('content') -
-
-
-
-
{{ __('Login') }}
+
+
+ +
+ +
+ +
+ +

+ {{ config('app.name') }} +

+

+ Sign in to your account +

+
-
-
- @csrf + +
+
+ + @if(session('message')) +
+
+ + + {{ session('message') }} + +
+
+ @endif -
- - -
- - - @error('email') - - {{ $message }} - - @enderror + @if($errors->any()) +
+
+ +
+

There were some errors with your submission:

+
    + @foreach($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif -
- + + + @csrf -
- - - @error('password') - - {{ $message }} - - @enderror + +
+ +
+
+
+ +
+ @error('username') +

{{ $message }}

+ @enderror +
+ + +
+ +
+
+ +
+ +
+ @error('password') +

{{ $message }}

+ @enderror +
+ + +
+
+ +
-
-
-
- + @if(Route::has('password.request')) + + Forgot password? + + @endif +
- -
-
+ + @if(config('captcha.enabled') == 1 && !empty(config('captcha.sitekey')) && !empty(config('captcha.secret'))) +
+ {!! NoCaptcha::display() !!} + {!! NoCaptcha::renderJs() !!}
+ @endif -
-
- + +
+ +
+ +
- @if (Route::has('password.request')) - - {{ __('Forgot Your Password?') }} - - @endif -
-
- + +
+
+ @if(Route::has('register')) + + Create an account + + @endif + + + Back to home +
+ + +

+ © {{ now()->year }} {{ config('app.name') }}. All rights reserved. +

+ +@push('scripts') + +@endpush @endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 1fea98456..f1799239f 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,47 +1,114 @@ -@extends('layouts.app') +@extends('layouts.guest') @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+
+
+ +
+ +
+ +
+ +

+ Reset Password +

+

+ Enter your email to receive a password reset link +

+
-
- @if (session('status')) -
@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 989931d3a..385545fe4 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,65 +1,141 @@ -@extends('layouts.app') +@extends('layouts.guest') @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+
+
+ +
+ +
+ +
+ +

+ Set New Password +

+

+ Choose a strong password for your account +

+
-
-
- @csrf - - - -
- - -
- - - @error('email') - - {{ $message }} - - @enderror + +
+
+ + @if($errors->any()) +
+
+ +
+

There were some errors:

+
    + @foreach($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif -
- + + + @csrf + -
- - - @error('password') - - {{ $message }} - - @enderror + +
+ +
+
+
+
+
-
- - -
- + +
+ +
+
+
+
+ @error('password') +

{{ $message }}

+ @enderror +

Must be at least 8 characters

+
-
-
- + +
+ +
+
+
+
- +
+ + +
+ +
+ +
+ + +
+
+ + Back to login +
+ + +

+ © {{ now()->year }} {{ config('app.name') }}. All rights reserved. +

@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index d236a48ec..165215cbb 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,77 +1,196 @@ -@extends('layouts.app') +@extends('layouts.guest') @section('content') -
-
-
-
-
{{ __('Register') }}
+
+
+ +
+ +
+ +
+ +

+ {{ config('app.name') }} +

+

+ Create your account +

+
-
-
- @csrf - -
- - -
- - - @error('name') - - {{ $message }} - - @enderror + +
+
+ + @if($errors->any()) +
+
+ +
+

There were some errors with your submission:

+
    + @foreach($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif -
- + + + @csrf -
- - - @error('email') - - {{ $message }} - - @enderror + +
+ +
+
+
+
+ @error('username') +

{{ $message }}

+ @enderror +
-
- - -
- - - @error('password') - - {{ $message }} - - @enderror + +
+ +
+
+
+
+ @error('email') +

{{ $message }}

+ @enderror +
-
- - -
- + +
+ +
+
+
+
+ @error('password') +

{{ $message }}

+ @enderror +

Must be at least 8 characters

+
-
-
- + +
+ +
+
+
+
- +
+ + + @if(config('captcha.enabled') == 1 && !empty(config('captcha.sitekey')) && !empty(config('captcha.secret'))) +
+ {!! NoCaptcha::display() !!} + {!! NoCaptcha::renderJs() !!} +
+ @endif + + +
+ + +
+ + +
+ +
+ +
+ + +
+
+ + Already have an account? Sign in + + + + Back to home +
+ + +

+ © {{ now()->year }} {{ config('app.name') }}. All rights reserved. +

@endsection diff --git a/resources/views/browse/index.blade.php b/resources/views/browse/index.blade.php new file mode 100644 index 000000000..f7535338b --- /dev/null +++ b/resources/views/browse/index.blade.php @@ -0,0 +1,239 @@ +@extends('layouts.main') + +@section('content') +
+ +
+ +
+ + @if($results->count() > 0) +
+
+
+ +
+ @if(isset($shows)) +
+ Series List + | + Manage My Shows + | + RSS Feed +
+ @endif + + @if(isset($covgroup) && $covgroup != '') +
+ View: + Covers + | + List +
+ @endif + +
+ With Selected: +
+ + + @if(auth()->user()->hasRole('Admin')) + + @endif +
+
+
+ + +
+
+ Showing {{ $results->firstItem() }} to {{ $results->lastItem() }} of {{ $results->total() }} results +
+
+ + +
+
+ + +
+
+
+
+ + +
+ + + + + + + + + + + + + + + @foreach($results as $result) + + + + + + + + + + + @endforeach + +
+ + NameCategoryPostedSizeFilesStatsAction
+ + +
+ @if($result->cover ?? false) + Cover + @endif +
+ {{ $result->searchname }} +
+ @if($result->group_name) + + {{ $result->group_name }} + + @endif +
+
+
+ 		+ + {{ $result->category_name ?? 'Other' }} + + + {{ \Carbon\Carbon::parse($result->postdate)->diffForHumans() }} + + {{ $result->size_formatted ?? number_format($result->size / 1073741824, 2) . ' GB' }} + + {{ $result->totalpart ?? 0 }} + +
+ {{ $result->grabs ?? 0 }} + {{ $result->comments ?? 0 }} +
+ 		+
+ + + + + + +
+
+
+ + +
+ {{ $results->links() }} +
+
+ @else +
+ +

No releases found

+

Try adjusting your search criteria or browse other categories.

+
+ @endif +
+ +@push('scripts') + +@endpush +@endsection + diff --git a/resources/views/content/index.blade.php b/resources/views/content/index.blade.php new file mode 100644 index 000000000..68433c53d --- /dev/null +++ b/resources/views/content/index.blade.php @@ -0,0 +1,140 @@ +@extends('layouts.main') + +@section('content') +
+ @if($front) + +
+ @if(is_array($content) && count($content) > 0) + @foreach($content as $item) +
+ @if(isset($item->title)) +

{{ $item->title }}

+ @endif + + @if(isset($item->body)) +
+ {!! $item->body !!} +
+ @endif + + @if(isset($item->metadescription)) +

{{ $item->metadescription }}

+ @endif +
+ @endforeach + @else +
+ +

No Content Available

+

There is no content to display at this time.

+
+ @endif +
+ @else + +
+
+

Content

+

Browse our content pages

+
+ + @if(is_array($content) && count($content) > 0) +
+ @foreach($content as $item) + @if($item) +
+

+ + {{ $item->title ?? 'Untitled' }} + +

+ + @if(isset($item->metadescription)) +

{{ Str::limit($item->metadescription, 150) }}

+ @endif + + + Read More + +
+ @endif + @endforeach +
+ @else +
+ +

No Content Available

+

There is no content to display at this time.

+
+ @endif +
+ @endif +
+ +@push('styles') + +@endpush +@endsection + diff --git a/resources/views/details/index.blade.php b/resources/views/details/index.blade.php new file mode 100644 index 000000000..7bf21d87d --- /dev/null +++ b/resources/views/details/index.blade.php @@ -0,0 +1,651 @@ +@extends('layouts.main') + +@section('content') +
+
+

Release Details

+ +
+ +
+ +
+ +
+
+ +
+ {{ $release->searchname }} +
+ + +
+

{{ $release->searchname }}

+
+ + Download NZB + + +
+
+
+
+ + + @if(!empty($movie)) + @php + $movieData = is_object($movie) ? get_object_vars($movie) : $movie; + $movieTitle = $movieData['title'] ?? ($movie->title ?? null); + $movieYear = $movieData['year'] ?? ($movie->year ?? null); + $movieTagline = $movieData['tagline'] ?? ($movie->tagline ?? null); + $movieRating = $movieData['rating'] ?? ($movie->rating ?? null); + $moviePlot = $movieData['plot'] ?? ($movie->plot ?? null); + $movieGenre = $movieData['genre'] ?? ($movie->genre ?? null); + $movieDirector = $movieData['director'] ?? ($movie->director ?? null); + $movieActors = $movieData['actors'] ?? ($movie->actors ?? null); + $movieLanguage = $movieData['language'] ?? ($movie->language ?? null); + $movieTrailer = $movieData['trailer'] ?? ($movie->trailer ?? null); + @endphp +
+

+ Movie Information +

+
+ @if(!empty($movieTitle)) +
+
Title
+
{{ $movieTitle }}
+
+ @endif + @if(!empty($movieYear)) +
+
Year
+
{{ $movieYear }}
+
+ @endif + @if(!empty($movieTagline)) +
+
Tagline
+
"{{ $movieTagline }}"
+
+ @endif + @if(!empty($movieRating)) +
+
IMDB Rating
+
+ + + {{ $movieRating }}/10 + +
+
+ @endif + @if(!empty($moviePlot)) +
+
Plot Synopsis
+
{{ $moviePlot }}
+
+ @endif + @if(!empty($movieGenre)) +
+
Genre
+
{!! $movieGenre !!}
+
+ @endif + @if(!empty($movieDirector)) +
+
Director
+
{!! $movieDirector !!}
+
+ @endif + @if(!empty($movieActors)) +
+
Cast
+
{!! $movieActors !!}
+
+ @endif + @if(!empty($movieLanguage)) +
+
Language
+
{{ $movieLanguage }}
+
+ @endif +
+ @if(!empty($movieTrailer)) +
+

Trailer

+
+ {!! $movieTrailer !!} +
+
+ @endif +
+ @endif + + + @if(!empty($show)) + @php + $showData = is_object($show) ? get_object_vars($show) : $show; + $showTitle = $showData['title'] ?? ($show->title ?? null); + $showStarted = $showData['started'] ?? ($show->started ?? null); + $showTvdb = $showData['tvdb'] ?? ($show->tvdb ?? null); + @endphp +
+

+ TV Show Information +

+
+ @if(!empty($showTitle)) +
+
Show Title
+
{{ $showTitle }}
+
+ @endif + @if(!empty($showStarted)) +
+
Started
+
{{ $showStarted }}
+
+ @endif + @if(!empty($showTvdb)) +
+
TVDB
+
+ + View on TVDB + +
+
+ @endif +
+
+ @endif + + + @if(!empty($xxx)) + @php + $xxxData = is_object($xxx) ? get_object_vars($xxx) : $xxx; + $xxxTitle = $xxxData['title'] ?? ($xxx->title ?? null); + $xxxGenre = $xxxData['genre'] ?? ($xxx->genre ?? null); + $xxxActors = $xxxData['actors'] ?? ($xxx->actors ?? null); + @endphp +
+

+ Adult Content Information +

+
+ @if(!empty($xxxTitle)) +
+
Title
+
{{ $xxxTitle }}
+
+ @endif + @if(!empty($xxxGenre)) +
+
Genre
+
{!! $xxxGenre !!}
+
+ @endif + @if(!empty($xxxActors)) +
+
Actors
+
{!! $xxxActors !!}
+
+ @endif +
+
+ @endif + + + @if(!empty($music)) + @php + $musicData = is_object($music) ? get_object_vars($music) : $music; + $musicTitle = $musicData['title'] ?? ($music->title ?? null); + $musicArtist = $musicData['artist'] ?? ($music->artist ?? null); + $musicPublisher = $musicData['publisher'] ?? ($music->publisher ?? null); + $musicReleaseDate = $musicData['releasedate'] ?? ($music->releasedate ?? null); + $musicGenres = $musicData['genres'] ?? ($music->genres ?? null); + @endphp +
+

+ Music Information +

+
+ @if(!empty($musicTitle)) +
+
Album
+
{{ $musicTitle }}
+
+ @endif + @if(!empty($musicArtist)) +
+
Artist
+
{{ $musicArtist }}
+
+ @endif + @if(!empty($musicPublisher)) +
+
Publisher
+
{{ $musicPublisher }}
+
+ @endif + @if(!empty($musicReleaseDate)) +
+
Release Date
+
{{ $musicReleaseDate }}
+
+ @endif + @if(!empty($musicGenres)) +
+
Genres
+
{{ $musicGenres }}
+
+ @endif +
+
+ @endif + + + @if(!empty($game)) + @php + $gameData = is_object($game) ? get_object_vars($game) : $game; + $gameTitle = $gameData['title'] ?? ($game->title ?? null); + $gamePublisher = $gameData['publisher'] ?? ($game->publisher ?? null); + $gameReleaseDate = $gameData['releasedate'] ?? ($game->releasedate ?? null); + $gameGenres = $gameData['genres'] ?? ($game->genres ?? null); + @endphp +
+

+ Game Information +

+
+ @if(!empty($gameTitle)) +
+
Title
+
{{ $gameTitle }}
+
+ @endif + @if(!empty($gamePublisher)) +
+
Publisher
+
{{ $gamePublisher }}
+
+ @endif + @if(!empty($gameReleaseDate)) +
+
Release Date
+
{{ $gameReleaseDate }}
+
+ @endif + @if(!empty($gameGenres)) +
+
Genres
+
{{ $gameGenres }}
+
+ @endif +
+
+ @endif + + + @if(!empty($con)) + @php + $conData = is_object($con) ? get_object_vars($con) : $con; + $conTitle = $conData['title'] ?? ($con->title ?? null); + $conPublisher = $conData['publisher'] ?? ($con->publisher ?? null); + $conReleaseDate = $conData['releasedate'] ?? ($con->releasedate ?? null); + @endphp +
+

+ Console Game Information +

+
+ @if(!empty($conTitle)) +
+
Title
+
{{ $conTitle }}
+
+ @endif + @if(!empty($conPublisher)) +
+
Publisher
+
{{ $conPublisher }}
+
+ @endif + @if(!empty($conReleaseDate)) +
+
Release Date
+
{{ $conReleaseDate }}
+
+ @endif +
+
+ @endif + + + @if(!empty($book)) + @php + $bookData = is_object($book) ? get_object_vars($book) : $book; + $bookTitle = $bookData['title'] ?? ($book->title ?? null); + $bookAuthor = $bookData['author'] ?? ($book->author ?? null); + $bookPublisher = $bookData['publisher'] ?? ($book->publisher ?? null); + $bookPublishDate = $bookData['publishdate'] ?? ($book->publishdate ?? null); + $bookOverview = $bookData['overview'] ?? ($book->overview ?? null); + @endphp +
+

+ Book Information +

+
+ @if(!empty($bookTitle)) +
+
Title
+
{{ $bookTitle }}
+
+ @endif + @if(!empty($bookAuthor)) +
+
Author
+
{{ $bookAuthor }}
+
+ @endif + @if(!empty($bookPublisher)) +
+
Publisher
+
{{ $bookPublisher }}
+
+ @endif + @if(!empty($bookPublishDate)) +
+
Published
+
{{ $bookPublishDate }}
+
+ @endif + @if(!empty($bookOverview)) +
+
Overview
+
{{ $bookOverview }}
+
+ @endif +
+
+ @endif + + + @if(!empty($anidb)) + @php + $anidbData = is_object($anidb) ? get_object_vars($anidb) : $anidb; + $anidbTitle = $anidbData['title'] ?? ($anidb->title ?? null); + $anidbType = $anidbData['type'] ?? ($anidb->type ?? null); + $anidbStartDate = $anidbData['startdate'] ?? ($anidb->startdate ?? null); + $anidbRating = $anidbData['rating'] ?? ($anidb->rating ?? null); + $anidbDescription = $anidbData['description'] ?? ($anidb->description ?? null); + @endphp +
+

+ Anime Information +

+
+ @if(!empty($anidbTitle)) +
+
Title
+
{{ $anidbTitle }}
+
+ @endif + @if(!empty($anidbType)) +
+
Type
+
{{ $anidbType }}
+
+ @endif + @if(!empty($anidbStartDate)) +
+
Start Date
+
{{ $anidbStartDate }}
+
+ @endif + @if(!empty($anidbRating)) +
+
Rating
+
+ + + {{ $anidbRating }} + +
+
+ @endif + @if(!empty($anidbDescription)) +
+
Description
+
{{ $anidbDescription }}
+
+ @endif +
+
+ @endif + + + @if(!empty($reVideo) || !empty($reAudio) || !empty($reSubs)) +
+

+ Media Information +

+
+ @if(!empty($reVideo)) +
+

+ Video +

+ @foreach($reVideo as $video) +
+ @if(!empty($video->videocodec)) +

Codec: {{ $video->videocodec }}

+ @endif + @if(!empty($video->videowidth) && !empty($video->videoheight)) +

Resolution: {{ $video->videowidth }}x{{ $video->videoheight }}

+ @endif + @if(!empty($video->videoaspect)) +

Aspect: {{ $video->videoaspect }}

+ @endif + @if(!empty($video->videoduration)) +

Duration: {{ $video->videoduration }}

+ @endif +
+ @endforeach +
+ @endif + + @if(!empty($reAudio)) +
+

+ Audio +

+ @foreach($reAudio as $audio) +
+ @if(!empty($audio->audiocodec)) +

Codec: {{ $audio->audiocodec }}

+ @endif + @if(!empty($audio->audiochannels)) +

Channels: {{ $audio->audiochannels }}

+ @endif + @if(!empty($audio->audiolanguage)) +

Language: {{ $audio->audiolanguage }}

+ @endif +
+ @endforeach +
+ @endif + + @if(!empty($reSubs)) +
+

+ Subtitles +

+
+ @foreach($reSubs as $sub) + @if(!empty($sub->subslanguage)) +

{{ $sub->subslanguage }}

+ @endif + @endforeach +
+
+ @endif +
+
+ @endif + + + @if(!empty($predb) && is_array($predb)) +
+

+ PreDB Information +

+
+ @if(!empty($predb['title'])) +
+
Title
+
{{ $predb['title'] }}
+
+ @endif + @if(!empty($predb['source'])) +
+
Source
+
{{ $predb['source'] }}
+
+ @endif + @if(!empty($predb['predate'])) +
+
Pre Date
+
{{ $predb['predate'] }}
+
+ @endif + @if(!empty($predb['category'])) +
+
Category
+
{{ $predb['category'] }}
+
+ @endif +
+
+ @endif + + + @if($nfo ?? false) +
+

NFO

+
+ 
{{ $nfo }}
+
+
+ @endif + + + @if(isset($files) && count($files) > 0) +
+

Files ({{ count($files) }})

+
+ + + + + + + + + @foreach($files as $file) + + + + + @endforeach + +
FilenameSize
{{ $file->name }}{{ number_format($file->size / 1048576, 2) }} MB
+
+
+ @endif + + +
+

Comments

+ @if(isset($comments) && count($comments) > 0) +
+ @foreach($comments as $comment) +
+
+
+
+ {{ strtoupper(substr($comment->username, 0, 1)) }} +
+
+

{{ $comment->username }}

+

{{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}

+
+
+
+

{{ $comment->text }}

+
+ @endforeach +
+ @else +

No comments yet. Be the first to comment!

+ @endif +
+
+ + +
+
+

Information

+
+
+
Category
+
{{ $release->category_name ?? 'Other' }}
+
+
+
Size
+
{{ number_format($release->size / 1073741824, 2) }} GB
+
+
+
Files
+
{{ $release->totalpart ?? 0 }}
+
+
+
Posted
+
{{ \Carbon\Carbon::parse($release->postdate)->format('M d, Y H:i') }}
+
+
+
Group
+
{{ $release->group_name ?? 'Unknown' }}
+
+
+
Grabs
+
{{ $release->grabs ?? 0 }}
+
+ @if($release->imdbid ?? false) +
+
IMDB
+
+ + View on IMDB + +
+
+ @endif +
+
+
+
+
+@endsection + diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php new file mode 100644 index 000000000..a8930ee1e --- /dev/null +++ b/resources/views/layouts/admin.blade.php @@ -0,0 +1,79 @@ + + + + + + + + {{ $meta_title ?? 'Admin' }} - {{ config('app.name') }} + + + + + + @vite(['resources/css/app.css', 'resources/js/app.js']) + @stack('styles') + + +
+ + + + +
+ +
+
+

{{ $page_title ?? 'Admin Dashboard' }}

+
+ + Back to Site + + + Logout + + +
+
+
+ + +
+ @if(session('success')) +
+ {{ session('success') }} +
+ @endif + + @if(session('error')) +
+ {{ session('error') }} +
+ @endif + + @yield('content') +
+
+
+ + + + @stack('scripts') + + + diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index eaa606538..e0721a147 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -1,30 +1,22 @@ - - - - + + + + - {{ config('app.name', 'Laravel') }} + {{ config('app.name') }} - - - + + + @vite(['resources/css/app.css', 'resources/js/app.js']) + @stack('styles') + + + @yield('content') - - @vite(['resources/css/app.css', 'resources/js/app.js']) - - -
-
- - - -
- -
- {{ $slot }} -
-
- + + + @stack('scripts') + diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php new file mode 100644 index 000000000..b3594d88c --- /dev/null +++ b/resources/views/layouts/main.blade.php @@ -0,0 +1,88 @@ + + + + + + + + {{ $meta_title ?? config('app.name') }}@if(isset($meta_title) && $meta_title != '' && $site->metatitle != '') - @endif{{ $site->metatitle ?? '' }} + + + + + + + @vite(['resources/css/app.css', 'resources/js/app.js']) + @stack('styles') + + +
+ + @auth + + @endauth + + +
+ + @auth +
+ @include('partials.header-menu') +
+ @endauth + + +
+
+ @if(session('success')) +
+ {{ session('success') }} +
+ @endif + + @if(session('error')) +
+ {{ session('error') }} +
+ @endif + + @yield('content') +
+
+ + +
+ @include('partials.footer') +
+
+
+ + + + + + + @stack('scripts') + + + + + diff --git a/resources/views/movies/index.blade.php b/resources/views/movies/index.blade.php new file mode 100644 index 000000000..13a6a1eb3 --- /dev/null +++ b/resources/views/movies/index.blade.php @@ -0,0 +1,202 @@ +@extends('layouts.main') + +@section('content') +
+ +
+ +
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+
+ + + @if(isset($results) && $results->count() > 0) +
+ +
+
+ Showing {{ $results->firstItem() }} to {{ $results->lastItem() }} of {{ $results->total() }} movies +
+
+ {{ $results->links() }} +
+
+ +
+ @foreach($results as $result) + @php + // Get the first GUID from the comma-separated list + $guid = isset($result->grp_release_guid) ? explode(',', $result->grp_release_guid)[0] : null; + @endphp +
+
+ +
+ @if($guid) + + @if(isset($result->cover) && $result->cover) + {{ $result->title }} + @else +
+ +
+ @endif + + @else + @if(isset($result->cover) && $result->cover) + {{ $result->title }} + @else +
+ +
+ @endif + @endif +
+ + +
+
+
+ @if($guid) + +

{{ $result->title }}

+ + @else +

{{ $result->title }}

+ @endif + +
+ @if(isset($result->year) && $result->year) + {{ $result->year }} + @endif + @if(isset($result->rating) && $result->rating) + + {{ $result->rating }} + + @endif + @if(isset($result->imdbid) && $result->imdbid) + + IMDb + + @endif +
+
+
+ + @if(isset($result->plot) && $result->plot) +

{{ $result->plot }}

+ @endif + +
+ @if(isset($result->genre) && $result->genre) +
+ Genre: {!! $result->genre !!} +
+ @endif +
+ +
+ @if(isset($result->director) && $result->director) +
+ Director: {!! $result->director !!} +
+ @endif +
+ +
+ @if(isset($result->actors) && $result->actors) +
+ Actors: {!! $result->actors !!} +
+ @endif +
+ + @if($guid) +
+ + View Details + +
+ @endif +
+
+
+ @endforeach +
+ + +
+ {{ $results->links() }} +
+
+ @else +
+ +

No movies found.

+
+ @endif +
+@endsection + diff --git a/resources/views/movies/trailer-modal.blade.php b/resources/views/movies/trailer-modal.blade.php new file mode 100644 index 000000000..88800dce8 --- /dev/null +++ b/resources/views/movies/trailer-modal.blade.php @@ -0,0 +1,30 @@ + +
+ @if(isset($movie)) +

{{ $movie['title'] ?? 'Movie Trailer' }}

+ + @if(isset($movie['trailer']) && $movie['trailer']) +
+ +
+ @else +
+ +

No trailer available for this movie.

+
+ @endif + + @if(isset($movie['plot']) && $movie['plot']) +
+

Plot

+

{{ $movie['plot'] }}

+
+ @endif + @endif +
+ diff --git a/resources/views/movies/viewmoviefull.blade.php b/resources/views/movies/viewmoviefull.blade.php new file mode 100644 index 000000000..a968cbe33 --- /dev/null +++ b/resources/views/movies/viewmoviefull.blade.php @@ -0,0 +1,127 @@ +@extends('layouts.main') + +@section('content') +
+ +
+ +
+ + @if(isset($movie)) +
+
+ +
+ @if(isset($movie['cover']) && $movie['cover']) + {{ $movie['title'] }} + @else +
+ +
+ @endif +
+ + +
+

{{ $movie['title'] }}

+ + @if(isset($movie['rating']) && $movie['rating']) +
+ + + + {{ $movie['rating'] }} + / 10 +
+ @endif + +
+ @if(isset($movie['year']) && $movie['year']) +
+ Year: + {{ $movie['year'] }} +
+ @endif + + @if(isset($movie['genre']) && $movie['genre']) +
+ Genre: + {!! $movie['genre'] !!} +
+ @endif + + @if(isset($movie['director']) && $movie['director']) +
+ Director: + {!! $movie['director'] !!} +
+ @endif + + @if(isset($movie['actors']) && $movie['actors']) +
+ Actors: + {!! $movie['actors'] !!} +
+ @endif + + @if(isset($movie['language']) && $movie['language']) +
+ Language: + {{ $movie['language'] }} +
+ @endif +
+ + @if(isset($movie['plot']) && $movie['plot']) +
+

Plot

+

{{ $movie['plot'] }}

+
+ @endif + + + @if(isset($movie['trailer']) && $movie['trailer']) +
+

Trailer

+
+ +
+
+ @endif +
+
+
+ @else +
+ +

Movie details not available.

+
+ @endif +
+@endsection + diff --git a/resources/views/movies/viewmovietrailer.blade.php b/resources/views/movies/viewmovietrailer.blade.php new file mode 100644 index 000000000..8a99ea30a --- /dev/null +++ b/resources/views/movies/viewmovietrailer.blade.php @@ -0,0 +1,93 @@ +@extends('layouts.main') + +@section('content') +
+ +
+ +
+ +
+ @if(isset($movie)) +

{{ $movie['title'] ?? 'Movie Trailer' }}

+ + @if(isset($movie['trailer']) && $movie['trailer']) +
+ +
+ @else +
+ +

No trailer available for this movie.

+
+ @endif + +
+ @if(isset($movie['cover']) && $movie['cover']) +
+ {{ $movie['title'] }} +
+ @endif + +
+ @if(isset($movie['plot']) && $movie['plot']) +
+

Plot

+

{{ $movie['plot'] }}

+
+ @endif + +
+ @if(isset($movie['year']) && $movie['year']) +
+ Year: + {{ $movie['year'] }} +
+ @endif + + @if(isset($movie['rating']) && $movie['rating']) +
+ Rating: + + {{ $movie['rating'] }} / 10 + +
+ @endif +
+
+
+ @else +
+ +

Movie information not available.

+
+ @endif +
+
+@endsection + diff --git a/resources/views/partials/admin-menu.blade.php b/resources/views/partials/admin-menu.blade.php new file mode 100644 index 000000000..404c0c7d6 --- /dev/null +++ b/resources/views/partials/admin-menu.blade.php @@ -0,0 +1,200 @@ +
+ + + + Dashboard + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+ + +
+ +
+ + +
+ + +
+ + +
+ + + @auth +
+ + + Profile + + @if(auth()->user()->hasRole('Admin')) + + + Admin Panel + + @endif + + + Sign Out + + +
+ @endauth +
+ + + diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php new file mode 100644 index 000000000..f83e5e7ba --- /dev/null +++ b/resources/views/partials/footer.blade.php @@ -0,0 +1,54 @@ + + diff --git a/resources/views/partials/header-menu.blade.php b/resources/views/partials/header-menu.blade.php new file mode 100644 index 000000000..17871b40d --- /dev/null +++ b/resources/views/partials/header-menu.blade.php @@ -0,0 +1,290 @@ + + + + diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php new file mode 100644 index 000000000..3e51cf5fd --- /dev/null +++ b/resources/views/partials/sidebar.blade.php @@ -0,0 +1,135 @@ + + + + diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php new file mode 100644 index 000000000..585d94785 --- /dev/null +++ b/resources/views/profile/edit.blade.php @@ -0,0 +1,182 @@ +@extends('layouts.main') + +@section('content') +
+
+ +
+

Edit Profile

+

Update your account settings and preferences

+
+ + + @if(session('success')) +
+ {{ session('success') }} +
+ @endif + + @if($success_2fa) +
+ {{ $success_2fa }} +
+ @endif + + @if($error || $error_2fa) +
+ {{ $error ?: $error_2fa }} +
+ @endif + + +
+ @csrf + + + +
+ + + @error('email') +

{{ $message }}

+ @enderror +
+ + +
+ + +

Must contain at least 8 characters, including uppercase, lowercase, numbers and special characters

+ @error('password') +

{{ $message }}

+ @enderror +
+ + +
+ + +
+ + +
+

Cover View Preferences

+
+ + + + + + +
+
+ + +
+

Category Permissions

+
+ + + + + + + + +
+
+ + + @if($google2fa_url) +
+

Two-Factor Authentication

+
+

Scan this QR code with your authenticator app to enable 2FA:

+
+ {!! $google2fa_url !!} +
+

After scanning, visit the 2FA settings page to complete setup

+
+
+ @endif + + +
+ + Cancel + +
+ + New API Key + + +
+
+
+
+
+@endsection + diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php new file mode 100644 index 000000000..b0b93517c --- /dev/null +++ b/resources/views/profile/index.blade.php @@ -0,0 +1,299 @@ +@extends('layouts.main') + +@section('content') + + + +
+ +
+

+ User Profile +

+
+ @if(($isadmin ?? false) || !$publicview) + + Edit Profile + + @endif + @if(!($isadmin ?? false) && !$publicview) + + Delete Account + + @endif +
+
+ +
+
+ +
+ +
+ {{ $user->username }} +
+ + +
+ + General Information + + + UI Preferences + + + API & Downloads + + @if(($user->id === auth()->id() || ($isadmin ?? false)) && config('nntmux.registerstatus') == 1) + + My Invitations + + @endif + @if(($isadmin ?? false) && isset($downloadlist) && count($downloadlist) > 0) + + Recent Downloads + + @endif +
+
+ + +
+ +
+
+
+ +

General Information

+
+
+
+
Username
+
{{ $user->username }}
+
+ + @if(($isadmin ?? false) || !$publicview) +
+
Email
+
{{ $user->email }}
+
+ @endif + +
+
Registered
+
+ + {{ \Carbon\Carbon::parse($user->created_at)->format('M d, Y') }} + {{ \Carbon\Carbon::parse($user->created_at)->diffForHumans() }} +
+
+ +
+
Role
+
+ + {{ $user->roles->first()->name ?? 'User' }} + +
+
+ +
+
Last Login
+
{{ \Carbon\Carbon::parse($user->lastlogin)->diffForHumans() }}
+
+ + @if($userinvitedby) +
+
Invited By
+
+ + {{ $userinvitedby->username }} + +
+
+ @endif + +
+
Grabs
+
{{ number_format($user->grabs ?? 0) }}
+
+
+
+
+ + + + + + + + + @if(($isadmin ?? false) && isset($downloadlist) && count($downloadlist) > 0) + + @endif +
+
+
+
+ +@push('styles') + +@endpush + +@push('scripts') + +@endpush +@endsection + diff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.php new file mode 100644 index 000000000..61f26cf18 --- /dev/null +++ b/resources/views/search/index.blade.php @@ -0,0 +1,167 @@ +@extends('layouts.main') + +@section('content') +
+
+

Search Releases

+

Find exactly what you're looking for

+
+ + +
+
+ +
+ + +
+ + +
+ + +
+
+ + @if(request('search_type') == 'adv') + +
+

Advanced Options

+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ @endif + + +
+ + + Advanced Search + + + Clear + +
+
+ + + @if(isset($results) && $results->count() > 0) +
+
+

+ Search Results ({{ $results->total() }} found) +

+
+ Page {{ $results->currentPage() }} of {{ $results->lastPage() }} +
+
+ +
+ @foreach($results as $result) +
+
+
+ + {{ $result->searchname }} + +
+ + {{ $result->category_name ?? 'Other' }} + + {{ \Carbon\Carbon::parse($result->postdate)->diffForHumans() }} + {{ number_format($result->size / 1073741824, 2) }} GB + {{ $result->totalpart ?? 0 }} files + @if($result->group_name) + {{ $result->group_name }} + @endif +
+
+
+ + + +
+
+
+ @endforeach +
+ + +
+ {{ $results->appends(request()->query())->links() }} +
+
+ @elseif(request()->has('search')) +
+ +

No results found

+

Try adjusting your search terms or using different filters.

+
+ @else +
+ +

Start Your Search

+

Enter search terms above to find releases.

+
+ @endif +
+@endsection + diff --git a/routes/web.php b/routes/web.php index 9671dc289..97b1a1a88 100644 --- a/routes/web.php +++ b/routes/web.php @@ -107,6 +107,7 @@ Route::middleware('isVerified')->group(function () { }); Route::match(['GET', 'POST'], 'details/{guid}', [DetailsController::class, 'show'])->name('details'); + Route::match(['GET', 'POST'], 'getnzb/{guid}', [GetNzbController::class, 'getNzb'])->name('getnzb.guid'); Route::match(['GET', 'POST'], 'getnzb', [GetNzbController::class, 'getNzb'])->name('getnzb'); Route::match(['GET', 'POST'], 'rsshelp', [RssController::class, 'showRssDesc'])->name('rsshelp'); Route::match(['GET', 'POST'], 'profile', [ProfileController::class, 'show'])->name('profile');