From 16fe5550183cbc27119ffebe25011822d17210bf Mon Sep 17 00:00:00 2001
From: Andrey Kuvshinov <delf@iMac-Andrey.local>
Date: Mon, 27 Apr 2020 12:24:59 +0300
Subject: [PATCH] add routes anpdf.php

---
 app/confg.php                                 |  1 +
 app/index.php                                 |  8 ++-
 app/{modules/anpdf => routes}/anpdf.php       |  6 ++-
 app/{modules/anpdf => views}/anpdf.phtml      |  0
 app/views/anpdf2.phtml                        | 49 +++++++++++++++++++
 .../anpdf/anpdf2.phtml => views/layout.phtml} | 49 ++-----------------
 6 files changed, 65 insertions(+), 48 deletions(-)
 rename app/{modules/anpdf => routes}/anpdf.php (93%)
 rename app/{modules/anpdf => views}/anpdf.phtml (100%)
 create mode 100644 app/views/anpdf2.phtml
 rename app/{modules/anpdf/anpdf2.phtml => views/layout.phtml} (68%)

diff --git a/app/confg.php b/app/confg.php
index f039dd2..3e09afa 100644
--- a/app/confg.php
+++ b/app/confg.php
@@ -13,6 +13,7 @@ else
 
 define('PDFDIR', '/vhosts/anpdf/app/pub/files/pdf/');
 define('PGDIR', '/vhosts/anpdf/app/pub/files/pages/');
+define('VIEWPATH', SITEPATH.'views/');
 define('API', 'http://api.argumenti.ru/');    
 
 db_config('argumentiru', 'mysql:host=mysql;dbname=argumentiru', 'newser', 'Chjk90yuiREY');
diff --git a/app/index.php b/app/index.php
index d4ba983..bd3a9d9 100644
--- a/app/index.php
+++ b/app/index.php
@@ -1,13 +1,17 @@
 <?php
 
+ini_set('display_errors','on');
+error_reporting(E_ALL);
+
 require 'vendor/autoload.php';
 require 'confg.php';
-require 'modules/anpdf/anpdf.php';
 require 'routes/price.php';
 require 'routes/client.php';
+require 'routes/anpdf.php';
 
 _kuri();
 
 function index_kuri(){
-    return text_kuri(1);
+    
+    echo 'index';
 }
\ No newline at end of file
diff --git a/app/modules/anpdf/anpdf.php b/app/routes/anpdf.php
similarity index 93%
rename from app/modules/anpdf/anpdf.php
rename to app/routes/anpdf.php
index 6169658..0e86819 100644
--- a/app/modules/anpdf/anpdf.php
+++ b/app/routes/anpdf.php
@@ -102,7 +102,8 @@ function read_kuri($hash, $page = 1, $scale = 1.5,  $promo = false){
         $prevurl = "$baseurl$prevpage";
     }
      
-     include ('anpdf2.phtml');
+    $tempcontent = VIEWPATH.'anpdf2.phtml'; //подшаблон
+    include VIEWPATH.'layout.phtml'; //центральный шаблон
 
 
 }
