diff --git a/app/confg.php b/app/confg.php index 0c1cd88..dcbf0c5 100644 --- a/app/confg.php +++ b/app/confg.php @@ -10,12 +10,20 @@ if (isset($_SERVER['HTTP_HOST'])) if (isset($_SERVER['HTTP_HOST'])) define('SITEPATH', $_SERVER['DOCUMENT_ROOT'].'/'); else - define('SITEPATH', dirname(__FILE__)); + define('SITEPATH', dirname(__FILE__)); + +if (SITE == 'http://klan.argumenti.ru/') + define('PDFSOURCE', '/vhosts/an/httpdocs/pub/files/pdf/pdf/'); +else + define('PDFSOURCE', SITEPATH.'pub/files/source/'); + + +define('PDFPATH', '/pub/files/pdf/'); +define('PGPATH', '/pub/files/pages/'); +define('PDFDIR', SITEPATH.PDFPATH); +define('PGDIR', SITEPATH.PGPATH); + -define('PDFDIR', '/vhosts/anpdf/app/pub/files/pdf/'); -define('PGDIR', '/vhosts/anpdf/app/pub/files/pages/'); -define('PDFURL', 'pub/files/pdf/'); -define('PGURL', 'pub/files/pages/'); define('APPPATH', SITEPATH); define('VIEWPATH', SITEPATH.'views/'); diff --git a/app/routes/anpdf.php b/app/routes/anpdf.php index 769fd01..fbab504 100644 --- a/app/routes/anpdf.php +++ b/app/routes/anpdf.php @@ -4,16 +4,19 @@ function anpromo_kuri($page = 1, $scale = 1){ // $pdfile = 'https://argumenti.ru/templinks/md5files/f9598f88e667146d50d106eeedbd74c1.pdf'; $namefile = 'promo.pdf'; + $title = 'Номер 12(706)'; - $baseurl = '/'; $newcurr = strtotime('2006-05-12'); - $file = SITEPATH.'pub/files/pdf/promo.pdf'; - $data = pdfs_init($file); + $file = SITEPATH.'pub/files/source/742.pdf'; + $data = pdfs_init($file, $page); $pdfile = $data['pdfpgurl']; $fullpdf = $data['pdfurl']; + + $baseurl = "/anpromo/"; + $pagenum = 1; $nextpage = $page + 1; $filedown = True; @@ -30,8 +33,7 @@ function anpromo_kuri($page = 1, $scale = 1){ } $downtitle = 'Если по какой-то причине у вас не загрузилась страница ниже, то нажмите сюда, чтобы скачать pdf'; - $baseurl = "/anpromo/"; - $pagenum = 1; + $tempcontent = VIEWPATH.'anpdf2.phtml'; //подшаблон include VIEWPATH.'layout.phtml'; //центральный шаблон @@ -44,6 +46,8 @@ function anpromo_kuri($page = 1, $scale = 1){ function read_kuri($hash, $page = 1, $scale = 1, $promo = false){ + return promo_kuri($hash, $page, false); + $price = db_get("SELECT `price_id`, `pricename`, `BeginDate` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1"); if (!isset($price['price_id'])){ @@ -52,11 +56,14 @@ function read_kuri($hash, $page = 1, $scale = 1, $promo = false){ return False; } + $file = SITEPATH.'pub/files/source/742.pdf'; + $namefile = $hash.'.pdf'; $basepg = PGDIR.$hash.'/'.$hash.'-'; $pgfile = $basepg.$page.'.pdf'; $cachefile = PDFDIR.$namefile; $newcurr = strtotime($price['BeginDate']); + if (file_exists($cachefile)){ @@ -126,9 +133,9 @@ function text_kuri(){ -function promo_kuri($hash, $page = 1, $scale = 2, $promo = false){ +function promo_kuri($hash, $page = 1, $promo = true){ - return read_kuri($hash, $page, $scale, true); + # test url http://klan.dv/promo/bac343b41b357fdc8243373a429caa62 (742.pdf source) $price = db_get("SELECT `price_id`, `pricename` FROM `price` WHERE `pricehash` = '$hash' LIMIT 1"); @@ -138,31 +145,56 @@ function promo_kuri($hash, $page = 1, $scale = 2, $promo = false){ return False; } - $id = $price['price_id']; - $pdfile = "/file/$hash"; - $maxpage = 32; - - if ($page > 1) - $title = $price['pricename']."- $page"; - else - $title = $price['pricename']; - - if (!$promo) - $filedown = False; + $file = PDFSOURCE."${price['price_id']}.pdf"; + $data = pdfs_init($file, $page); - $baseurl = "/promo/$hash/"; - - if ($page < $maxpage){ - $nextpage = $page + 1; - $nexturl = "$baseurl$nextpage"; - } + $pdfile = $data['pdfpgurl']; + $fullpdf = $data['pdfurl']; + $count = $data['count']; + $pagenum = 1; - if ($page > 1) { - $prevpage = $page - 1; - $prevurl = "$baseurl$prevpage"; - } - - include ('anpdf2.phtml'); + + if ($promo){ + $filedown = True; + $baseurl = "/promo/$hash/"; + } + else { + $filedown = True; + $baseurl = "/read/$hash/"; + } + + $endurl = "$baseurl$count"; + + if ($count > $page){ + $nextpage = $page + 1; + $nexturl = "$baseurl$nextpage"; + } + else { + $nexturl = ''; + } + + + if ($page > 1) { + //$title = $price['pricename']." / $page стр."; + $title = $price['pricename']; + $prevpage = $page - 1; + $prevurl = "$baseurl$prevpage"; + if (!$promo){ + $downtitle = 'Если по какой-то причине у вас не загрузилась страница ниже, то нажмите сюда, чтобы скачать pdf'; + } + } + else { + $title = $price['pricename']; + $downtitle = 'Если по какой-то причине у вас не загрузилось издание ниже, то нажмите сюда, чтобы скачать pdf'; + } + + + + $tempcontent = VIEWPATH.'anpdf2.phtml'; //подшаблон + include VIEWPATH.'layout.phtml'; //центральный шаблон + + + } diff --git a/app/routes/pdfserver.php b/app/routes/pdfserver.php index 90af586..18de16a 100644 --- a/app/routes/pdfserver.php +++ b/app/routes/pdfserver.php @@ -1,7 +1,8 @@ var pdfDoc = null, pageNum = =$pagenum?>, - scale = =$scale?>, + scale = 1, url = '=$pdfile?>', pageRendering = false, pageNumPending = null, @@ -11,10 +11,10 @@
- - =$downtitle?>↑ - + Получайте «Газету на @email» + + =$downtitle?>↑
@@ -33,6 +33,7 @@ @@ -72,7 +80,7 @@