From cb1094345ea290ee4cf2cfd53ced89798aba6000 Mon Sep 17 00:00:00 2001 From: Chewbaka69 Date: Wed, 24 Apr 2019 14:15:49 +0200 Subject: [PATCH] Fix somes errors and useless file --- fuel/app/classes/controller/admin.php | 2 +- .../classes/controller/admin/libraries.php | 1 - fuel/app/classes/controller/movie.php | 6 - fuel/app/classes/controller/rest/browse.php | 2 +- fuel/app/classes/controller/rest/movie.php | 36 +-- fuel/app/classes/controller/rest/settings.php | 8 +- .../classes/controller/settings/libraries.php | 1 + fuel/app/classes/model/movie.php | 9 +- fuel/app/views/admin/body.php | 6 +- fuel/app/views/episode/index.php | 10 +- fuel/app/views/home/index.php | 39 +-- fuel/app/views/layout/header.php | 2 +- fuel/app/views/layout/index.php | 1 - fuel/app/views/login/index.php | 1 + fuel/app/views/modal/modal.php | 55 ---- fuel/app/views/movie/episode.php | 262 ------------------ fuel/app/views/movie/index.php | 3 +- fuel/app/views/movie/movie.php | 262 ------------------ fuel/app/views/register/index.php | 1 + fuel/app/views/season/index.php | 16 -- fuel/app/views/settings/body.php | 8 +- fuel/app/views/tvshow/index.php | 21 -- 22 files changed, 53 insertions(+), 699 deletions(-) delete mode 100755 fuel/app/views/modal/modal.php delete mode 100644 fuel/app/views/movie/episode.php delete mode 100644 fuel/app/views/movie/movie.php diff --git a/fuel/app/classes/controller/admin.php b/fuel/app/classes/controller/admin.php index 2df54ef..3ee5da7 100755 --- a/fuel/app/classes/controller/admin.php +++ b/fuel/app/classes/controller/admin.php @@ -22,7 +22,7 @@ class Controller_Admin extends Controller_Template $this->template->user = Session::get('user'); - $this->template->js_bottom = []; + $this->template->js_bottom = ['plex_alert.js']; } public function action_index() diff --git a/fuel/app/classes/controller/admin/libraries.php b/fuel/app/classes/controller/admin/libraries.php index 490145c..0fb4545 100644 --- a/fuel/app/classes/controller/admin/libraries.php +++ b/fuel/app/classes/controller/admin/libraries.php @@ -20,7 +20,6 @@ class Controller_Admin_Libraries extends Controller_Admin public function action_permissions() { - $this->template->js_bottom = ['plex_alert.js']; $body = View::forge('admin/libraries/permissions'); diff --git a/fuel/app/classes/controller/movie.php b/fuel/app/classes/controller/movie.php index 03f7c53..1d29e4d 100644 --- a/fuel/app/classes/controller/movie.php +++ b/fuel/app/classes/controller/movie.php @@ -25,12 +25,6 @@ class Controller_Movie extends Controller_Home $this->template->title = $movie->title; - $movie->getMetaData(); - - $movie->getTrailer(); - - $body = View::forge('movie/index'); - $body->set('movie', $movie); $this->template->body = $body; diff --git a/fuel/app/classes/controller/rest/browse.php b/fuel/app/classes/controller/rest/browse.php index 280aa92..8658571 100644 --- a/fuel/app/classes/controller/rest/browse.php +++ b/fuel/app/classes/controller/rest/browse.php @@ -18,7 +18,7 @@ class Controller_Rest_Browse extends Controller_Rest )); } else { $server = Model_Server::find(array( - 'select' => array('id', 'name', 'url', 'port', 'token'), + 'select' => array('*'), 'where' => array( 'id' => Input::get('server_id') ) diff --git a/fuel/app/classes/controller/rest/movie.php b/fuel/app/classes/controller/rest/movie.php index 5e904b4..8a84d32 100644 --- a/fuel/app/classes/controller/rest/movie.php +++ b/fuel/app/classes/controller/rest/movie.php @@ -8,29 +8,33 @@ class Controller_Rest_Movie extends Controller_Rest { public function get_stream() { - $movie_id = Input::get('movie_id'); + try { + $movie_id = Input::get('movie_id'); - if(!$movie_id) - throw new FuelException('No movie id'); + if (!$movie_id) + throw new FuelException('No movie id'); - $movie = Model_Movie::find_by_pk($movie_id); + $movie = Model_Movie::find_by_pk($movie_id); - if(!$movie) - throw new FuelException('No movie found'); + if (!$movie) + throw new FuelException('No movie found'); - $user_settings = Model_Settings::find_one_by('user_id', Session::get('user')->id); + $user_settings = Model_Settings::find_one_by('user_id', Session::get('user')->id); - if($movie->type !== 'movie') - $episodes = $movie->getSeason()->getEpisodes(); - else - $episodes = [$movie]; + if ($movie->type !== 'movie') + $episodes = $movie->getSeason()->getEpisodes(); + else + $episodes = [$movie]; - $view = View::forge('stream/index'); + $view = View::forge('stream/index'); - $view->set('user_settings', $user_settings); - $view->set('movie', $movie); - $view->set('episodes', $episodes); + $view->set('user_settings', $user_settings); + $view->set('movie', $movie); + $view->set('episodes', $episodes); - return $this->response($view->render()); + return $this->response($view->render()); + } catch (Exception $exception) { + return $this->response($exception->getMessage(), 500); + } } } \ No newline at end of file diff --git a/fuel/app/classes/controller/rest/settings.php b/fuel/app/classes/controller/rest/settings.php index f80d6bf..4edbac9 100644 --- a/fuel/app/classes/controller/rest/settings.php +++ b/fuel/app/classes/controller/rest/settings.php @@ -2,6 +2,8 @@ use Fuel\Core\Controller_Rest; use Fuel\Core\FuelException; +use Fuel\Core\Input; +use Fuel\Core\Request; use Fuel\Core\Session; use Fuel\Core\View; @@ -9,7 +11,7 @@ class Controller_Rest_Settings extends Controller_Rest { public function get_modal_server() { - $view = View::forge('modal/modal'); + $view = View::forge('modal/server'); return $this->response($view->render()); } @@ -50,9 +52,9 @@ class Controller_Rest_Settings extends Controller_Rest ]); $server->save(); - return $this->response(array('error' => false)); + return $this->response(['error' => false]); } catch (FuelException $e) { - return $this->response(array('error' => true, 'message' => $e->getMessage() ?: 'Wrong parameters'), $e->getCode()); + return $this->response(['error' => true, 'message' => $e->getMessage() ?: 'Wrong parameters'], $e->getCode() > 100 ? $e->getCode() : null); } } diff --git a/fuel/app/classes/controller/settings/libraries.php b/fuel/app/classes/controller/settings/libraries.php index 55bd32a..0070904 100644 --- a/fuel/app/classes/controller/settings/libraries.php +++ b/fuel/app/classes/controller/settings/libraries.php @@ -8,6 +8,7 @@ class Controller_Settings_Libraries extends Controller_Settings public function action_index() { $this->template->js_bottom = ['plex_alert.js', 'server_refresh.js']; + $this->template->css = ['settings.css']; $body = View::forge('settings/libraries'); diff --git a/fuel/app/classes/model/movie.php b/fuel/app/classes/model/movie.php index d215835..d0cf610 100644 --- a/fuel/app/classes/model/movie.php +++ b/fuel/app/classes/model/movie.php @@ -37,6 +37,7 @@ class Model_Movie extends Model_Overwrite ); public $metadata = []; + public $download = ''; private $_session = null; @@ -455,12 +456,10 @@ class Model_Movie extends Model_Overwrite public static function getThirtyLastedTvShows($server) { - $conf = Config::get('db'); - - return self::find(function ($query) use ($server, $conf) { + return self::find(function ($query) use ($server) { /** @var Database_Query_Builder_Select $query */ return $query - ->select('movie.*', DB::expr('COUNT(' . $conf['default']['table_prefix'] . 'movie.type) AS count')) + ->select('movie.*', DB::expr('COUNT(' . DB::table_prefix('movie') . '.type) AS count')) ->join('season', 'LEFT') ->on('movie.season_id', '=', 'season.id') ->join('tvshow', 'LEFT') @@ -472,7 +471,7 @@ class Model_Movie extends Model_Overwrite ->where('server.id', $server->id) ->and_where('movie.type', 'episode') ->order_by('movie.addedAt', 'DESC') - ->order_by(DB::expr('MAX(' . $conf['default']['table_prefix'] .'movie.addedAt)'), 'DESC ')//'movie.addedAt', 'DESC') + ->order_by(DB::expr('MAX(' . DB::table_prefix('movie') .'.addedAt)'), 'DESC ')//'movie.addedAt', 'DESC') ->group_by('movie.season_id') ->limit(30) ; diff --git a/fuel/app/views/admin/body.php b/fuel/app/views/admin/body.php index 7107707..c45ba08 100644 --- a/fuel/app/views/admin/body.php +++ b/fuel/app/views/admin/body.php @@ -1,3 +1,5 @@ + + PlexShare :: Administration @@ -43,8 +45,8 @@ echo \Asset::js(isset($js_bottom) ? $js_bottom : null); echo \Asset::js(['bootstrap.min.js']); ?> diff --git a/fuel/app/views/episode/index.php b/fuel/app/views/episode/index.php index 192fed7..7f85c48 100644 --- a/fuel/app/views/episode/index.php +++ b/fuel/app/views/episode/index.php @@ -87,21 +87,21 @@ - getMetaData()['Media']['@attributes']['videoResolution'] >= 720) : ?> + getMetaData()['Media']['@attributes']) && (int)$episode->getMetaData()['Media']['@attributes']['videoResolution'] >= 720) : ?>
- getMetaData()['Stream']['Audio'][0]['codec'] === 'ac3') : ?> + getMetaData()['Stream']['Audio'][0]) && $episode->getMetaData()['Stream']['Audio'][0]['codec'] === 'ac3') : ?>
- getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?> + getMetaData()['Stream']['Audio'][0]) && preg_match('/7\.1(\([a-z]*\))?/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
- getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?> + getMetaData()['Stream']['Audio'][0]) && preg_match('/5\.1(\([a-z]*\))?/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
- getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?> + getMetaData()['Stream']['Audio'][0]) && preg_match('/stereo/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
diff --git a/fuel/app/views/home/index.php b/fuel/app/views/home/index.php index 479d8e9..430c02a 100755 --- a/fuel/app/views/home/index.php +++ b/fuel/app/views/home/index.php @@ -75,24 +75,6 @@ aria-hidden="true"> - - @@ -202,24 +184,6 @@ - - @@ -266,7 +230,8 @@ }).done(function (view) { launchPlayer(view); }).fail(function (data) { - console.error(data); + console.error(data.responseText); + show_alert('error', data.responseText); }); }); /** LOADING PICTURE **/ diff --git a/fuel/app/views/layout/header.php b/fuel/app/views/layout/header.php index cf5a582..e049d9a 100644 --- a/fuel/app/views/layout/header.php +++ b/fuel/app/views/layout/header.php @@ -5,7 +5,7 @@ diff --git a/fuel/app/views/layout/index.php b/fuel/app/views/layout/index.php index f1b7a09..2aacc75 100644 --- a/fuel/app/views/layout/index.php +++ b/fuel/app/views/layout/index.php @@ -11,5 +11,4 @@ 'MenuServer' => isset($MenuServer) ? $MenuServer : null, 'js_bottom' => isset($js_bottom) ? $js_bottom : null, ]); ?> - \ No newline at end of file diff --git a/fuel/app/views/login/index.php b/fuel/app/views/login/index.php index 5946d47..59a5a63 100755 --- a/fuel/app/views/login/index.php +++ b/fuel/app/views/login/index.php @@ -85,5 +85,6 @@ +Created By Chewbaka69 // https://github.com/Chewbaka69/PlexShare \ No newline at end of file diff --git a/fuel/app/views/modal/modal.php b/fuel/app/views/modal/modal.php deleted file mode 100755 index 4b544d0..0000000 --- a/fuel/app/views/modal/modal.php +++ /dev/null @@ -1,55 +0,0 @@ - \ No newline at end of file diff --git a/fuel/app/views/movie/episode.php b/fuel/app/views/movie/episode.php deleted file mode 100644 index 9cdae64..0000000 --- a/fuel/app/views/movie/episode.php +++ /dev/null @@ -1,262 +0,0 @@ -
- -
-
-
- - -
-
-
-
-
-
-
-
-
- -
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
- -
-
rating * 10; ?>% -
-
-
-
getDuration(); ?> - · - -
-
getReleaseDate(); ?>
-
-
-
-
-
- metadata['Director']) : ?> -
-
Directed by
-
- - metadata['Director'] as $director) : ?> - metadata['Director']['@attributes']) ? $movie->metadata['Director'] : $director; ?> - - - - , - - metadata['Director']['@attributes'])) { - break; - } ?> - - -
-
- - metadata['Writer']) : ?> -
-
Writed by
-
- - metadata['Writer'] as $writer) : ?> - metadata['Writer']['@attributes']) ? $movie->metadata['Writer'] : $writer; ?> - - - - , - - metadata['Writer']['@attributes'])) { - break; - } ?> - - -
-
- -
-
-
-
Vidéo
-
- - metadata['Media']['@attributes']['videoResolution']); ?> - - metadata['Media']['@attributes']['videoCodec']); ?> - -
-
-
-
Audio
-
- - Inconnu - - MP3 Stéréo -
-
-
-
Sous-titres
-
Aucun
-
-
-
-
-
summary; ?> -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \ No newline at end of file diff --git a/fuel/app/views/movie/index.php b/fuel/app/views/movie/index.php index 1c4815e..0368793 100644 --- a/fuel/app/views/movie/index.php +++ b/fuel/app/views/movie/index.php @@ -105,7 +105,7 @@
+ metadata['Genre'])) :?> metadata['Genre'] as $genre) : ?> metadata['Genre']['@attributes']) ? $movie->metadata['Genre'] : $genre; ?> diff --git a/fuel/app/views/movie/movie.php b/fuel/app/views/movie/movie.php deleted file mode 100644 index 17fb54b..0000000 --- a/fuel/app/views/movie/movie.php +++ /dev/null @@ -1,262 +0,0 @@ -
-
title; ?> -
-
-
-
- - -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
- - - year; ?> - - -
-
-
rating * 10; ?>% -
-
-
-
- - getDuration(); ?> - - -
-
- - metadata['Genre'] as $genre) : ?> - metadata['Genre']['@attributes']) ? $movie->metadata['Genre'] : $genre; ?> - - - - , - - metadata['Genre']['@attributes'])) { - break; - } ?> - - -
-
-
-
-
-
- metadata['Director']) : ?> -
-
Directed by
-
- - metadata['Director'] as $director) : ?> - metadata['Director']['@attributes']) ? $movie->metadata['Director'] : $director; ?> - - - - , - - metadata['Director']['@attributes'])) { - break; - } ?> - - -
-
- -
-
Writed by
-
- - metadata['Writer'] as $writer) : ?> - metadata['Writer']['@attributes']) ? $movie->metadata['Writer'] : $writer; ?> - - - - , - - metadata['Writer']['@attributes'])) { - break; - } ?> - - -
-
-
-
Studio
-
- - - - studio; ?> - - - -
-
-
-
-
-
Vidéo
-
- - SD - - MPEG4 - -
-
-
-
Audio
-
- - Inconnu - - MP3 Stéréo - -
-
-
-
Sous-titres
-
Aucun
-
-
-
-
-
summary; ?> -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \ No newline at end of file diff --git a/fuel/app/views/register/index.php b/fuel/app/views/register/index.php index 96a33fa..cdf715e 100755 --- a/fuel/app/views/register/index.php +++ b/fuel/app/views/register/index.php @@ -123,5 +123,6 @@ $('#password').pwstrength(); }); +Created By Chewbaka69 // https://github.com/Chewbaka69/PlexShare \ No newline at end of file diff --git a/fuel/app/views/season/index.php b/fuel/app/views/season/index.php index 0b93da3..8cbfd67 100644 --- a/fuel/app/views/season/index.php +++ b/fuel/app/views/season/index.php @@ -134,22 +134,6 @@
- -
diff --git a/fuel/app/views/settings/body.php b/fuel/app/views/settings/body.php index 72fbab7..02f3944 100644 --- a/fuel/app/views/settings/body.php +++ b/fuel/app/views/settings/body.php @@ -1,3 +1,5 @@ + + PlexShare :: Settings @@ -5,10 +7,10 @@ - +
@@ -39,7 +41,7 @@
- - -