@@ -114,6 +115,9 @@ function text_kuri(){
     $news = file_get_contents(API.'id/'.$id);
     print_r($news);
 
+    $tempcontent = VIEWPATH.'anpdf.phtml';
+    include VIEWPATH.'layout.phtml';
+
    
 
     //view( 'views/antext.phtml',['news'=> $news] );
diff --git a/app/modules/anpdf/anpdf.phtml b/app/views/anpdf.phtml
similarity index 100%
rename from app/modules/anpdf/anpdf.phtml
rename to app/views/anpdf.phtml
diff --git a/app/views/anpdf2.phtml b/app/views/anpdf2.phtml
new file mode 100644
index 0000000..b7a1170
--- /dev/null
+++ b/app/views/anpdf2.phtml
@@ -0,0 +1,49 @@
+<script>
+    var pdfDoc = null,
+        pageNum = <?=$pagenum?>,
+        scale = <?=$scale?>,
+        url = '<?=$pdfile?>', 
+        pageRendering = false,
+        pageNumPending = null,
+        nexturl = '<?=$nexturl?>',
+        prevurl = '<?=$prevurl?>';       
+</script>
+
+    <p id="downloadtitle">
+        <?if ($filedown):?>
+          <a href="<?=$fullpdf?>"><?=$downtitle?></a><span id="downarrow">↑</span>
+        <?else:?>  
+          <a href="https://argumenti.ru/robomail/486?utm_source=argumenti.ru&utm_medium=subscript&utm_campaign=promo">Получайте «Газету на @email»</a> 
+        <?endif?>  
+    </p>
+
+<div id="pdfprogress">Идет обращение к серверу...</div>
+<div id="stuff-bar">
+<div id="zoomnav">
+    <div class="zoompdf zoom-loop">🔍</div>
+    <div class="zoompdf"> 
+        <div onclick="pdfzoomin()">
+          <span id="title_plus">+</span>
+        </div>
+       <div onclick="pdfzoomout()">
+          <span id="title_minus">–</span>
+       </div>
+    </div>
+</div>
+
+<div id="pagenav">
+    
+            <?if (isset($prevurl)):?><div class="navprev"><a href="<?=$prevurl?>">&lt;&nbsp;Предыдущая страница</a></div><?endif?>
+            <div id="currpage"><?=$page?></div>
+            <?if (isset($nexturl)):?><div class="navprev"><a href="<?=$nexturl?>">Следующая страница&nbsp;&gt;</a></div><?endif?>
+</div>
+</div>
+
+<canvas id="the-canvas"></canvas>
+<script>startpdfviewer();</script>
+<div id="pagenav">
+    <?if (isset($prevurl)):?><div class="navprev"><a href="<?=$prevurl?>">&lt;&nbsp;Предыдущая страница</a></div><?endif?>
+    <div id="currpage"><?=$page?></div>
+    <?if (isset($nexturl)):?><div class="navprev"><a href="<?=$nexturl?>">Следующая страница&nbsp;&gt;</a></div><?endif?>
+</div>
+
diff --git a/app/modules/anpdf/anpdf2.phtml b/app/views/layout.phtml
similarity index 68%
rename from app/modules/anpdf/anpdf2.phtml
rename to app/views/layout.phtml
index 608c959..d0bc77e 100644
--- a/app/modules/anpdf/anpdf2.phtml
+++ b/app/views/layout.phtml
@@ -8,16 +8,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>  
-<script>
-    var pdfDoc = null,
-        pageNum = <?=$pagenum?>,
-        scale = <?=$scale?>,
-        url = '<?=$pdfile?>', 
-        pageRendering = false,
-        pageNumPending = null,
-        nexturl = '<?=$nexturl?>',
-        prevurl = '<?=$prevurl?>';       
-</script>
 
 
 <!-- Rating Mail.ru counter -->
@@ -85,43 +75,12 @@ _tmr.push({id: "1069168", type: "pageView", start: (new Date()).getTime()});
     })(this, this.document, "yandexContextAsyncCallbacks");
 </script>
 </div>
-    <p id="downloadtitle">
-        <?if ($filedown):?>
-          <a href="<?=$fullpdf?>"><?=$downtitle?></a><span id="downarrow">↑</span>
-        <?else:?>  
-          <a href="https://argumenti.ru/robomail/486?utm_source=argumenti.ru&utm_medium=subscript&utm_campaign=promo">Получайте «Газету на @email»</a> 
-        <?endif?>  
-    </p>
-
-<div id="pdfprogress">Идет обращение к серверу...</div>
-<div id="stuff-bar">
-<div id="zoomnav">
-    <div class="zoompdf zoom-loop">🔍</div>
-    <div class="zoompdf"> 
-        <div onclick="pdfzoomin()">
-          <span id="title_plus">+</span>
-        </div>
-       <div onclick="pdfzoomout()">
-          <span id="title_minus">–</span>
-       </div>
-    </div>
-</div>
-
-<div id="pagenav">
     
-            <?if (isset($prevurl)):?><div class="navprev"><a href="<?=$prevurl?>">&lt;&nbsp;Предыдущая страница</a></div><?endif?>
-            <div id="currpage"><?=$page?></div>
-            <?if (isset($nexturl)):?><div class="navprev"><a href="<?=$nexturl?>">Следующая страница&nbsp;&gt;</a></div><?endif?>
-</div>
-</div>
+<?if (isset($tempcontent))
+    include($tempcontent);
+?>
+
 
-<canvas id="the-canvas"></canvas>
-<script>startpdfviewer();</script>
-<div id="pagenav">
-    <?if (isset($prevurl)):?><div class="navprev"><a href="<?=$prevurl?>">&lt;&nbsp;Предыдущая страница</a></div><?endif?>
-    <div id="currpage"><?=$page?></div>
-    <?if (isset($nexturl)):?><div class="navprev"><a href="<?=$nexturl?>">Следующая страница&nbsp;&gt;</a></div><?endif?>
-</div>
 <div id="smi_teaser_13132" style="width:100%;">
     <center>
         <a href="https://24smi.info/?utm_source=informer_13132">