diff --git a/app/modules/anpdf/anpdf.php b/app/modules/anpdf/anpdf.php
index e93573d..f0fafe8 100644
--- a/app/modules/anpdf/anpdf.php
+++ b/app/modules/anpdf/anpdf.php
@@ -30,7 +30,7 @@ function anpromo_kuri($page = 1, $scale = 1.5){
-function read_kuri($hash, $page = 1, $scale = 2, $promo = false){
+function read_kuri($hash, $page = 1, $scale = 1.5, $promo = false){
$price = db_get("SELECT `price_id`, `pricename` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1");
@@ -96,7 +96,7 @@ function promo_kuri($hash, $page = 1, $scale = 2, $promo = false){
$prevurl = "$baseurl$prevpage";
}
- include ('anpdf.phtml');
+ include ('anpdf2.phtml');
}
diff --git a/app/modules/anpdf/anpdf2.phtml b/app/modules/anpdf/anpdf2.phtml
index ed00721..3467f9f 100644
--- a/app/modules/anpdf/anpdf2.phtml
+++ b/app/modules/anpdf/anpdf2.phtml
@@ -2,7 +2,7 @@
Еженедельник Аргументы Недели - <?=$title?>
-
+
diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js
index adda682..f06051d 100644
--- a/app/pub/scripts/anviewer.js
+++ b/app/pub/scripts/anviewer.js
@@ -65,7 +65,7 @@ function pdfzoomin(){
function pdfzoomout(){
scale -= 0.25;
- setzoom(scale);
+ setzoom(scale);
renderPage();
}
@@ -73,34 +73,41 @@ function pdfzoomout(){
function getzoom(){
- var cname = 'pdfscale';
+ var name = 'pdfscale';
- var results = document.cookie.match ( '(^|;) ?' + cname + '=([^;]*)(;|$)' );
+ var results = document.cookie.match ( '(^|;) ?' + name + '=([^;]*)(;|$)' );
- if ( results )
- return ( unescape ( results[2] ) );
- else
+ if ( results ){
+ return parseFloat(unescape(results[2]));
+ }
+ else {
return null;
+ }
}
function setzoom( cvalue, exdays = 30 ) {
+ var cname = 'pdfscale';
+
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
- var cname = 'pdfscale';
- document.cookie = cname + "=" + cvalue + "; expires=" + expires + "; path=/";
-
-}
+
+ var expires = "expires="+ d.toUTCString();
+ document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
+
+ }
function startpdfviewer(){
+
czoom = getzoom();
- if (czoom !== null || isNaN(czoom))
- scale = czoom;
+ if (czoom != null)
+ scale = czoom;
+
pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
pdfDoc = pdfDoc_;