diff --git a/Blacklight/Binaries.php b/Blacklight/Binaries.php index 4c64f1993..829e442ef 100755 --- a/Blacklight/Binaries.php +++ b/Blacklight/Binaries.php @@ -6,7 +6,6 @@ use App\Models\Group; use App\Models\Settings; use Illuminate\Support\Carbon; use App\Models\BinaryBlacklist; -use App\Models\MultigroupPoster; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; use Illuminate\Database\QueryException; @@ -1568,26 +1567,6 @@ class Binaries return $ignore; } - /** - * Returns all multigroup poster entries from the database. - * - * - * @return \Illuminate\Database\Eloquent\Collection|static[] - */ - protected function getMultiGroupPosters() - { - $poster = Cache::get('mgrposter'); - if ($poster !== null) { - return $poster; - } - - $poster = MultigroupPoster::query()->get(['poster']); - $expiresAt = now()->addMinutes(config('nntmux.cache_expiry_short')); - Cache::put('mgrposter', $poster, $expiresAt); - - return $poster; - } - /** * @param $query * diff --git a/Blacklight/processing/ProcessReleases.php b/Blacklight/processing/ProcessReleases.php index 40f181d78..3b02a86d7 100755 --- a/Blacklight/processing/ProcessReleases.php +++ b/Blacklight/processing/ProcessReleases.php @@ -705,7 +705,6 @@ class ProcessReleases public function createNZBs($groupID): int { $startTime = now(); - $this->formFromNamesQuery(); if ($this->echoCLI) { $this->colorCli->header('Process Releases -> Create the NZB, delete collections/binaries/parts.'); @@ -720,9 +719,8 @@ class ProcessReleases FROM releases r INNER JOIN categories c ON r.categories_id = c.id INNER JOIN categories cp ON cp.id = c.parentid - WHERE %s nzbstatus = 0 %s", - (! empty($groupID) ? ' r.groups_id = '.$groupID.' AND ' : ' '), - $this->fromNamesQuery + WHERE %s nzbstatus = 0", + ! empty($groupID) ? ' r.groups_id = '.$groupID.' AND ' : ' ' ) ); diff --git a/Changelog b/Changelog index 70d477810..ee3601a07 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-01-01 DariusIII + * Fix: Fix couple of leftover lines pointing to non-existing functions * Fix: Remove ProcessReleasesMultiGroup from switch.php * Chg: Revert Binaries to pre-tpg and mgr state, with single tables for binaries, collections, parts and missed_parts 2018-12-31 DariusIII diff --git a/app/Http/Controllers/Admin/MgrPosterController.php b/app/Http/Controllers/Admin/MgrPosterController.php deleted file mode 100644 index cc0170f2f..000000000 --- a/app/Http/Controllers/Admin/MgrPosterController.php +++ /dev/null @@ -1,115 +0,0 @@ -setAdminPrefs(); - - $posters = MultigroupPoster::all('id', 'poster')->sortBy('poster'); - - $postersCheck = $posters->first(); - - $poster = $request->has('poster') && ! empty($request->input('poster')) ? $request->input('poster') : ''; - - $this->smarty->assign( - [ - 'poster' => $poster, - 'posters' => $posters, - 'check' => $postersCheck, - ] - ); - - $title = 'MultiGroup Posters List'; - $content = $this->smarty->fetch('posters-list.tpl'); - - $this->smarty->assign( - [ - 'title' => $title, - 'meta_title' => $title, - 'content' => $content, - ] - ); - - $this->adminrender(); - } - - /** - * @param string $id - * @param \Illuminate\Http\Request $request - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws \Exception - */ - public function edit($id = '', Request $request) - { - $this->setAdminPrefs(); - - // Set the current action. - $action = $request->input('action') ?? 'view'; - - switch ($action) { - case 'submit': - if ($id === '') { - // Add a new mg poster. - $poster = MultigroupPoster::query()->insertGetId(['poster' => $request->input('poster')]); - } else { - // Update an existing mg poster. - $poster = MultigroupPoster::query()->where('id', '=', $id)->update(['poster' => $request->input('poster')]); - } - $this->smarty->assign('poster', $poster); - - return redirect('admin/posters-list'); - break; - - case 'view': - default: - if (! empty($id)) { - $title = 'MultiGroup Poster Edit'; - $poster = MultigroupPoster::query()->where('id', '=', $id)->firstOrFail(); - } else { - $title = 'MultiGroup Poster Add'; - $poster = ''; - } - $this->smarty->assign('poster', $poster); - break; - } - - $content = $this->smarty->fetch('posters-edit.tpl'); - - $this->smarty->assign( - [ - 'title' => $title, - 'meta_title' => $title, - 'content' => $content, - ] - ); - - $this->adminrender(); - } - - /** - * @param $id - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function destroy($id) - { - if ($id) { - MultigroupPoster::query()->where('id', '=', $id)->delete(); - } - - return redirect('admin/posters-list'); - } -} diff --git a/routes/web.php b/routes/web.php index c683d916c..f0db9d656 100644 --- a/routes/web.php +++ b/routes/web.php @@ -278,12 +278,6 @@ Route::group(['middleware' => ['role:Admin'], 'prefix' => 'admin', 'namespace' = Route::post('ajax', 'AjaxController@ajaxAction'); Route::get('tmux-edit', 'TmuxController@edit'); Route::post('tmux-edit', 'TmuxController@edit'); - Route::get('posters-list', 'MgrPosterController@index'); - Route::post('posters-list', 'MgrPosterController@index'); - Route::get('posters-edit/{id?}', 'MgrPosterController@edit'); - Route::post('posters-edit{id?}', 'MgrPosterController@edit'); - Route::get('poster-delete/{id}', 'MgrPosterController@destroy'); - Route::post('poster-delete/{id}', 'MgrPosterController@destroy'); Route::get('release-list', 'ReleasesController@index'); Route::post('release-list', 'ReleasesController@index'); Route::get('release-delete/{id}', 'ReleasesController@destroy');