From 86924adf1c37848e00555027504a713d13bdfb40 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 15 Dec 2023 16:52:23 +0000 Subject: [PATCH] wip #6549 @0.5 --- .docker/docker-compose.yml | 16 ++++++-- .docker/update | 2 + inc/commons/class.common.tools.php | 37 ++++++++++--------- .../html5/master/class.ws.html5.compiler.php | 6 ++- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 7d20cca13..7b44f705c 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -10,7 +10,6 @@ services: - '/home/extranet/fonts/:/fonts/' - '/home/extranet/www/:/application/' - '/home/extranet/share:/application/share' - - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/' - '/mnt/sshfs/kingkong/:/application/usstorage/' - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' @@ -30,6 +29,8 @@ services: - '/home/wesco:/home/wesco' # Config - '/home/extranet/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' + # External + - 'docs:/application/fluidbook/docs' ports: - '54198:80' environment: @@ -49,7 +50,6 @@ services: - '/home/extranet/fonts/:/fonts/' - '/home/extranet/www/:/application/' - '/home/extranet/share:/application/share' - - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/' - '/mnt/sshfs/kingkong/:/application/usstorage/' - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' @@ -69,6 +69,8 @@ services: - '/home/wesco:/home/wesco' # Config - '/home/extranet/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf' + # External + - 'docs:/application/fluidbook/docs' ports: - '54842:80' environment: @@ -123,7 +125,6 @@ services: - '/home/extranet/fonts/:/fonts/' - '/home/extranet/www/:/application/' - '/home/extranet/share:/application/share' - - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/fluidbook/docs/' - '/mnt/sshfs/kingkong/:/application/usstorage/' - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' @@ -141,6 +142,8 @@ services: - '/home/toolbox/www:/home/toolbox/www' - '/data/toolbox/:/data/toolbox/' - '/home/wesco:/home/wesco' + # External + - 'docs:/application/fluidbook/docs' tmpfs: #- '/tmp:mode=777,uid=1002,gid=33' - '/var/log/extranet:uid=1002,gid=33' @@ -177,3 +180,10 @@ networks: external: name: fluidbook-processfarm +volumes: + docs: + driver: ucphhpc/sshfs:latest + driver_opts: + sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs" + allow_other: "" + password: "Qu2E9uq48bBzsqGiZA" diff --git a/.docker/update b/.docker/update index baf99419d..785b2f03b 100644 --- a/.docker/update +++ b/.docker/update @@ -1,8 +1,10 @@ #!/bin/sh cd /docker/extranet +docker plugin install ucphhpc/sshfs --grant-all-permissions chown root:root /home/extranet/.docker/config/cron/host;ln -sf /home/extranet/.docker/config/cron/host /etc/cron.d/extranet docker network create extranet ./build docker compose down +docker volume rm extranet_docs docker compose up -d /home/extranet/www/bin/fixrights \ No newline at end of file diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php index 6ff2c7e54..3e4c685ad 100644 --- a/inc/commons/class.common.tools.php +++ b/inc/commons/class.common.tools.php @@ -851,24 +851,25 @@ class commonTools public static function copyWsAssets() { - commonDroits::min(5); - global $core; - $res = commonPage::barre(); - $res .= commonPage::tMain(); - $res .= commonPage::bh(); - $res .= '
'; - $res .= ''; - $res .= ''; - $res .= ''; - $res .= ''; - $res .= ''; - $res .= ''; - $res .= '
' . __("Copie de fichiers entre deux fluidbook") . '
Fluidbook source' . form::field('source', 5, 6) . '
Fluidbook destination' . form::field('dest', 5, 6) . '
Fichiers à transférerEntrez le numéro du fluidbook source pour sélectionner les fichiers à transférer
' . $core->typo->BoutonOK(__('Copier')) . '
'; - $res .= '
'; - $res .= ''; - $res .= commonPage::bf(); - $res .= commonPage::bMain(); - return $res; + header('Location: https://toolbox.fluidbook.com/tools/fluidbookcopylinks'); +// commonDroits::min(5); +// global $core; +// $res = commonPage::barre(); +// $res .= commonPage::tMain(); +// $res .= commonPage::bh(); +// $res .= '
'; +// $res .= ''; +// $res .= ''; +// $res .= ''; +// $res .= ''; +// $res .= ''; +// $res .= ''; +// $res .= '
' . __("Copie de fichiers entre deux fluidbook") . '
Fluidbook source' . form::field('source', 5, 6) . '
Fluidbook destination' . form::field('dest', 5, 6) . '
Fichiers à transférerEntrez le numéro du fluidbook source pour sélectionner les fichiers à transférer
' . $core->typo->BoutonOK(__('Copier')) . '
'; +// $res .= '
'; +// $res .= ''; +// $res .= commonPage::bf(); +// $res .= commonPage::bMain(); +// return $res; } diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index 952577092..94c8897d6 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -1584,8 +1584,8 @@ height="0" width="0" style="display:none;visibility:hidden"> } $this->config->audiodescription[$page] = $fname; - if(!file_exists($file)){ - die('Error making audiodescription file for page '.$page. '('.$engine.')'); + if (!file_exists($file)) { + die('Error making audiodescription file for page ' . $page . '(' . $engine . ')'); } $this->vdir->copy($file, 'data/audiodescription/' . $fname); } @@ -3086,6 +3086,8 @@ height="0" width="0" style="display:none;visibility:hidden"> $lessContents = ''; + $this->lessVariables['aftersearch-width'] = $this->lessVariables['aftersearch-height'] = 'auto'; + $this->lessVariables['font'] = $this->_font($this->theme->parametres->interfaceFont); $this->lessVariables['text-transform'] = $this->_themeBoolean($this->theme->parametres->interfaceFontUppercase) ? 'uppercase' : 'inherit'; -- 2.39.5