diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..7f0587b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,38 @@ +FROM alpine:3.8 + +# Environments +ENV TIMEZONE Europe/Moscow +ENV PHP_MEMORY_LIMIT 1024M +ENV MAX_UPLOAD 128M +ENV PHP_MAX_FILE_UPLOAD 128 +ENV PHP_MAX_POST 128M +ENV PHPUSER 1000 + +RUN apk update && \ +apk upgrade && \ +apk add pdftk \ +php7 php7-fpm php7-opcache php7-pdo php7-pdo_mysql php7-json php7-mbstring && \ +rm -rf /var/cache/apk/* && \ +#add localuser +addgroup -g ${PHPUSER} -S www-data && \ +adduser -u ${PHPUSER} -D -S -G www-data www-data && \ +#localuser +sed -i -e "s/user\s*=\s*nobody/user = www-data/g" /etc/php7/php-fpm.d/www.conf && \ +sed -i -e "s/group\s*=\s*nobody/group = www-data/g" /etc/php7/php-fpm.d/www.conf && \ +#connect +sed -i "s|;*listen\s*=\s*127.0.0.1:9000|listen = 9000|g" /etc/php7/php-fpm.d/www.conf && \ +sed -i "s|;*listen\s*=\s*/||g" /etc/php7/php-fpm.d/www.conf && \ +#vars +sed -i 's/short_open_tag = Off/short_open_tag = On/g' /etc/php7/php.ini && \ +sed -i "s|;*date.timezone =.*|date.timezone = ${TIMEZONE}|i" /etc/php7/php.ini && \ +sed -i "s|;*memory_limit =.*|memory_limit = ${PHP_MEMORY_LIMIT}|i" /etc/php7/php.ini + + +EXPOSE 9000 + +WORKDIR /vhosts + +CMD ["php-fpm7", "-F"] + + + diff --git a/app/api/client.php b/app/api/client.php deleted file mode 100644 index 09ed55b..0000000 --- a/app/api/client.php +++ /dev/null @@ -1,61 +0,0 @@ - 1){ - $offset = $limit * ($page -1); - $pricesql .= " OFFSET $offset"; - } - - $items = db_get($pricesql); - - foreach ($items as $item){ - $item['pic'] = IMGSRV."price/180x280/{$item['price_id']}.{$item['priceimg']}"; - $result[] = $item; - } - - return $result; - -} \ No newline at end of file diff --git a/app/composer.json b/app/composer.json index 35b1317..cd69693 100644 --- a/app/composer.json +++ b/app/composer.json @@ -3,7 +3,8 @@ "require": { "php":">=5.3.0", "masterforweb/kuri":"dev-master", - "masterforweb/db_lite":"dev-master" + "masterforweb/db_lite":"dev-master", + "mikehaertl/php-pdftk": "^0.8.0" }, "repositories":[ @@ -17,4 +18,4 @@ } ] -} \ No newline at end of file +} diff --git a/app/confg.php b/app/confg.php index 19564b8..a5839b0 100644 --- a/app/confg.php +++ b/app/confg.php @@ -1,7 +1,8 @@ 1) $title = $price['pricename']."- $page"; else @@ -159,4 +156,41 @@ function promo_kuri($hash, $page = 1, $scale = 2, $promo = false){ include ('anpdf2.phtml'); +} + + +function pdfscan_kuri(){ + + $pdfsql = "SELECT price_id, pricehash FROM price WHERE category_id = 1"; + $path = '~/vhosts/anpdf/pub/files/pages/'; + + + echo exec('whoami'); + + $pdfs = dbl_get($pdfsql); + + + foreach($pdfs as $pdf){ + + $pagedir = $path.$pdf['pricehash']; + + if(!is_dir($pagedir)) { + mkdir($pagedir); + $cmd = 'docker run --name pdftk -it --rm \ + --user $(id -u):$(id -g) \ + -v "$PDFDIR:/workdir/pdf" \ + -v "$OUTDIR:/workdir/pages" \ + -w "/workdir" \ + masterforweb/pdftk pdftk "pdf/$file" burst output "pages/${name}/${name}-%1d.pdf'; + + } + + + + + } + + + + } diff --git a/app/routes/client.php b/app/routes/client.php index d13273a..9799d6f 100644 --- a/app/routes/client.php +++ b/app/routes/client.php @@ -1,7 +1,7 @@ 1) - $title = "Архив номеров - $page"; - else - $title = "Архив номеров"; - - $tempcontent = VIEWPATH.'allbooks.phtml'; - include VIEWPATH.'layout.phtml'; - + if ($count > $limit){ + $pages = ceil($count / $limit); } + + if ($page > 1) { + $title = "Моя библиотека - страница $page"; + $prevpage = $page - 1 ; + $prevurl = $baseurl.$prevpage; + } else { - $books = $items; - } + $title = "Моя библиотека"; + } - //$books = clientbooks_kuri($client['client_id']); + + + if ($pages > $page){ + $nextpage = $page + 1; + $nexturl = $baseurl.$nextpage; + $endurl = $baseurl.$pages; + } + + $tempcontent = VIEWPATH.'allbooks.phtml'; + include VIEWPATH.'layout.phtml'; - // print_r($books); } diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml index 2f97056..acb35d1 100644 --- a/app/views/anpdf2.phtml +++ b/app/views/anpdf2.phtml @@ -50,7 +50,8 @@
Идет обращение к серверу...
- + +
diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 5c9f59d..9a38bc8 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -3,7 +3,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + diff --git a/composer.sh b/composer.sh old mode 100644 new mode 100755 index 107ade1..0d53c31 --- a/composer.sh +++ b/composer.sh @@ -2,4 +2,4 @@ docker run --rm --interactive --tty \ --volume $PWD/app:/app \ - composer update \ No newline at end of file + composer "$@" \ No newline at end of file