From 651a63513c404d108df9fcf444eb818c81a94e9a Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 20:38:36 +0300 Subject: [PATCH 01/16] add cookie hash --- app/pub/scripts/anviewer.js | 2 +- app/views/anpdf2.phtml | 3 ++- app/views/layout.phtml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index 04ee648..429ddbb 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -142,7 +142,7 @@ function startpdfviewer(newpdf){ currpdf = getzoom('currpdf'); - if (currpdf !== null & currpdf !== newpdf){ + if (currpdf !== null & currpdf == newpdf){ czoom = getzoom('pdfscale'); diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml index 198c652..af06371 100644 --- a/app/views/anpdf2.phtml +++ b/app/views/anpdf2.phtml @@ -6,6 +6,7 @@ pageRendering = false, pageNumPending = null, nexturl = '', + hash = '', prevurl = ''; @@ -41,7 +42,7 @@
Идет обращение к серверу...
- +
diff --git a/app/views/layout.phtml b/app/views/layout.phtml index d2e6541..b1c310c 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From 6932d962817e95ac021d4cf3b11b166ef1c678d4 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 20:46:27 +0300 Subject: [PATCH 02/16] new if currpdf --- app/pub/scripts/anviewer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index 429ddbb..01401ad 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -142,11 +142,11 @@ function startpdfviewer(newpdf){ currpdf = getzoom('currpdf'); - if (currpdf !== null & currpdf == newpdf){ + if (currpdf == newpdf){ czoom = getzoom('pdfscale'); - if (czoom != null & czoom > 10) { + if (czoom !== null & czoom > 10) { newpdfzoom(czoom); } From e2069017fe6a4806b834716549d851d313c0f9fc Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 20:46:56 +0300 Subject: [PATCH 03/16] anviewer ver 25 --- app/views/layout.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layout.phtml b/app/views/layout.phtml index b1c310c..195cdc2 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From ea7ac3f8466ca41e08928088f404f8ee3fbacb7c Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 21:08:48 +0300 Subject: [PATCH 04/16] js ver 26 --- app/pub/scripts/anviewer.js | 3 --- app/views/layout.phtml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index 01401ad..d3739f6 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -137,9 +137,6 @@ function setzoom( cname, cvalue, exdays = 30 ) { function startpdfviewer(newpdf){ - var div = document.getElementById(pdfcanvas); - - currpdf = getzoom('currpdf'); if (currpdf == newpdf){ diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 195cdc2..8224ff7 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From 0e0b9f98666b8a24ac2e8b41f8308c30c28d9018 Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 21:28:45 +0300 Subject: [PATCH 05/16] js ver 27 --- app/pub/scripts/anviewer.js | 15 +++++++-------- app/views/layout.phtml | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index d3739f6..aaf76c8 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -97,10 +97,10 @@ function newpdfzoom(czoom){ var status = czoom+"%"; - document.getElementById(pdfcanvas).style.width = status; - document.getElementById('zoomstatus').innerHTML = status; + document.getElementById("pdfcanvas").style.width = status; + document.getElementById("zoomstatus").innerHTML = status; - setzoom('pdfscale', czoom); + setzoom("pdfscale", czoom); } @@ -137,19 +137,18 @@ function setzoom( cname, cvalue, exdays = 30 ) { function startpdfviewer(newpdf){ - currpdf = getzoom('currpdf'); + currpdf = getzoom("currpdf"); if (currpdf == newpdf){ - czoom = getzoom('pdfscale'); - - if (czoom !== null & czoom > 10) { + czoom = getzoom("pdfscale"); + if (czoom > 10) { newpdfzoom(czoom); } } else { - setzoom('currpdf', newpdf); + setzoom("currpdf", newpdf); } diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 8224ff7..7c85791 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From df0a374f428e3dcb16e54b864b4a3f96ab810b0c Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 22:19:45 +0300 Subject: [PATCH 06/16] strtotime hash pdf --- app/pub/scripts/anviewer.js | 18 ++++++++---------- app/routes/anpdf.php | 7 ++++++- app/views/anpdf2.phtml | 6 +++--- app/views/layout.phtml | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index aaf76c8..5aec792 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -97,10 +97,10 @@ function newpdfzoom(czoom){ var status = czoom+"%"; - document.getElementById("pdfcanvas").style.width = status; - document.getElementById("zoomstatus").innerHTML = status; + document.getElementById(pdfcanvas).style.width = status; + document.getElementById('zoomstatus').innerHTML = status; - setzoom("pdfscale", czoom); + setzoom('pdfscale', czoom); } @@ -135,20 +135,18 @@ function setzoom( cname, cvalue, exdays = 30 ) { -function startpdfviewer(newpdf){ +function startpdfviewer(newcurr){ - currpdf = getzoom("currpdf"); + pdcurr = getzoom('pdcurr'); - if (currpdf == newpdf){ - - czoom = getzoom("pdfscale"); + if (pdcurr == newcurr){ + czoom = getzoom('pdfscale'); if (czoom > 10) { newpdfzoom(czoom); } - } else { - setzoom("currpdf", newpdf); + setzoom('pdcurr', newcurr); } diff --git a/app/routes/anpdf.php b/app/routes/anpdf.php index 4e34dd9..a6fdea4 100644 --- a/app/routes/anpdf.php +++ b/app/routes/anpdf.php @@ -10,6 +10,7 @@ function anpromo_kuri($page = 1, $scale = 1){ $pdfile = '/pub/files/pdf/promo.pdf'; $title = 'Номер 12(706)'; $baseurl = '/'; + $newcurr = strtotime('2006-05-12'); $nextpage = $page + 1; if (file_exists(SITEPATH.$pdfile)){ @@ -36,7 +37,7 @@ function anpromo_kuri($page = 1, $scale = 1){ function read_kuri($hash, $page = 1, $scale = 1, $promo = false){ - $price = db_get("SELECT `price_id`, `pricename` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1"); + $price = db_get("SELECT `price_id`, `pricename`, `BeginDate` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1"); if (!isset($price['price_id'])){ header("HTTP/1.0 404 Not Found"); @@ -48,6 +49,10 @@ function read_kuri($hash, $page = 1, $scale = 1, $promo = false){ $basepg = PGDIR.$hash.'/'.$hash.'-'; $pgfile = $basepg.$page.'.pdf'; $cachefile = PDFDIR.$namefile; + $newcurr = strtotime($price['BeginDate']); + + + if (file_exists($cachefile)){ $fullpdf = '/pdf/'.$namefile; diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml index af06371..889b0ac 100644 --- a/app/views/anpdf2.phtml +++ b/app/views/anpdf2.phtml @@ -6,7 +6,7 @@ pageRendering = false, pageNumPending = null, nexturl = '', - hash = '', + newcurr ='', prevurl = ''; @@ -42,10 +42,10 @@
Идет обращение к серверу...
- +
-
+
diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 7c85791..3a3cc31 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From 08b14d01877d14d0d0d931d904870315dd51827d Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 22:21:36 +0300 Subject: [PATCH 07/16] 100 default new pdf --- app/pub/scripts/anviewer.js | 1 + app/views/layout.phtml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js index 5aec792..d81e9f0 100644 --- a/app/pub/scripts/anviewer.js +++ b/app/pub/scripts/anviewer.js @@ -147,6 +147,7 @@ function startpdfviewer(newcurr){ } else { setzoom('pdcurr', newcurr); + setzoom('pdfscale', 100); } diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 3a3cc31..ecf93c5 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,7 +2,7 @@ Еженедельник Аргументы Недели - <?=$title?> - + From 46ced6ef2a02f37c4efc94e4c77e8b27db12296c Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 22:31:16 +0300 Subject: [PATCH 08/16] add arrow 1 --- app/views/anpdf2.phtml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml index 889b0ac..5b406bc 100644 --- a/app/views/anpdf2.phtml +++ b/app/views/anpdf2.phtml @@ -33,7 +33,10 @@
From bc1c5bdf63a2ef0a33fb199cd4066f31bf7dd12e Mon Sep 17 00:00:00 2001 From: Andrey Kuvshinov Date: Wed, 29 Apr 2020 22:32:55 +0300 Subject: [PATCH 09/16] add d arrow 1 --- app/views/anpdf2.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml index 5b406bc..eedbe92 100644 --- a/app/views/anpdf2.phtml +++ b/app/views/anpdf2.phtml @@ -34,7 +34,7 @@