+
{% if module_header_actions %}
{% for module_header in module_header_actions %}
@@ -32,7 +33,7 @@
{% endif %}
{% if can_clear_cache %}
-
+
@@ -180,6 +195,18 @@
{% if not popup_mode %}
+
';
+ }
+
+ return $html;
+ }
+
+ public static function resetAssets()
+ {
+ self::$requiredStyles = array();
+ }
+
+ protected static function requireStyle(array $presentation)
+ {
+ $css = isset($presentation['published_css']) ? trim((string) $presentation['published_css']) : '';
+ if ($css === '') { return; }
+ $id = isset($presentation['presentation_id'])
+ ? (int) $presentation['presentation_id']
+ : (isset($presentation['id']) ? (int) $presentation['id'] : 0);
+ $version = isset($presentation['presentation_version'])
+ ? (int) $presentation['presentation_version']
+ : (isset($presentation['version']) ? (int) $presentation['version'] : 0);
+ self::$requiredStyles[$id . ':' . $version] = $css;
+ }
+ }
diff --git a/system/App/Content/Presentation/PresentationRepository.php b/system/App/Content/Presentation/PresentationRepository.php
new file mode 100644
index 0000000..72193e7
--- /dev/null
+++ b/system/App/Content/Presentation/PresentationRepository.php
@@ -0,0 +1,311 @@
+
+ | @copyright 2007-2026 (c) AVE.cms
+ | @link https://ave-cms.ru
+ | @version 3.3
+ */
+
+ namespace App\Content\Presentation;
+
+ defined('BASEPATH') || die('Direct access to this location is not allowed.');
+
+ use App\Common\DatabaseSchema;
+ use App\Common\FileCacheInvalidator;
+ use App\Content\ContentTables;
+ use App\Helpers\Json;
+ use DB;
+
+ class PresentationRepository
+ {
+ protected static $kinds = array(
+ 'card' => 'Карточка',
+ 'compact_card' => 'Компактная карточка',
+ 'list' => 'Список',
+ 'table' => 'Таблица',
+ 'slider' => 'Слайдер',
+ 'tree' => 'Дерево',
+ 'page' => 'Страница материала',
+ 'filter' => 'Фильтры',
+ 'custom' => 'Пользовательское',
+ );
+
+ public static function table()
+ {
+ return ContentTables::table('presentations');
+ }
+
+ public static function revisionsTable()
+ {
+ return ContentTables::table('presentation_revisions');
+ }
+
+ public static function assignmentsTable()
+ {
+ return ContentTables::table('presentation_assignments');
+ }
+
+ public static function available()
+ {
+ return DatabaseSchema::tableExists(self::table())
+ && DatabaseSchema::tableExists(self::revisionsTable())
+ && DatabaseSchema::tableExists(self::assignmentsTable());
+ }
+
+ public static function kinds()
+ {
+ return self::$kinds;
+ }
+
+ public static function all($query = '', $kind = '', $state = '')
+ {
+ if (!self::available()) { return array(); }
+ $sql = 'SELECT p.*,(SELECT COUNT(*) FROM ' . self::assignmentsTable()
+ . ' a WHERE a.presentation_id=p.id) usage_count FROM ' . self::table() . ' p WHERE 1=1';
+ $args = array();
+ $query = trim((string) $query);
+ if ($query !== '') {
+ $sql .= ' AND (p.title LIKE %ss OR p.code LIKE %ss OR p.id=%i)';
+ $args = array($query, $query, (int) $query);
+ }
+
+ if (isset(self::$kinds[$kind])) { $sql .= ' AND p.kind=%s'; $args[] = $kind; }
+ if ($state === 'published') { $sql .= ' AND p.is_published=1'; }
+ if ($state === 'draft') { $sql .= ' AND p.is_published=0'; }
+ if ($state === 'changed') {
+ $sql .= ' AND (p.is_published=0 OR p.draft_item_markup!=p.published_item_markup'
+ . ' OR p.draft_wrapper_markup!=p.published_wrapper_markup'
+ . ' OR p.draft_empty_markup!=p.published_empty_markup OR p.draft_css!=p.published_css)';
+ }
+
+ $sql .= ' ORDER BY p.updated_at DESC,p.id DESC';
+ $rows = call_user_func_array(array('DB', 'query'), array_merge(array($sql), $args))->getAll() ?: array();
+ return array_map(function ($row) { return self::format($row, false); }, $rows);
+ }
+
+ public static function one($id)
+ {
+ if (!self::available()) { return null; }
+ $row = DB::query(
+ 'SELECT p.*,(SELECT COUNT(*) FROM ' . self::assignmentsTable()
+ . ' a WHERE a.presentation_id=p.id) usage_count FROM ' . self::table() . ' p WHERE p.id=%i LIMIT 1',
+ (int) $id
+ )->getAssoc();
+ return $row ? self::format($row, true) : null;
+ }
+
+ public static function raw($id)
+ {
+ if (!self::available()) { return null; }
+ return DB::query('SELECT * FROM ' . self::table() . ' WHERE id=%i LIMIT 1', (int) $id)->getAssoc() ?: null;
+ }
+
+ public static function runtime($id)
+ {
+ if (!self::available()) { return null; }
+ $row = DB::query(
+ 'SELECT id presentation_id,code presentation_code,kind presentation_kind,version presentation_version,'
+ . ' is_published,published_item_markup,published_wrapper_markup,published_empty_markup,published_css,published_settings_json'
+ . ' FROM ' . self::table() . ' WHERE id=%i LIMIT 1',
+ (int) $id
+ )->getAssoc();
+ if (!$row || empty($row['is_published'])) { return null; }
+ $row['id'] = 0;
+ $row['mode'] = 'native';
+ $row['presentation_id'] = (int) $row['presentation_id'];
+ $row['presentation_version'] = (int) $row['presentation_version'];
+ $row['is_published'] = true;
+ $row['settings'] = Json::toArray((string) $row['published_settings_json'], array());
+ return $row;
+ }
+
+ public static function stats()
+ {
+ $items = self::all();
+ return array(
+ 'total' => count($items),
+ 'published' => count(array_filter($items, function ($item) { return $item['is_published']; })),
+ 'changed' => count(array_filter($items, function ($item) { return $item['has_changes']; })),
+ 'used' => count(array_filter($items, function ($item) { return $item['usage_count'] > 0; })),
+ );
+ }
+
+ public static function save($id, array $input, $authorId)
+ {
+ if (!self::available()) { throw new \RuntimeException('Обновите схему ядра'); }
+ $id = (int) $id;
+ $data = self::input($input, $id);
+ $data['author_id'] = (int) $authorId;
+ $data['updated_at'] = time();
+ if ($id > 0) {
+ if (!self::raw($id)) { throw new \RuntimeException('Представление не найдено'); }
+ DB::Update(self::table(), $data, 'id=%i', $id);
+ PresentationRevisionRepository::capture($id, 'update', $authorId, 'Сохранение черновика');
+ return $id;
+ }
+
+ $data += array(
+ 'published_item_markup' => '',
+ 'published_wrapper_markup' => '',
+ 'published_empty_markup' => '',
+ 'published_css' => '',
+ 'published_settings_json' => '{}',
+ 'is_published' => 0,
+ 'version' => 0,
+ 'created_at' => time(),
+ 'published_at' => 0,
+ );
+ DB::Insert(self::table(), $data);
+ $id = (int) DB::insertId();
+ PresentationRevisionRepository::capture($id, 'create', $authorId, 'Создание представления');
+ return $id;
+ }
+
+ public static function publish($id, $authorId)
+ {
+ $row = self::raw((int) $id);
+ if (!$row) { throw new \RuntimeException('Представление не найдено'); }
+ if (trim((string) $row['draft_item_markup']) === '') {
+ throw new \InvalidArgumentException('Заполните шаблон элемента');
+ }
+
+ DB::Update(self::table(), array(
+ 'published_item_markup' => (string) $row['draft_item_markup'],
+ 'published_wrapper_markup' => (string) $row['draft_wrapper_markup'],
+ 'published_empty_markup' => (string) $row['draft_empty_markup'],
+ 'published_css' => (string) $row['draft_css'],
+ 'published_settings_json' => (string) $row['draft_settings_json'],
+ 'is_published' => 1,
+ 'version' => max(1, (int) $row['version'] + 1),
+ 'author_id' => (int) $authorId,
+ 'updated_at' => time(),
+ 'published_at' => time(),
+ ), 'id=%i', (int) $id);
+ PresentationRevisionRepository::capture((int) $id, 'publish', $authorId, 'Публикация представления');
+ FileCacheInvalidator::publicPresentation();
+ return self::one((int) $id);
+ }
+
+ public static function copy($id, $authorId)
+ {
+ $row = self::one((int) $id);
+ if (!$row) { throw new \RuntimeException('Представление не найдено'); }
+ $base = $row['code'] . '_copy';
+ $code = $base;
+ $index = 2;
+ while (DB::query('SELECT id FROM ' . self::table() . ' WHERE code=%s LIMIT 1', $code)->getValue()) {
+ $code = $base . '_' . $index++;
+ }
+
+ $row['title'] .= ' (копия)';
+ $row['code'] = $code;
+ return self::save(0, $row, $authorId);
+ }
+
+ public static function delete($id)
+ {
+ $row = self::one((int) $id);
+ if (!$row) { return false; }
+ if ($row['usage_count'] > 0) { throw new \RuntimeException('Сначала удалите назначения представления'); }
+ DB::Delete(self::revisionsTable(), 'presentation_id=%i', (int) $id);
+ DB::Delete(self::table(), 'id=%i', (int) $id);
+ FileCacheInvalidator::publicPresentation();
+ return true;
+ }
+
+ public static function snapshot(array $row)
+ {
+ $keys = array(
+ 'title', 'code', 'kind', 'description', 'draft_item_markup', 'draft_wrapper_markup',
+ 'draft_empty_markup', 'draft_css', 'draft_settings_json', 'published_item_markup',
+ 'published_wrapper_markup', 'published_empty_markup', 'published_css',
+ 'published_settings_json', 'is_published', 'version',
+ );
+ $out = array('id' => isset($row['id']) ? (int) $row['id'] : 0);
+ foreach ($keys as $key) { $out[$key] = isset($row[$key]) ? $row[$key] : ''; }
+ return $out;
+ }
+
+ public static function applySnapshot($id, array $snapshot, $authorId)
+ {
+ $current = self::raw((int) $id);
+ if (!$current) { throw new \RuntimeException('Представление не найдено'); }
+ $snapshot['title'] = isset($snapshot['title']) ? $snapshot['title'] : $current['title'];
+ $snapshot['code'] = isset($snapshot['code']) ? $snapshot['code'] : $current['code'];
+ $data = self::input($snapshot, (int) $id);
+ $data['author_id'] = (int) $authorId;
+ $data['updated_at'] = time();
+ DB::Update(self::table(), $data, 'id=%i', (int) $id);
+ return (int) $id;
+ }
+
+ protected static function input(array $input, $id)
+ {
+ $title = trim(isset($input['title']) ? (string) $input['title'] : '');
+ $code = strtolower(trim(isset($input['code']) ? (string) $input['code'] : ''));
+ $kind = strtolower(trim(isset($input['kind']) ? (string) $input['kind'] : 'card'));
+ if ($title === '') { throw new \InvalidArgumentException('Укажите название представления'); }
+ if (!isset(self::$kinds[$kind])) { throw new \InvalidArgumentException('Выберите вид представления'); }
+ if (!preg_match('/^[a-z][a-z0-9_-]{1,79}$/', $code)) {
+ throw new \InvalidArgumentException('Код: латиница, цифры, дефис или подчёркивание');
+ }
+
+ if (DB::query('SELECT id FROM ' . self::table() . ' WHERE code=%s AND id!=%i LIMIT 1', $code, (int) $id)->getValue()) {
+ throw new \InvalidArgumentException('Такой код уже используется');
+ }
+
+ $settings = isset($input['draft_settings_json']) ? Json::toArray((string) $input['draft_settings_json']) : array();
+ $markup = array(
+ 'Элемент' => isset($input['draft_item_markup']) ? (string) $input['draft_item_markup'] : '',
+ 'Обёртка' => isset($input['draft_wrapper_markup']) ? (string) $input['draft_wrapper_markup'] : '',
+ 'Пустой результат' => isset($input['draft_empty_markup']) ? (string) $input['draft_empty_markup'] : '',
+ );
+ $syntax = PresentationSyntax::checkMany($markup);
+ if (!$syntax['ok']) {
+ throw new \InvalidArgumentException($syntax['message']);
+ }
+
+ return array(
+ 'title' => $title,
+ 'code' => $code,
+ 'kind' => $kind,
+ 'description' => trim(isset($input['description']) ? (string) $input['description'] : ''),
+ 'draft_item_markup' => $markup['Элемент'],
+ 'draft_wrapper_markup' => $markup['Обёртка'],
+ 'draft_empty_markup' => $markup['Пустой результат'],
+ 'draft_css' => isset($input['draft_css']) ? (string) $input['draft_css'] : '',
+ 'draft_settings_json' => Json::encode(is_array($settings) ? $settings : array(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+ );
+ }
+
+ protected static function format(array $row, $withCode)
+ {
+ $row['id'] = (int) $row['id'];
+ $row['version'] = (int) $row['version'];
+ $row['usage_count'] = isset($row['usage_count']) ? (int) $row['usage_count'] : 0;
+ $row['is_published'] = !empty($row['is_published']);
+ $row['kind_label'] = isset(self::$kinds[$row['kind']]) ? self::$kinds[$row['kind']] : $row['kind'];
+ $row['has_changes'] = !$row['is_published']
+ || (string) $row['draft_item_markup'] !== (string) $row['published_item_markup']
+ || (string) $row['draft_wrapper_markup'] !== (string) $row['published_wrapper_markup']
+ || (string) $row['draft_empty_markup'] !== (string) $row['published_empty_markup']
+ || (string) $row['draft_css'] !== (string) $row['published_css']
+ || (string) $row['draft_settings_json'] !== (string) $row['published_settings_json'];
+ $row['updated_label'] = !empty($row['updated_at']) ? date('d.m.Y H:i', (int) $row['updated_at']) : '—';
+ if (!$withCode) {
+ foreach (array_keys($row) as $key) {
+ if (strpos($key, '_markup') !== false || strpos($key, '_css') !== false || strpos($key, '_settings_json') !== false) {
+ unset($row[$key]);
+ }
+ }
+ }
+
+ return $row;
+ }
+ }
diff --git a/system/App/Content/Presentation/PresentationRevisionRepository.php b/system/App/Content/Presentation/PresentationRevisionRepository.php
new file mode 100644
index 0000000..9a5885e
--- /dev/null
+++ b/system/App/Content/Presentation/PresentationRevisionRepository.php
@@ -0,0 +1,105 @@
+
+ | @copyright 2007-2026 (c) AVE.cms
+ | @link https://ave-cms.ru
+ | @version 3.3
+ */
+
+ namespace App\Content\Presentation;
+
+ defined('BASEPATH') || die('Direct access to this location is not allowed.');
+
+ use App\Content\Revisions\JsonRevisionStore;
+
+ class PresentationRevisionRepository
+ {
+ protected static $store;
+
+ public static function all($presentationId, $limit = 100)
+ {
+ $rows = self::store()->listing($presentationId, $limit);
+ return array_map(function ($row) { return self::format($row, false); }, $rows);
+ }
+
+ public static function one($id)
+ {
+ $row = self::store()->one($id);
+ return $row ? self::format($row, true) : null;
+ }
+
+ public static function capture($presentationId, $action, $authorId, $comment)
+ {
+ $row = PresentationRepository::raw((int) $presentationId);
+ if (!$row) { return 0; }
+ return self::store()->capture(
+ $presentationId,
+ $action,
+ PresentationRepository::snapshot($row),
+ $authorId,
+ $comment
+ );
+ }
+
+ public static function restore($revisionId, $authorId)
+ {
+ $revision = self::one((int) $revisionId);
+ if (!$revision || !$revision['snapshot']) { throw new \RuntimeException('Ревизия не найдена'); }
+ $id = (int) $revision['presentation_id'];
+ self::capture($id, 'restore_backup', $authorId, 'Снимок перед восстановлением');
+ PresentationRepository::applySnapshot($id, $revision['snapshot'], $authorId);
+ self::capture($id, 'restore', $authorId, 'Восстановлен черновик ревизии #' . (int) $revisionId);
+ return $id;
+ }
+
+ public static function delete($id)
+ {
+ return self::store()->delete($id);
+ }
+
+ public static function deleteAll($presentationId)
+ {
+ return self::store()->deleteFor($presentationId);
+ }
+
+ protected static function format(array $row, $snapshot)
+ {
+ $row = self::store()->formatRow($row, $snapshot);
+ return array(
+ 'id' => (int) $row['id'],
+ 'presentation_id' => (int) $row['presentation_id'],
+ 'action' => $row['action'],
+ 'action_label' => $row['action_label'],
+ 'badge' => $row['badge'],
+ 'comment' => (string) $row['comment'],
+ 'author_name' => (string) $row['author_name'],
+ 'created_label' => $row['created_label'],
+ 'snapshot' => $row['snapshot'],
+ );
+ }
+
+ protected static function store()
+ {
+ if (!self::$store) {
+ self::$store = new JsonRevisionStore(
+ PresentationRepository::revisionsTable(),
+ 'presentation_id',
+ array(
+ 'create' => array('Создание', 'badge-green'),
+ 'update' => array('Черновик', 'badge-blue'),
+ 'publish' => array('Публикация', 'badge-violet'),
+ 'restore' => array('Восстановление', 'badge-cyan'),
+ 'restore_backup' => array('Перед восстановлением', 'badge-gray'),
+ )
+ );
+ }
+
+ return self::$store;
+ }
+ }
diff --git a/system/App/Content/Presentation/PresentationSyntax.php b/system/App/Content/Presentation/PresentationSyntax.php
new file mode 100644
index 0000000..db3c336
--- /dev/null
+++ b/system/App/Content/Presentation/PresentationSyntax.php
@@ -0,0 +1,43 @@
+
+ | @copyright 2007-2026 (c) AVE.cms
+ | @link https://ave-cms.ru
+ | @version 3.3
+ */
+
+ namespace App\Content\Presentation;
+
+ defined('BASEPATH') || die('Direct access to this location is not allowed.');
+
+ use App\Common\Twig;
+
+ class PresentationSyntax
+ {
+ public static function check($source, $name = 'Шаблон')
+ {
+ try {
+ if (!Twig::twig()) { Twig::init(); }
+ Twig::twig()->createTemplate((string) $source, 'presentation-syntax-check');
+ return array('ok' => true, 'message' => $name . ': синтаксис корректен');
+ } catch (\Throwable $e) {
+ return array('ok' => false, 'message' => $name . ': ' . $e->getMessage());
+ }
+ }
+
+ public static function checkMany(array $sources)
+ {
+ foreach ($sources as $name => $source) {
+ $result = self::check($source, (string) $name);
+ if (!$result['ok']) { return $result; }
+ }
+
+ return array('ok' => true, 'message' => 'Twig-синтаксис корректен');
+ }
+ }
diff --git a/system/App/Content/ProductShipping.php b/system/App/Content/ProductShipping.php
index a5f0b94..953ff7d 100644
--- a/system/App/Content/ProductShipping.php
+++ b/system/App/Content/ProductShipping.php
@@ -39,6 +39,38 @@
);
}
+ public static function summaries(array $productIds)
+ {
+ $productIds = array_values(array_unique(array_filter(array_map('intval', $productIds))));
+ $out = array();
+ foreach ($productIds as $productId) {
+ $out[$productId] = array(
+ 'product_id' => $productId,
+ 'shipping_enabled' => 0,
+ 'package_count' => 0,
+ 'places_count' => 0,
+ 'total_weight' => 0,
+ 'incomplete_count' => 0,
+ );
+ }
+
+ if (!$productIds) { return $out; }
+ $rows = DB::query(
+ 'SELECT sp.product_id,MAX(sp.shipping_enabled) shipping_enabled,'
+ . ' COUNT(pk.id) package_count,COALESCE(SUM(pk.quantity),0) places_count,'
+ . ' COALESCE(SUM(pk.weight_kg*pk.quantity),0) total_weight,'
+ . ' COALESCE(SUM(CASE WHEN pk.id IS NOT NULL'
+ . ' AND (pk.weight_kg<=0 OR pk.length_cm<=0 OR pk.width_cm<=0 OR pk.height_cm<=0)'
+ . ' THEN 1 ELSE 0 END),0) incomplete_count'
+ . ' FROM ' . self::profilesTable() . ' sp'
+ . ' LEFT JOIN ' . self::packagesTable() . ' pk ON pk.product_id=sp.product_id'
+ . ' WHERE sp.product_id IN (' . implode(',', $productIds) . ')'
+ . ' GROUP BY sp.product_id'
+ )->getAll() ?: array();
+ foreach ($rows as $row) { $out[(int) $row['product_id']] = $row; }
+ return $out;
+ }
+
public static function save($productId, $enabled, array $packages)
{
$productId = (int) $productId;
diff --git a/system/App/Content/PublicUserTables.php b/system/App/Content/PublicUserTables.php
index 1176e44..8e5d72f 100644
--- a/system/App/Content/PublicUserTables.php
+++ b/system/App/Content/PublicUserTables.php
@@ -18,7 +18,7 @@
use App\Common\PublicConfiguration;
- /** Resolves public profiles; Adminx access is linked through system users.legacy_id. */
+ /** Resolves public profiles; panel access is linked through system users.legacy_id. */
class PublicUserTables
{
protected static $allowed = array(
diff --git a/system/App/Content/Requests/RequestMatchExplainer.php b/system/App/Content/Requests/RequestMatchExplainer.php
index b9f7a7a..73ac3a2 100644
--- a/system/App/Content/Requests/RequestMatchExplainer.php
+++ b/system/App/Content/Requests/RequestMatchExplainer.php
@@ -25,7 +25,7 @@
/** Explains why a document is included in or excluded from a saved request. */
class RequestMatchExplainer
{
- public function explain($requestId, $documentId)
+ public function explain($requestId, $documentId, array $parameters = array())
{
$request = $this->request((int) $requestId);
$document = $this->document((int) $documentId);
@@ -33,26 +33,80 @@
throw new \InvalidArgumentException(!$request ? 'Запрос не найден' : 'Документ не найден');
}
- $matched = $this->matchesExecutor((int) $request['Id'], (int) $document['Id']);
- $base = $this->baseChecks($request, $document);
- $fields = $this->fieldDefinitions((int) $request['rubric_id']);
- $values = $this->documentValues((int) $document['Id']);
- $groups = $this->conditionTree((int) $request['Id'], $request, $document, $fields, $values);
+ $parameters = $this->normalizeParameters($parameters);
+ $previousRequest = $_REQUEST;
+ $previousGet = $_GET;
+ $_REQUEST = $parameters;
+ $_GET = $parameters;
- return array(
- 'matched' => $matched,
- 'document' => array(
- 'id' => (int) $document['Id'],
- 'title' => htmlspecialchars_decode((string) $document['document_title'], ENT_QUOTES),
- 'alias' => (string) $document['document_alias'],
- 'rubric_id' => (int) $document['rubric_id'],
- ),
- 'base' => $base,
- 'groups' => $groups ? array($groups) : array(),
- 'notes' => array(
- 'Итог всегда определяется текущим публичным executor.',
- 'Пояснение выполняется в контексте Adminx без параметров публичной страницы.',
- ),
+ try {
+ $matched = $this->matchesExecutor((int) $request['Id'], (int) $document['Id']);
+ $base = $this->baseChecks($request, $document);
+ $fields = $this->fieldDefinitions((int) $request['rubric_id']);
+ $values = $this->documentValues((int) $document['Id']);
+ $groups = $this->conditionTree((int) $request['Id'], $request, $document, $fields, $values);
+
+ return array(
+ 'matched' => $matched,
+ 'request' => array(
+ 'id' => (int) $request['Id'],
+ 'title' => htmlspecialchars_decode((string) $request['request_title'], ENT_QUOTES),
+ 'alias' => (string) $request['request_alias'],
+ 'rubric_id' => (int) $request['rubric_id'],
+ ),
+ 'document' => array(
+ 'id' => (int) $document['Id'],
+ 'title' => htmlspecialchars_decode((string) $document['document_title'], ENT_QUOTES),
+ 'alias' => (string) $document['document_alias'],
+ 'rubric_id' => (int) $document['rubric_id'],
+ ),
+ 'parameters' => $parameters,
+ 'base' => $base,
+ 'groups' => $groups ? array($groups) : array(),
+ 'notes' => array(
+ 'Итог всегда определяется текущим публичным executor.',
+ $parameters
+ ? 'Условия проверены с указанными параметрами публичной страницы.'
+ : 'Параметры публичной страницы не переданы.',
+ ),
+ );
+ } finally {
+ $_REQUEST = $previousRequest;
+ $_GET = $previousGet;
+ }
+ }
+
+ protected function normalizeParameters(array $parameters)
+ {
+ $result = array();
+ foreach ($parameters as $key => $value) {
+ $key = preg_replace('/[^a-z0-9_.-]+/i', '', (string) $key);
+ if ($key === '' || $this->sensitiveKey($key)) {
+ continue;
+ }
+
+ if (is_array($value)) {
+ $items = array();
+ foreach (array_slice($value, 0, 50) as $item) {
+ if (is_scalar($item) || $item === null) {
+ $items[] = mb_substr((string) $item, 0, 500);
+ }
+ }
+
+ $result[$key] = $items;
+ } elseif (is_scalar($value) || $value === null) {
+ $result[$key] = mb_substr((string) $value, 0, 500);
+ }
+ }
+
+ return $result;
+ }
+
+ protected function sensitiveKey($key)
+ {
+ return (bool) preg_match(
+ '/(?:pass|secret|token|cookie|session|authorization|credential|api[_-]?key|парол|секрет|токен|ключ[_ -]?api)/iu',
+ (string) $key
);
}
diff --git a/system/App/Content/Revisions/JsonRevisionStore.php b/system/App/Content/Revisions/JsonRevisionStore.php
new file mode 100644
index 0000000..c972360
--- /dev/null
+++ b/system/App/Content/Revisions/JsonRevisionStore.php
@@ -0,0 +1,203 @@
+
+ | @copyright 2007-2026 (c) AVE.cms
+ | @link https://ave-cms.ru
+ | @version 3.3
+ */
+
+ namespace App\Content\Revisions;
+
+ defined('BASEPATH') || die('Direct access to this location is not allowed.');
+
+ use App\Common\SystemTables;
+ use App\Helpers\Json;
+ use DB;
+
+ /**
+ * Общее хранилище JSON-ревизий для сущностей с числовым владельцем.
+ *
+ * Класс не знает, как получить или применить снимок. Эти бизнес-правила
+ * остаются в репозитории конкретной сущности.
+ */
+ class JsonRevisionStore
+ {
+ protected $table;
+ protected $ownerColumn;
+ protected $labels;
+
+ public function __construct($table, $ownerColumn, array $labels = array())
+ {
+ $this->table = self::identifier($table);
+ $this->ownerColumn = self::identifier($ownerColumn);
+ $this->labels = $labels;
+ }
+
+ public function listing($ownerId, $limit = 50)
+ {
+ return DB::query(
+ 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->ownerColumn
+ . '=%i ORDER BY created_at DESC,id DESC LIMIT %i',
+ (int) $ownerId,
+ max(1, min(200, (int) $limit))
+ )->getAll() ?: array();
+ }
+
+ public function one($id)
+ {
+ return DB::query(
+ 'SELECT * FROM ' . $this->table . ' WHERE id=%i LIMIT 1',
+ (int) $id
+ )->getAssoc() ?: null;
+ }
+
+ public function capture($ownerId, $action, array $snapshot, $authorId = 0, $comment = '', array $extra = array(), $deduplicate = true)
+ {
+ $ownerId = (int) $ownerId;
+ if ($ownerId <= 0 || !$snapshot) {
+ return 0;
+ }
+
+ $json = Json::encode($snapshot, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+ if (!is_string($json)) {
+ throw new \RuntimeException('Не удалось создать JSON-снимок');
+ }
+
+ $hash = sha1($json);
+ if ($deduplicate) {
+ $last = DB::query(
+ 'SELECT snapshot_hash FROM ' . $this->table . ' WHERE ' . $this->ownerColumn
+ . '=%i ORDER BY created_at DESC,id DESC LIMIT 1',
+ $ownerId
+ )->getValue();
+ if ($last && hash_equals((string) $last, $hash)) {
+ return 0;
+ }
+ }
+
+ $data = array(
+ $this->ownerColumn => $ownerId,
+ 'action' => (string) $action,
+ 'snapshot_hash' => $hash,
+ 'snapshot_json' => $json,
+ 'comment' => trim((string) $comment),
+ 'author_id' => (int) $authorId,
+ 'author_name' => self::authorName((int) $authorId),
+ 'created_at' => time(),
+ );
+ foreach ($extra as $column => $value) {
+ $column = self::identifier($column);
+ if (array_key_exists($column, $data)) {
+ throw new \InvalidArgumentException('Нельзя переопределить системное поле ревизии');
+ }
+
+ $data[$column] = $value;
+ }
+
+ DB::Insert($this->table, $data);
+ return (int) DB::insertId();
+ }
+
+ public function delete($id)
+ {
+ $row = $this->one($id);
+ if (!$row) {
+ return false;
+ }
+
+ DB::Delete($this->table, 'id=%i', (int) $id);
+ return isset($row[$this->ownerColumn]) ? (int) $row[$this->ownerColumn] : 0;
+ }
+
+ public function deleteFor($ownerId)
+ {
+ $ownerId = (int) $ownerId;
+ if ($ownerId <= 0) {
+ return 0;
+ }
+
+ $count = (int) DB::query(
+ 'SELECT COUNT(*) FROM ' . $this->table . ' WHERE ' . $this->ownerColumn . '=%i',
+ $ownerId
+ )->getValue();
+ DB::Delete($this->table, $this->ownerColumn . '=%i', $ownerId);
+ return $count;
+ }
+
+ public function formatRow(array $row, $withSnapshot = false)
+ {
+ $action = isset($row['action']) ? (string) $row['action'] : 'update';
+ $meta = isset($this->labels[$action]) ? $this->labels[$action] : array();
+ $label = isset($meta['label']) ? $meta['label'] : (isset($meta[0]) ? $meta[0] : $action);
+ $badge = isset($meta['badge']) ? $meta['badge'] : (isset($meta[1]) ? $meta[1] : 'badge-gray');
+ $created = isset($row['created_at']) ? (int) $row['created_at'] : 0;
+ $row['id'] = isset($row['id']) ? (int) $row['id'] : 0;
+ $row[$this->ownerColumn] = isset($row[$this->ownerColumn]) ? (int) $row[$this->ownerColumn] : 0;
+ $row['action'] = $action;
+ $row['action_label'] = (string) $label;
+ $row['badge'] = (string) $badge;
+ $row['author_id'] = isset($row['author_id']) ? (int) $row['author_id'] : 0;
+ $row['author_name'] = isset($row['author_name']) ? (string) $row['author_name'] : '';
+ $row['created_at'] = $created;
+ $row['created_label'] = $created > 0 ? date('d.m.Y H:i:s', $created) : '-';
+ $row['snapshot'] = $withSnapshot
+ ? Json::toArray(isset($row['snapshot_json']) ? (string) $row['snapshot_json'] : '')
+ : null;
+ return $row;
+ }
+
+ public static function formatBytes($bytes)
+ {
+ $bytes = (int) $bytes;
+ if ($bytes < 1024) {
+ return $bytes . ' Б';
+ }
+
+ if ($bytes < 1048576) {
+ return round($bytes / 1024, 1) . ' KB';
+ }
+
+ return round($bytes / 1048576, 1) . ' MB';
+ }
+
+ protected static function authorName($id)
+ {
+ if ((int) $id <= 0) {
+ return '';
+ }
+
+ $row = DB::query(
+ 'SELECT name,login,email FROM ' . SystemTables::table('users') . ' WHERE id=%i LIMIT 1',
+ (int) $id
+ )->getAssoc();
+ if (!$row) {
+ return '#' . (int) $id;
+ }
+
+ if (!empty($row['name'])) {
+ return (string) $row['name'];
+ }
+
+ if (!empty($row['login'])) {
+ return '@' . (string) $row['login'];
+ }
+
+ return !empty($row['email']) ? (string) $row['email'] : '#' . (int) $id;
+ }
+
+ protected static function identifier($value)
+ {
+ $value = (string) $value;
+ if ($value === '' || !preg_match('/^[a-zA-Z0-9_]+$/', $value)) {
+ throw new \InvalidArgumentException('Некорректный идентификатор хранилища ревизий');
+ }
+
+ return $value;
+ }
+ }
diff --git a/system/App/Frontend/Auth/Controller.php b/system/App/Frontend/Auth/Controller.php
index 5df3912..894cb9d 100644
--- a/system/App/Frontend/Auth/Controller.php
+++ b/system/App/Frontend/Auth/Controller.php
@@ -509,7 +509,7 @@
return $data;
}
- /** Adminx identity is also a valid authenticated identity on public pages. */
+ /** A control-panel identity is also valid on public pages. */
protected function hasPublicIdentity()
{
return Auth::publicCheck() || (bool) Auth::systemUser();
diff --git a/system/App/Frontend/Auth/assets/auth.css b/system/App/Frontend/Auth/assets/auth.css
index 866583d..086427d 100644
--- a/system/App/Frontend/Auth/assets/auth.css
+++ b/system/App/Frontend/Auth/assets/auth.css
@@ -79,7 +79,7 @@
.system-public-auth-phone-message.is-error { color: #b42318; }
.system-public-auth-phone-links { display: flex; align-items: center; flex-wrap: wrap; gap: 4px 18px; margin-top: 4px; }
.system-public-auth-phone-back, .system-public-auth-phone-resend { min-height: 40px; padding: 6px 0; border: 0; background: transparent; color: #5c3f87; font: inherit; font-size: 13px; font-weight: 600; cursor: pointer; }
-.system-public-auth-phone-resend { font-variant-numeric: tabular-nums; }
+.system-public-auth-phone-resend { }
.system-public-auth-phone-back:hover, .system-public-auth-phone-back:focus, .system-public-auth-phone-resend:hover, .system-public-auth-phone-resend:focus { text-decoration: none; }
.system-public-auth-phone-resend:disabled { color: #87909c; cursor: default; }
.system-public-auth-phone .sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0; white-space: nowrap; }
diff --git a/system/App/Frontend/Bootstrap.php b/system/App/Frontend/Bootstrap.php
index 0694d84..17b8751 100644
--- a/system/App/Frontend/Bootstrap.php
+++ b/system/App/Frontend/Bootstrap.php
@@ -48,6 +48,11 @@
5,
array('cacheable' => true)
);
+ \App\Helpers\Hooks::add(
+ 'frontend.response.rendering',
+ array(\App\Content\Presentation\PresentationRenderer::class, 'injectLifecycleAssets'),
+ 900
+ );
Feeds\Feature::boot($config);
FieldEndpoint::boot();
Media\Feature::boot($config);
diff --git a/system/App/Frontend/ContentCollectionTags.php b/system/App/Frontend/ContentCollectionTags.php
index 242be28..f0adb6c 100644
--- a/system/App/Frontend/ContentCollectionTags.php
+++ b/system/App/Frontend/ContentCollectionTags.php
@@ -19,6 +19,7 @@
use App\Common\Twig;
use App\Content\ContentTables;
use App\Content\Documents\DocumentSnapshotRepository;
+ use App\Content\Presentation\DocumentPresentationBridge;
use App\Helpers\Request;
use DB;
@@ -85,13 +86,29 @@
$document = isset($context['document']) ? $context['document'] : null;
$alias = is_object($document) && isset($document->document_alias) ? (string) $document->document_alias : '';
+ $pagination = $paginate ? self::pagination($alias, $page, $pages) : array();
+ $presentation = DocumentPresentationBridge::renderList(
+ 'content_list',
+ $rows,
+ array('rubric' => (string) $rubricId, 'module' => 'content'),
+ array(
+ 'source' => 'content_list',
+ 'rubric_id' => $rubricId,
+ 'total' => $total,
+ 'page' => $page,
+ 'pages' => $pages,
+ 'pagination' => $pagination,
+ )
+ );
+ if ($presentation !== null) { return $presentation; }
+
return Twig::twig()->render('@content_public/list.twig', array(
'rubric_id' => $rubricId,
'items' => $items,
'total' => $total,
'page' => $page,
'pages' => $pages,
- 'pagination' => $paginate ? self::pagination($alias, $page, $pages) : array(),
+ 'pagination' => $pagination,
));
}
diff --git a/system/App/Frontend/Debug/PublicDebugToolbar.php b/system/App/Frontend/Debug/PublicDebugToolbar.php
index 30f894d..b91ee01 100644
--- a/system/App/Frontend/Debug/PublicDebugToolbar.php
+++ b/system/App/Frontend/Debug/PublicDebugToolbar.php
@@ -128,7 +128,7 @@
$httpHtml = self::sectionHead('HTTP', $method . ' · ' . $uri, self::countBadge(self::leafCount($httpData)))
. self::httpGroups($httpData);
$sessionData = self::masked(isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
- $sessionHtml = self::sectionHead('Контексты авторизации', 'Публичный профиль и роль Adminx связаны в единую личность', self::countBadge(($systemUser ? 1 : 0) + ($publicUser ? 1 : 0), $systemUser ? 'green' : 'slate'))
+ $sessionHtml = self::sectionHead('Контексты авторизации', 'Публичный профиль и роль панели управления связаны в единую учётную запись', self::countBadge(($systemUser ? 1 : 0) + ($publicUser ? 1 : 0), $systemUser ? 'green' : 'slate'))
. self::identityPanel($systemUser, $publicUser)
. self::sectionHead('PHP Session', session_id() !== '' ? 'ID ' . self::shortId(session_id()) : 'Сессия не запущена', self::countBadge(self::leafCount($sessionData)))
. self::dataView($sessionData);
@@ -722,7 +722,7 @@
#pdt-toggle:hover{background:#1e293b;box-shadow:0 10px 28px rgba(15,23,42,.34)}
#pdt-toggle:active{transform:scale(.96)}
#pdt-toggle b{color:#60a5fa;font-size:12px}
-#pdt-toggle span,#pdt-toggle i{font-variant-numeric:tabular-nums}
+#pdt-toggle span,#pdt-toggle i{}
#pdt-toggle i{display:grid;place-items:center;min-width:20px;height:20px;padding:0 5px;border-radius:10px;background:#dc2626;color:#fff;font-size:11px;font-style:normal;font-weight:700}
#pdt-panel{position:fixed;z-index:2147483647;right:12px;bottom:12px;width:min(1240px,calc(100vw - 24px));height:min(78vh,820px);border:1px solid #334155;border-radius:8px;background:#f5f7fa;box-shadow:0 24px 70px rgba(15,23,42,.4);overflow:hidden}
#pdt-panel>header{height:56px;display:flex;align-items:center;gap:12px;padding:0 8px 0 16px;background:#111827;color:#fff;cursor:grab;touch-action:none;user-select:none}
@@ -741,7 +741,7 @@
#pdt-panel>nav button:hover{background:#f1f5f9;color:#1e293b}
#pdt-panel>nav button:active{transform:scale(.96)}
#pdt-panel>nav button.is-active{background:#dbeafe;color:#1d4ed8}
-#pdt-panel>nav button em{display:grid;place-items:center;min-width:20px;height:20px;padding:0 5px;border-radius:10px;background:#e8edf3;color:#64748b;font-size:10px;font-style:normal;font-weight:750;font-variant-numeric:tabular-nums}
+#pdt-panel>nav button em{display:grid;place-items:center;min-width:20px;height:20px;padding:0 5px;border-radius:10px;background:#e8edf3;color:#64748b;font-size:10px;font-style:normal;font-weight:750;}
#pdt-panel>nav button.is-active em{background:#fff;color:#1d4ed8}
#pdt-panel>nav button em.is-alert{background:#fee2e2;color:#b91c1c}
#pdt-panel>main{height:calc(100% - 108px);overflow:auto;padding:16px;overscroll-behavior:contain}
@@ -749,7 +749,7 @@
.pdt-section-head{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;margin:0 0 12px;padding:0 2px}
.pdt-section-head h2{margin:0;color:#172033;font-size:17px;line-height:1.3;font-weight:720;text-wrap:balance}
.pdt-section-head p{margin:3px 0 0;color:#6b778a;font-size:12px;overflow-wrap:anywhere;text-wrap:pretty}
-.pdt-badge,.pdt-count{display:inline-flex;align-items:center;justify-content:center;flex:0 0 auto;border-radius:4px;font-weight:700;font-variant-numeric:tabular-nums}
+.pdt-badge,.pdt-count{display:inline-flex;align-items:center;justify-content:center;flex:0 0 auto;border-radius:4px;font-weight:700;}
.pdt-badge{min-height:24px;padding:0 7px;font-size:10px;text-transform:uppercase}
.pdt-count{min-width:26px;height:26px;padding:0 7px;font-size:11px}
.pdt-badge-blue,.pdt-count-blue{background:#dbeafe;color:#1d4ed8}.pdt-badge-green,.pdt-count-green{background:#dcfce7;color:#15803d}.pdt-badge-amber,.pdt-count-amber{background:#fef3c7;color:#a16207}.pdt-badge-red,.pdt-count-red{background:#fee2e2;color:#b91c1c}.pdt-badge-violet,.pdt-count-violet{background:#ede9fe;color:#6d28d9}.pdt-badge-slate,.pdt-count-slate{background:#e8edf3;color:#526074}
@@ -758,7 +758,7 @@
.pdt-metric.pdt-tone-green{background:#15803d}.pdt-metric.pdt-tone-amber{background:#b45309}.pdt-metric.pdt-tone-red{background:#dc2626}.pdt-metric.pdt-tone-violet{background:#7c3aed}.pdt-metric.pdt-tone-blue{background:#2563eb}
.pdt-metric small,.pdt-metric strong{display:block;overflow-wrap:anywhere}
.pdt-metric small{color:rgba(255,255,255,.82);font-size:11px}
-.pdt-metric strong{margin-top:5px;color:#fff;font-size:18px;line-height:1.25;font-variant-numeric:tabular-nums}
+.pdt-metric strong{margin-top:5px;color:#fff;font-size:18px;line-height:1.25;}
.pdt-dl{margin:0;border:1px solid #dce3eb;border-radius:7px;background:#fff;overflow:hidden}
.pdt-dl>div{display:grid;grid-template-columns:180px minmax(0,1fr);border-bottom:1px solid #edf1f5}
.pdt-dl>div:last-child{border-bottom:0}
@@ -776,22 +776,22 @@
.pdt-filter>span{color:#8491a3;font-size:20px;line-height:1}
.pdt-filter input{min-width:0;height:40px;border:0;outline:0;background:transparent;color:#172033}
.pdt-filter input::placeholder{color:#8a97a8}
-.pdt-filter small{padding:2px 6px;border-radius:4px;background:#edf1f5;color:#64748b;font-weight:700;font-variant-numeric:tabular-nums}
+.pdt-filter small{padding:2px 6px;border-radius:4px;background:#edf1f5;color:#64748b;font-weight:700;}
.pdt-query-list{display:grid;gap:8px}
.pdt-query{border:1px solid #dce3eb;border-radius:6px;background:#fff;overflow:hidden}
.pdt-query summary{display:grid;grid-template-columns:42px 62px minmax(0,1fr) 90px;align-items:center;gap:9px;min-height:44px;padding:7px 11px;cursor:pointer;list-style:none}
.pdt-query summary::-webkit-details-marker{display:none}
.pdt-query[open]{border-color:#b8c5d4}
-.pdt-query-index{color:#8491a3;font-size:11px;font-variant-numeric:tabular-nums}
+.pdt-query-index{color:#8491a3;font-size:11px;}
.pdt-query summary code{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#6b778a;font:11px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace}
-.pdt-query summary strong{justify-self:end;font-size:11px;font-variant-numeric:tabular-nums}
+.pdt-query summary strong{justify-self:end;font-size:11px;}
.pdt-query pre{max-height:330px;margin:0;padding:13px 14px;border-top:1px solid #26344a;background:#101827;color:#dbeafe;white-space:pre-wrap;overflow:auto;overflow-wrap:anywhere;font:12px/1.55 ui-monospace,SFMono-Regular,Consolas,monospace}
.pdt-value-green{color:#15803d}.pdt-value-amber{color:#a16207}.pdt-value-red{color:#b91c1c}.pdt-value-blue{color:#1d4ed8}.pdt-value-slate{color:#64748b}.pdt-notice{margin:0 0 10px;padding:9px 11px;border:1px solid #f5d38a;border-radius:6px;background:#fffbeb;color:#8a5a00;font-size:11px}
.pdt-debug-entries{display:grid;gap:10px}
.pdt-debug-entries>article{min-width:0;border:1px solid #dce3eb;border-radius:7px;background:#fff;overflow:hidden}
.pdt-debug-entries>article>header{display:flex;align-items:center;justify-content:space-between;gap:12px;min-height:52px;padding:7px 11px;border-bottom:1px solid #edf1f5;background:#fafbfc}
.pdt-debug-entries>article>header>div{display:flex;align-items:center;min-width:0;gap:10px}
-.pdt-debug-entries>article>header>div>span{display:grid;place-items:center;flex:0 0 25px;width:25px;height:25px;border-radius:5px;background:#ede9fe;color:#6d28d9;font-size:10px;font-weight:750;font-variant-numeric:tabular-nums}
+.pdt-debug-entries>article>header>div>span{display:grid;place-items:center;flex:0 0 25px;width:25px;height:25px;border-radius:5px;background:#ede9fe;color:#6d28d9;font-size:10px;font-weight:750;}
.pdt-debug-entries>article>header>div>div{min-width:0}
.pdt-debug-entries>article>header strong,.pdt-debug-entries>article>header code{display:block;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
.pdt-debug-entries>article>header strong{color:#273449;font-size:12px}.pdt-debug-entries>article>header code{margin-top:2px;color:#8491a3;font:10px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace}
@@ -802,7 +802,7 @@
.pdt-timeline-row>code{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#435269;font:11px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace}
.pdt-timeline-track{height:6px;border-radius:3px;background:#edf1f5;overflow:hidden}
.pdt-timeline-track i{display:block;height:100%;border-radius:3px}.pdt-bg-green{background:#22c55e}.pdt-bg-amber{background:#f59e0b}.pdt-bg-red{background:#ef4444}.pdt-bg-blue{background:#3b82f6}
-.pdt-timeline-row>strong{text-align:right;font-size:11px;font-variant-numeric:tabular-nums}
+.pdt-timeline-row>strong{text-align:right;font-size:11px;}
.pdt-data{border:1px solid #dce3eb;border-radius:7px;background:#fff;overflow:hidden}
.pdt-data.is-nested{margin:0;border:0;border-top:1px solid #edf1f5;border-radius:0;background:#fafbfc}
.pdt-data-row{display:grid;grid-template-columns:minmax(150px,32%) minmax(0,1fr);border-bottom:1px solid #edf1f5}
@@ -831,7 +831,7 @@
.pdt-file-list{border:1px solid #dce3eb;border-radius:7px;background:#fff;overflow:hidden}
.pdt-file-list>[data-pdt-filter-item]{display:grid;grid-template-columns:44px minmax(0,1fr);align-items:center;min-height:46px;border-bottom:1px solid #edf1f5}
.pdt-file-list>[data-pdt-filter-item]:last-of-type{border-bottom:0}
-.pdt-file-list>[data-pdt-filter-item]>span{padding:0 10px;color:#94a3b8;text-align:right;font-size:10px;font-variant-numeric:tabular-nums}
+.pdt-file-list>[data-pdt-filter-item]>span{padding:0 10px;color:#94a3b8;text-align:right;font-size:10px;}
.pdt-file-list>[data-pdt-filter-item]>div{min-width:0;padding:6px 11px;border-left:1px solid #edf1f5}
.pdt-file-list strong,.pdt-file-list code{display:block;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
.pdt-file-list strong{color:#273449;font-size:12px}.pdt-file-list code{margin-top:2px;color:#8491a3;font:10px/1.4 ui-monospace,SFMono-Regular,Consolas,monospace}
@@ -839,7 +839,7 @@
.pdt-empty strong{color:#435269;font-size:14px}.pdt-empty span{max-width:520px;margin-top:4px;text-wrap:pretty}.pdt-empty-success{border-color:#bbf7d0;background:#f7fef9}.pdt-empty-success strong{color:#15803d}
.pdt-filter-empty{padding:22px;color:#6b778a;text-align:center}
.pdt-inspector-actions{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:10px;padding:10px 12px;border-radius:7px;background:#eaf2ff;color:#334155;box-shadow:inset 0 0 0 1px rgba(37,99,235,.1)}
-.pdt-inspector-actions span{font-size:11px}.pdt-inspector-actions b{font-variant-numeric:tabular-nums}
+.pdt-inspector-actions span{font-size:11px}.pdt-inspector-actions b{}
.pdt-command{min-height:40px;padding:0 14px;border:0;border-radius:5px;background:#2563eb;color:#fff;font-weight:700;cursor:pointer;transition:transform .15s ease,background-color .15s ease}
.pdt-command:hover{background:#1d4ed8}.pdt-command:active{transform:scale(.96)}.pdt-command.is-active{background:#0f766e}
.pdt-inspector-list{display:grid;gap:7px}
@@ -858,7 +858,7 @@
.pdi-label{position:absolute;left:-2px;top:-28px;display:flex;align-items:center;max-width:min(360px,80vw);height:26px;padding:0 9px;border:0;border-radius:4px;background:var(--pdi-tone);color:#fff;box-shadow:0 4px 14px rgba(15,23,42,.24);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:10px;font-weight:750;cursor:pointer;pointer-events:auto}
.pdi-box.is-label-inside .pdi-label{top:2px;left:2px}
#pdi-control{position:fixed;z-index:2147483645;left:12px;top:12px;display:flex;align-items:center;gap:9px;min-height:42px;padding:4px 5px 4px 12px;border-radius:6px;background:#111827;color:#e5e7eb;box-shadow:0 10px 30px rgba(15,23,42,.34);pointer-events:auto}
-#pdi-control strong{font-size:11px}#pdi-control span{color:#93c5fd;font-size:10px;font-variant-numeric:tabular-nums}
+#pdi-control strong{font-size:11px}#pdi-control span{color:#93c5fd;font-size:10px;}
#pdi-control button{min-width:34px;height:34px;border:0;border-radius:4px;background:#334155;color:#fff;font-size:20px;line-height:1;cursor:pointer;transition:transform .15s ease,background-color .15s ease}
#pdi-control button:hover{background:#475569}#pdi-control button:active{transform:scale(.96)}
@media(max-width:760px){
diff --git a/system/App/Frontend/RequestListRenderer.php b/system/App/Frontend/RequestListRenderer.php
index ef2ee2d..017633f 100644
--- a/system/App/Frontend/RequestListRenderer.php
+++ b/system/App/Frontend/RequestListRenderer.php
@@ -20,6 +20,7 @@
use App\Helpers\Debug;
use App\Common\Lifecycle;
use App\Common\StoredPhpRuntime;
+ use App\Content\Presentation\DocumentPresentationBridge;
/** Renders a request template for an explicit, already selected document list. */
class RequestListRenderer
@@ -71,37 +72,60 @@
Debug::startTime('ELEMENTS_ALL');
$itemRenderer = new RequestItemRenderer();
- $rows = (new RequestListReadModel())->prepare(
+ $presentation = DocumentPresentationBridge::renderList(
+ 'content_list',
$rows,
- (string) $request->request_template_item,
- $itemContext
+ array(
+ 'request' => (string) $requestId,
+ 'rubric' => (string) (int) $request->rubric_id,
+ 'module' => 'requests',
+ ),
+ array(
+ 'source' => 'request',
+ 'request_id' => $requestId,
+ 'total' => $numItems,
+ 'page' => $currentPage,
+ 'pages' => $numPages,
+ 'pagination_html' => $pagination,
+ )
);
- foreach ($rows as $row) {
- $documentId = is_object($row) && isset($row->Id) ? (int) $row->Id : (int) $row;
- if ($documentId <= 0) {
- continue;
- }
-
- $itemNumber++;
- $lastItem = $itemNumber === $itemCount;
- Debug::startTime('ELEMENT_' . $itemNumber);
-
- $renderSource = is_object($row) && isset($row->rubric_id, $row->document_title) ? $row : $documentId;
- $item = $itemRenderer->render(
- $renderSource,
- $request->request_template_item,
- '',
- $itemContext->forItem($itemNumber)
+ if ($presentation !== null) {
+ $items = $presentation;
+ $itemNumber = $itemCount;
+ } else {
+ $rows = (new RequestListReadModel())->prepare(
+ $rows,
+ (string) $request->request_template_item,
+ $itemContext
);
- PublicProfiler::record(array('REQUESTS', $requestId, 'ELEMENTS', $itemNumber), Debug::endTime('ELEMENT_' . $itemNumber));
- $item = RequestItemRenderer::decorateSequence($item, $documentId, $itemNumber, $lastItem);
- $items .= $item;
+
+ foreach ($rows as $row) {
+ $documentId = is_object($row) && isset($row->Id) ? (int) $row->Id : (int) $row;
+ if ($documentId <= 0) {
+ continue;
+ }
+
+ $itemNumber++;
+ $lastItem = $itemNumber === $itemCount;
+ Debug::startTime('ELEMENT_' . $itemNumber);
+
+ $renderSource = is_object($row) && isset($row->rubric_id, $row->document_title) ? $row : $documentId;
+ $item = $itemRenderer->render(
+ $renderSource,
+ $request->request_template_item,
+ '',
+ $itemContext->forItem($itemNumber)
+ );
+ PublicProfiler::record(array('REQUESTS', $requestId, 'ELEMENTS', $itemNumber), Debug::endTime('ELEMENT_' . $itemNumber));
+ $item = RequestItemRenderer::decorateSequence($item, $documentId, $itemNumber, $lastItem);
+ $items .= $item;
+ }
}
PublicProfiler::record(array('REQUESTS', $requestId, 'ELEMENTS', 'ALL'), Debug::endTime('ELEMENTS_ALL'));
- $mainTemplate = (string) $request->request_template_main;
+ $mainTemplate = $presentation !== null ? '[tag:content]' : (string) $request->request_template_main;
$blockRenderer = new BlockRenderer();
$mainTemplate = preg_replace_callback('/\[tag:block:([A-Za-z0-9-_]{1,20}+)\]/', function ($match) use ($blockRenderer) {
return $blockRenderer->visual($match[1]);
diff --git a/system/App/Frontend/RequestRenderer.php b/system/App/Frontend/RequestRenderer.php
index 98bda1d..3c68575 100644
--- a/system/App/Frontend/RequestRenderer.php
+++ b/system/App/Frontend/RequestRenderer.php
@@ -24,6 +24,7 @@
use App\Common\Session;
use App\Common\StoredPhpRuntime;
use App\Content\ContentTables;
+ use App\Content\Presentation\DocumentPresentationBridge;
use App\Frontend\Debug\PublicLayoutInspector;
use DB;
@@ -633,32 +634,59 @@
$items_count = count($rows);
}
- $rows = (new RequestListReadModel())->prepare(
+ $presentation = DocumentPresentationBridge::renderList(
+ 'content_list',
$rows,
- (string) $request->request_template_item,
- $itemContext
+ array(
+ 'request' => (string) (int) $request->Id,
+ 'rubric' => (string) (int) $request->rubric_id,
+ 'module' => 'requests',
+ ),
+ array(
+ 'source' => 'request',
+ 'request_id' => (int) $request->Id,
+ 'total' => (int) $num_items,
+ 'page' => PaginationRenderer::currentPage('page'),
+ 'pages' => (int) $num_pages,
+ 'pagination_html' => (string) $pagination,
+ )
);
- //if (UID == 1) Debug::_echo($rows, true);
- foreach ($rows AS $row)
+ if ($presentation !== null)
{
- $x++;
- $last_item = ($x == $items_count ? true : false);
- $item_num = $x;
- Debug::startTime('ELEMENT_' . $item_num);
+ $items = $presentation;
+ $x = $items_count;
+ $main_template = '[tag:content]';
+ }
+ else
+ {
+ $rows = (new RequestListReadModel())->prepare(
+ $rows,
+ (string) $request->request_template_item,
+ $itemContext
+ );
- $rowId = is_object($row)
- ? (isset($row->Id) ? (int) $row->Id : 0)
- : (isset($row['Id']) ? (int) $row['Id'] : 0);
- $renderSource = is_object($row) && isset($row->rubric_id, $row->document_title)
- ? $row
- : $rowId;
- $item = $itemRenderer->render($renderSource, $request->request_template_item, '', $itemContext->forItem($item_num));
+ //if (UID == 1) Debug::_echo($rows, true);
+ foreach ($rows AS $row)
+ {
+ $x++;
+ $last_item = ($x == $items_count ? true : false);
+ $item_num = $x;
+ Debug::startTime('ELEMENT_' . $item_num);
- PublicProfiler::record(array('REQUESTS', $id, 'ELEMENTS', $item_num), Debug::endTime('ELEMENT_' . $item_num));
+ $rowId = is_object($row)
+ ? (isset($row->Id) ? (int) $row->Id : 0)
+ : (isset($row['Id']) ? (int) $row['Id'] : 0);
+ $renderSource = is_object($row) && isset($row->rubric_id, $row->document_title)
+ ? $row
+ : $rowId;
+ $item = $itemRenderer->render($renderSource, $request->request_template_item, '', $itemContext->forItem($item_num));
- $item = RequestItemRenderer::decorateSequence($item, $rowId, $item_num, $last_item);
- $items .= $item;
+ PublicProfiler::record(array('REQUESTS', $id, 'ELEMENTS', $item_num), Debug::endTime('ELEMENT_' . $item_num));
+
+ $item = RequestItemRenderer::decorateSequence($item, $rowId, $item_num, $last_item);
+ $items .= $item;
+ }
}
PublicProfiler::record(array('REQUESTS', $id, 'ELEMENTS', 'ALL'), Debug::endTime('ELEMENTS_ALL'));
diff --git a/system/App/Helpers/File.php b/system/App/Helpers/File.php
index f90665b..ad24504 100644
--- a/system/App/Helpers/File.php
+++ b/system/App/Helpers/File.php
@@ -110,6 +110,34 @@
}
+ /**
+ * Проверяет локальный публичный путь. Внешние HTTP(S)-адреса считаются доступными.
+ *
+ * @param string $path URL или путь относительно корня сайта
+ * @return bool
+ */
+ public static function publicExists ($path)
+ {
+ $path = trim((string) $path);
+ if ($path === '') {
+ return false;
+ }
+
+ if (preg_match('#^https?://#i', $path)) {
+ return true;
+ }
+
+ $urlPath = parse_url($path, PHP_URL_PATH);
+ $urlPath = is_string($urlPath) ? rawurldecode($urlPath) : '';
+ $urlPath = ltrim(str_replace('\\', '/', $urlPath), '/');
+ if ($urlPath === '' || strpos('/' . $urlPath . '/', '/../') !== false) {
+ return false;
+ }
+
+ return self::exists(rtrim(BASEPATH, '/\\') . '/' . $urlPath);
+ }
+
+
/**
* Удаляет файл или массив файлов.
*
diff --git a/system/App/Helpers/SearchText.php b/system/App/Helpers/SearchText.php
index 94015eb..25992b0 100644
--- a/system/App/Helpers/SearchText.php
+++ b/system/App/Helpers/SearchText.php
@@ -19,6 +19,15 @@
/** Text normalization used by the stored public search templates. */
class SearchText
{
+ public static function normalize($text, $maxLength = 190)
+ {
+ $text = preg_replace('/[\x00-\x1F\x7F]+/u', ' ', (string) $text);
+ $text = trim((string) preg_replace('/\s+/u', ' ', $text));
+ $maxLength = max(1, (int) $maxLength);
+
+ return mb_substr($text, 0, $maxLength, 'UTF-8');
+ }
+
public static function containsRussian($text)
{
$text = (string) $text;
@@ -46,4 +55,157 @@
'U' => 'У', 'Ya' => 'Я', 'YE' => 'Є', "'" => 'Ь', "''" => 'Ъ',
));
}
+
+ public static function toLatin($input)
+ {
+ return Locales::transliterate((string) $input);
+ }
+
+ /**
+ * Исправляет текст, набранный не в той раскладке клавиатуры.
+ *
+ * Это отдельный вариант от транслитерации: «ДБ-11» превращается в
+ * «DB-11» транслитерацией, а «ВИ-11» — сменой раскладки.
+ */
+ public static function switchKeyboardLayout($input)
+ {
+ $input = (string) $input;
+ if ($input === '') {
+ return '';
+ }
+
+ return strtr($input, self::containsRussian($input)
+ ? self::russianKeyboardMap()
+ : self::englishKeyboardMap());
+ }
+
+ /** Возвращает варианты фразы без изменения её смысла. */
+ public static function variants($text)
+ {
+ $text = self::normalize($text);
+ if ($text === '') {
+ return array();
+ }
+
+ $variants = array($text);
+ $variants[] = self::containsRussian($text) ? self::toLatin($text) : self::toRussian($text);
+
+ $keyboard = self::switchKeyboardLayout($text);
+ $variants[] = $keyboard;
+ if ($keyboard !== '') {
+ $variants[] = self::containsRussian($keyboard)
+ ? self::toLatin($keyboard)
+ : self::toRussian($keyboard);
+ }
+
+ return self::unique($variants);
+ }
+
+ /**
+ * Группы вариантов отдельных слов. Внутри группы действует OR,
+ * между группами поисковый слой может применять AND.
+ */
+ public static function termGroups($text, $limit = 8)
+ {
+ $text = self::normalize($text);
+ preg_match_all(
+ '/[\p{L}\p{N}]+(?:[-_.\/][\p{L}\p{N}]+)*/u',
+ $text,
+ $matches
+ );
+
+ $words = array_slice(array_values(array_unique(
+ isset($matches[0]) ? $matches[0] : array()
+ )), 0, max(1, (int) $limit));
+ $stemmer = new RussianStemmer();
+ $groups = array();
+ foreach ($words as $word) {
+ if (mb_strlen($word, 'UTF-8') < 2) {
+ continue;
+ }
+
+ $variants = self::variants($word);
+ foreach ($variants as $variant) {
+ if (!self::containsRussian($variant)) {
+ continue;
+ }
+
+ $stem = $stemmer->stemWord($variant);
+ if (mb_strlen($stem, 'UTF-8') >= 3) {
+ $variants[] = $stem;
+ }
+ }
+
+ $variants = array_slice(self::unique($variants), 0, 6);
+ if ($variants) {
+ $groups[] = $variants;
+ }
+ }
+
+ return $groups;
+ }
+
+ protected static function unique(array $values)
+ {
+ $result = array();
+ $seen = array();
+ foreach ($values as $value) {
+ $value = trim((string) $value);
+ if ($value === '') {
+ continue;
+ }
+
+ $key = mb_strtolower($value, 'UTF-8');
+ if (isset($seen[$key])) {
+ continue;
+ }
+
+ $seen[$key] = true;
+ $result[] = $value;
+ }
+
+ return $result;
+ }
+
+ protected static function englishKeyboardMap()
+ {
+ static $map = null;
+ if ($map !== null) {
+ return $map;
+ }
+
+ $map = self::keyboardMap(
+ 'qwertyuiop[]asdfghjkl;\'zxcvbnm,.',
+ 'йцукенгшщзхъфывапролджэячсмитьбю'
+ );
+
+ return $map;
+ }
+
+ protected static function russianKeyboardMap()
+ {
+ static $map = null;
+ if ($map === null) {
+ $map = array_flip(self::englishKeyboardMap());
+ }
+
+ return $map;
+ }
+
+ protected static function keyboardMap($from, $to)
+ {
+ $from = preg_split('//u', $from, -1, PREG_SPLIT_NO_EMPTY);
+ $to = preg_split('//u', $to, -1, PREG_SPLIT_NO_EMPTY);
+ $map = array_combine($from, $to);
+ foreach ($from as $index => $character) {
+ if (!preg_match('/\p{L}/u', $character)) {
+ continue;
+ }
+
+ $map[mb_strtoupper($character, 'UTF-8')]
+ = mb_strtoupper($to[$index], 'UTF-8');
+ }
+
+ return $map;
+ }
}
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 487c8ba..298514e 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -52,7 +52,7 @@
//-- Load classes - Content (контент-ядро: подсистема полей и т.д.)
Load::regNamespace('App\Content', BASEPATH . DS . 'system' . DS . 'App' . DS . 'Content' . DS);
- //-- Native public services are shared by Adminx where their contracts match.
+ //-- Native public services are shared by the control panel where their contracts match.
Load::regNamespace('App\Frontend', BASEPATH . DS . 'system' . DS . 'App' . DS . 'Frontend' . DS);
$config = App\Common\DatabaseConfiguration::all();
diff --git a/system/release.php b/system/release.php
index 885213c..e1eb128 100644
--- a/system/release.php
+++ b/system/release.php
@@ -17,5 +17,5 @@
return array(
'product' => 'AVE.cms',
'version' => '3.3',
- 'build' => '0.32',
+ 'build' => '0.35',
);
diff --git a/tmp/.htaccess b/tmp/.htaccess
deleted file mode 100644
index 14249c5..0000000
--- a/tmp/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/uploads/.htaccess b/uploads/.htaccess
deleted file mode 100644
index 644767d..0000000
--- a/uploads/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# Files in uploads are public static assets and must never be executable.
-Options -Indexes -ExecCGI
-
-
- RemoveHandler .php .php3 .php4 .php5 .php7 .php8 .phtml .phar .cgi .pl .py .rb .sh
- RemoveType .php .php3 .php4 .php5 .php7 .php8 .phtml .phar .cgi .pl .py .rb .sh
-
-
-
-
- Require all denied
-
-
- Order allow,deny
- Deny from all
-
-
-
-
-
- Header set Content-Security-Policy "sandbox; default-src 'none'; style-src 'unsafe-inline'"
- Header set Content-Disposition "attachment"
- Header set X-Content-Type-Options "nosniff"
-
-
-
-#Header set Cache-Control "max-age=7200, must-revalidate"
-
-
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule .(jpg|JPG|jpeg|JPEG|gif|GIF|png|PNG|webp|WEBP|bmp|BMP) /inc/thumb.php [QSA,L]
-
diff --git a/uploads/index.php b/uploads/index.php
deleted file mode 100644
index 9aa3ce5..0000000
--- a/uploads/index.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- | @copyright 2007-2026 (c) AVE.cms
- | @link https://ave-cms.ru
- | @version 3.3
- */
-
- /**
- * Файл-заглушка, предназначенный для запрета показа списка файлов в текущей директории,
- * если через адресную строку браузера было прямое общращение к данной директории.
- */
- header('Location:/');
- exit;
- ?>