diff --git a/app/xml/lentaredaktor.xml b/app/xml/lentaredaktor.xml index 62dd61d..7c297a1 100644 --- a/app/xml/lentaredaktor.xml +++ b/app/xml/lentaredaktor.xml @@ -6,7 +6,7 @@ DESC news_id АН-Online - news.news_id > 607000 + news.news_id > 707000 cache/index.html title,text,anons 0 @@ -329,6 +329,7 @@ file True pub/images/arhnews + https://img.argumenti.ru/news/topday alt diff --git a/vendor/akdelf/akdmin/lib/akdmin.php b/vendor/akdelf/akdmin/lib/akdmin.php index d893782..f4e223b 100644 --- a/vendor/akdelf/akdmin/lib/akdmin.php +++ b/vendor/akdelf/akdmin/lib/akdmin.php @@ -129,7 +129,11 @@ function unlock_id($table, $id, $user){ -function fileimg($img, $id, $folder){ +function fileimg($img, $id, $folder = ''){ + + if ($img == ''){ + return ''; + } if (in_array($img, array('jpg', 'jpeg', 'gif', 'png', 'JPG'))) { $fileimg = $folder . '/' . $id . '.' . $img; @@ -1001,6 +1005,7 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : ''; $component[$maxi]['column'] = (string)$item[$it]->column; if (isset($item[$it]->link)) $component[$maxi]['link'] = (string)$item[$it]->link; if (isset($item[$it]->folder)) $component[$maxi]['folder'] = (string)$item[$it]->folder; + if (isset($item[$it]->preview)) $component[$maxi]['preview'] = (string)$item[$it]->preview; if (isset($item[$it]->folder)) $component[$maxi]['width'] = (string)$item[$it]->width; if (isset($item[$it]->fieldate)) $component[$maxi]['fieldate'] = (string)$item[$it]->fieldate; @@ -1215,12 +1220,10 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : ''; break; case 'increment': - if ($inc_show) { - echo(''); - echo (AnonsText($selectrow[$a], 30, 0)); - echo(''); - } - break; + if ($inc_show):?> +
+ '); if ($selectrow[$a] != 0) @@ -1231,15 +1234,27 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : ''; echo ''; - $wwwname = SITE.fileimg($selectrow[$a], $increment_value, $component[$a]['folder']); + + $fileimg = fileimg($selectrow[$a], $increment_value); - $fwidth = 100; - if ($component[$a]['width']) - $fwidth = $component[$a]['width']; - else - $fwidth = 100; - $nocacheprefix = date('Y_m_d_h_i_s'); - echo''; + if ($fileimg !== ''){ + + if (isset($component[$a]['preview'])){ + $wwwname = (string)$component[$a]['preview'].$fileimg; + } else { + $wwwname = SITE.$component[$a]['folder'].$fileimg; + } + + //$wwwname = SITE.$fileimg; + + $fwidth = 100; + if ($component[$a]['width']) + $fwidth = $component[$a]['width']; + else + $fwidth = 100; + $nocacheprefix = date('Y_m_d_h_i_s'); + echo''; + } echo ''; @@ -1316,15 +1331,27 @@ $order = (isset($_GET['order'])) ? strip_tags(trim($_GET['order'])) : ''; echo(''); if ($action != 'select' && $action != 'selecttable') { if ($total_rows > $per_page) { //рисуем странички - echo('
Странички: - из '.$num_pages.''); - $olimits = array('5', '10', '15', '20', '25', '30'); + echo(' из '.$num_pages.'');?> + + $page):?> + > + >> + + + Элементы: