From 8e4bfbcf0e7425a1b9497d4112be48ba286ee0c1 Mon Sep 17 00:00:00 2001 From: zeldaroot Date: Sun, 13 Jun 2021 04:18:31 +0300 Subject: [PATCH] Updated PM2 ver --- Dockerfile | 2 +- lib/CP_get.js | 2 +- themes/default/views/admin/codes.ejs | 10 +- themes/default/views/admin/descriptions.ejs | 2 +- themes/default/views/admin/display.ejs | 14 +- themes/default/views/admin/h1.ejs | 2 +- themes/default/views/admin/homepage.ejs | 26 +- themes/default/views/admin/index.ejs | 2 +- themes/default/views/admin/main.ejs | 44 +-- themes/default/views/admin/modules/abuse.ejs | 18 +- themes/default/views/admin/modules/adv.ejs | 264 +++++++++--------- themes/default/views/admin/modules/api.ejs | 4 +- themes/default/views/admin/modules/app.ejs | 6 +- .../default/views/admin/modules/blocking.ejs | 16 +- .../default/views/admin/modules/comments.ejs | 22 +- .../default/views/admin/modules/content.ejs | 14 +- .../default/views/admin/modules/continue.ejs | 2 +- .../default/views/admin/modules/episode.ejs | 12 +- themes/default/views/admin/modules/ftp.ejs | 2 +- themes/default/views/admin/modules/mobile.ejs | 10 +- themes/default/views/admin/modules/player.ejs | 14 +- themes/default/views/admin/modules/random.ejs | 10 +- .../default/views/admin/modules/related.ejs | 16 +- .../default/views/admin/modules/rewrite.ejs | 8 +- themes/default/views/admin/modules/rss.ejs | 2 +- themes/default/views/admin/modules/schema.ejs | 4 +- themes/default/views/admin/modules/slider.ejs | 4 +- themes/default/views/admin/modules/social.ejs | 14 +- themes/default/views/admin/modules/soon.ejs | 6 +- themes/default/views/admin/modules/top.ejs | 4 +- themes/default/views/admin/modules/tv.ejs | 8 +- themes/default/views/admin/modules/viewed.ejs | 4 +- themes/default/views/admin/movies.ejs | 4 +- themes/default/views/admin/publish.ejs | 10 +- themes/default/views/admin/titles.ejs | 2 +- themes/default/views/admin/urls.ejs | 30 +- 36 files changed, 307 insertions(+), 307 deletions(-) diff --git a/Dockerfile b/Dockerfile index ece59f8..f929e79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN set -o pipefail \ && cp /usr/share/zoneinfo/Europe/Moscow /etc/localtime \ && echo "Europe/Moscow" > /etc/timezone \ && npm i node-gyp -g \ - && npm i pm2@4.5.6 -g \ + && npm i pm2@5.1.0 -g \ && npm i cinematheme@0.0.13 -g \ && npm i \ && mkdir -p \ diff --git a/lib/CP_get.js b/lib/CP_get.js index 2bdb0cb..9248940 100644 --- a/lib/CP_get.js +++ b/lib/CP_get.js @@ -221,7 +221,7 @@ function moviesGet(query, count, sorting, page, structure, options, callback) { : '') + process.env['CP_RT']; } - if (q._from.indexOf(',') === -1) { + if (!q._from || q._from.indexOf(',') === -1) { q._from = 'rt_' + config.database.all_movies.replace(/[^a-z0-9]/gi, '_'); } diff --git a/themes/default/views/admin/codes.ejs b/themes/default/views/admin/codes.ejs index 5d99c96..d9d381d 100644 --- a/themes/default/views/admin/codes.ejs +++ b/themes/default/views/admin/codes.ejs @@ -40,7 +40,7 @@ <%= __('Вставить код на веб-сайт') %> - @@ -64,7 +64,7 @@    <%= __('Вставить код в верх веб-страницы') %> @@ -161,7 +161,7 @@    <%= __('Просмотр файла robots.txt и карты сайта') %>