From bafa7ad189ceed2be11314505b0fd08f6d4fa3f0 Mon Sep 17 00:00:00 2001 From: zeldaroot Date: Sat, 19 Jun 2021 00:38:58 +0300 Subject: [PATCH] Added ssh to php-mysql --- config/default/php/Dockerfile | 4 +- config/locales/ru/default/config.js | 2 +- .../default/views/admin/includes/footer.ejs | 1 - themes/default/views/admin/includes/right.ejs | 4 +- .../default/views/admin/modules/rewrite.ejs | 356 ------------------ themes/default/views/admin/movies.ejs | 101 ----- 6 files changed, 6 insertions(+), 462 deletions(-) delete mode 100644 themes/default/views/admin/modules/rewrite.ejs diff --git a/config/default/php/Dockerfile b/config/default/php/Dockerfile index 929d910..76073c1 100644 --- a/config/default/php/Dockerfile +++ b/config/default/php/Dockerfile @@ -10,6 +10,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ curl \ git \ zip unzip \ + sshpass \ && install-php-extensions \ bcmath \ bz2 \ @@ -29,7 +30,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ - sockets + sockets \ + ssh2 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && ln -s $(composer config --global home) /root/composer diff --git a/config/locales/ru/default/config.js b/config/locales/ru/default/config.js index 0e4d823..7b3eea5 100644 --- a/config/locales/ru/default/config.js +++ b/config/locales/ru/default/config.js @@ -375,7 +375,7 @@ module.exports = { "trailer": "", "picture": "" }, - "noindex": "noindex", + "noindex": "", "slash": "/" }, "l": { diff --git a/themes/default/views/admin/includes/footer.ejs b/themes/default/views/admin/includes/footer.ejs index 1c79c5f..706e8f9 100644 --- a/themes/default/views/admin/includes/footer.ejs +++ b/themes/default/views/admin/includes/footer.ejs @@ -636,7 +636,6 @@ 'modules.content.data.index.url', 'modules.content.data.movie.tags', 'modules.content.data.scraper', - 'modules.rewrite.data.token', 'modules.bots.data.token', 'modules.random.data.category', 'modules.random.data.menu', diff --git a/themes/default/views/admin/includes/right.ejs b/themes/default/views/admin/includes/right.ejs index 6450cc9..480dc06 100644 --- a/themes/default/views/admin/includes/right.ejs +++ b/themes/default/views/admin/includes/right.ejs @@ -4,7 +4,7 @@
- <%= __('Ошибки в переводе?') %>
@@ -14,7 +14,7 @@
-

<%= __('Есть вопросы?') %>

diff --git a/themes/default/views/admin/modules/rewrite.ejs b/themes/default/views/admin/modules/rewrite.ejs deleted file mode 100644 index 67c22ee..0000000 --- a/themes/default/views/admin/modules/rewrite.ejs +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - <%- include('../includes/head.ejs'); -%> - - - -
- - <%- include('../includes/left.ejs'); -%> - - <%- include('../includes/right.ejs'); -%> - -
- - <%- include('../includes/header-main.ejs'); -%> - -
- - <%- include('../includes/header-sec.ejs'); -%> - -
-
-
- - - - - - - -
-
- <% if (modules.rewrite.status) { %> - -  <%= __('Отключить') %> - - <% } else { %> - -  <%= __('Активировать') %> - - <% } %> - - - -
-
- -
- - <% if (modules.rewrite.status) { %> - -
-
-
-
-
-    Rewriter.tools -
- -
-
-
-
- -
-
- -
- -
- -
- -
-
-
- - -
-
- -
- -
- -
-
-
- - -
-
-
-
-
- -
- -
-
-
-    <%= __('Рерайт в автопубликации') %> -
- -
-
-
-
-
- - -
-
- -
- -
-
-
-
-    <%= __('Рерайт описаний у определенных фильмов') %> -
- -
-
-
-
-
- -
-
-
-
- -

<%= __('Доступные параметры') %>

-
-
-
-
-
-
- movie.id 464963 -
-
- movie.kp_id 464963 -
-
- movie.title - <%= __('Игра престолов') %> -
-
- movie.title_ru - <%= __('Игра престолов') %> -
-
- movie.title_en Game of Thrones -
-
- movie.quality 4K -
-
- movie.translate - English -
-
- movie.year - <%= __('2020') %> -
-
- movie.country - <%= __('США') %> -
-
- movie.director - <%= __('Тим Бертон') %> -
-
- movie.genre - <%= __('комедия') %> -
-
- movie.actor - <%= __('Том Круз') %> -
-
- movie.countries_arr - ["<%= __('США') %>", ...] -
-
- movie.directors_arr - ["<%= __('Тим Бертон') %>", ...] -
-
- movie.genres_arr - ["<%= __('комедия') %>", ...] -
-
- movie.actors_arr - ["<%= __('Том Круз') %>", ...] -
-
- movie.rating 92 -
-
- movie.vote 1871227 -
-
- movie.kp_rating 90 -
-
- movie.kp_vote 278374 -
-
- movie.imdb_rating 94 -
-
- movie.imdb_vote - 1592853 -
-
- movie.type 0 -
-
- movie.premiere - 17 Apr 2011 -
-
- movie.passed true -
-
- movie.custom - {"unique": true} -
-
- movie.custom.unique - true -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - <% } else { %> - -
-
-
-

<%= __('Модуль') %> «<%- title %>» <%= __('отключен') %>

-
-

- <%= __('Модуль позволяет повысить уникальность текста в описаниях к фильму.') %> -
- <%= __('Чтобы включить модуль, нажмите на кнопку «Активировать» вверху экрана.') %> -

-
-
-
- - <% } %> - -
-
- - <%- include('../includes/footer.ejs'); -%> - -
-
-
- - - \ No newline at end of file diff --git a/themes/default/views/admin/movies.ejs b/themes/default/views/admin/movies.ejs index 2edd54c..1831292 100644 --- a/themes/default/views/admin/movies.ejs +++ b/themes/default/views/admin/movies.ejs @@ -428,107 +428,6 @@
<%= __('Описание фильма:') %> - <% if (modules.rewrite.status && modules.rewrite.data.token) { %> - <%= __('Сделать текст уникальным') %> - - - <% } %>