s

app/pub/css/an.css

@@ -25,6 +25,10 @@ h1 {
     color: red;
 }
 
+#the-canvas{
+    width:100%;
+}
+
 #redi{
     color: red;
     text-transform: lowercase;

app/pub/scripts/anviewer.js

@@ -108,7 +108,8 @@ function newpdfzoom(czoom){
   var status = czoom+"%";
   
   document.getElementById(pdfcanvas).style.width = status;
-  document.getElementById('zoomstatus').innerHTML = status;
+  document.getElementById('zoomstatus_up').innerHTML = status;
+  //document.getElementById('zoomstatus_down').innerHTML = status;
 
   setzoom('pdfscale', czoom);
 
@@ -143,24 +144,20 @@ function setzoom( cname, cvalue, exdays = 30 ) {
 
 
 
-function startpdfviewer(newpdf){
+function startpdfviewer(newcurr){
 
-  var div = document.getElementById(pdfcanvas);
+  pdcurr =  getzoom('pdcurr');
-   
-
-  currpdf =  getzoom('currpdf');
   
-  if (currpdf !== null & currpdf !== newpdf){
+  if (pdcurr == newcurr){
-    
     czoom = getzoom('pdfscale');
-    
+    if (czoom > 10) {
-    if (czoom != null & czoom > 10) {
+        cnt = czoom;
         newpdfzoom(czoom);
     }  
-
   }
   else {
-     setzoom('currpdf', newpdf);
+     setzoom('pdcurr', newcurr);
+     setzoom('pdfscale', 100);
   }
       
     

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;

app/views/anpdf2.phtml

@@ -6,6 +6,7 @@
         pageRendering = false,
         pageNumPending = null,
         nexturl = '<?=$nexturl?>',
+        newcurr ='<?=$newcurr?>',
         prevurl = '<?=$prevurl?>';       
 </script>
 
@@ -23,7 +24,7 @@
     <span><i class="fa fa-search-minus" aria-hidden="true"></i></span>
   </div>
 
-  <div id="zoomstatus">100%</div>
+  <div id="zoomstatus_up" class="zoomstatus">100%</div>
 
   <div id="title_plus" onclick="resize_plus()">
     <span><i class="fa fa-search-plus" aria-hidden="true"></i></span>
@@ -32,7 +33,9 @@
 </div>
 
 <div id="pagenav">
-            <?if (isset($prevurl)):?><div class="navpage"><a href="<?=$prevurl?>"><i class="fa fa-chevron-circle-left" aria-hidden="true"></i></a></div><?endif?>
+            <?if (isset($prevurl)):?>
+              <div class="navpage"><a href="<?=$prevurl?>"><i class="fa fa-chevron-circle-left" aria-hidden="true"></i></a></div>
+            <?endif?>
             <div id="currpage"><?=$page?></div>
             <?if (isset($nexturl)):?><div class="navpage"><a href="<?=$nexturl?>"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i></a></div><?endif?>
 </div>
@@ -40,15 +43,15 @@
 
 <div id="pdfprogress">Идет обращение к серверу...</div>
 
-<canvas id="the-canvas" style="width:100%"></canvas>
+<canvas id="the-canvas"></canvas>
-<script>startpdfviewer();</script>
+<script>startpdfviewer(newcurr);</script>
 <div id="stuff-bar">
 <div id="zoomnav">
-  <div id="title_minus" onclick="resize_minus()">
+  <div id="title_minus" onclick="resize_minus()"> 
     <span><i class="fa fa-search-minus" aria-hidden="true"></i></span>
   </div>
 
-  <div id="zoomstatus">100%</div>
+  <div id="zoomstatus_down" class="zoomstatus">100%</div>
 
   <div id="title_plus" onclick="resize_plus()">
     <span><i class="fa fa-search-plus" aria-hidden="true"></i></span>

app/views/layout.phtml

@@ -2,8 +2,13 @@
 <head>
   <title>Еженедельник Аргументы Недели - <?=$title?></title>
   <script src="/pub/scripts/pdf.min.js"></script>
+<<<<<<< HEAD
   <script src="/pub/scripts/anviewer.js?ver=24"></script>
   <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=29">
+=======
+  <script src="/pub/scripts/anviewer.js?ver=43"></script>
+  <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=31">
+>>>>>>> fc16e31bc487b551c5611edcb405aca735ce6f38
   <link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="https://use.fontawesome.com/29b1d5a52d.js"></script>