diff --git a/admin/templates/documents/form.tpl b/admin/templates/documents/form.tpl
index 168997e..426eb8c 100644
--- a/admin/templates/documents/form.tpl
+++ b/admin/templates/documents/form.tpl
@@ -466,6 +466,13 @@ $(document).ready(function(){ldelim}
+ {if $document->count_groups > 1}
+
+
+ {/if}
{if $document->fields}
{foreach from=$document->fields item=document_field_group}
diff --git a/fields/code_large/field.php b/fields/code_large/field.php
index 001e7d3..2bc301d 100644
--- a/fields/code_large/field.php
+++ b/fields/code_large/field.php
@@ -12,7 +12,7 @@
*/
// Код (Codemirror)
- function get_field_code ($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength='', $document_fields=array(), $rubric_id=0, $default='', $_tpl=null)
+ function get_field_code_large ($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength='', $document_fields=array(), $rubric_id=0, $default='', $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/code_small/field.php b/fields/code_small/field.php
index 62553de..e3b39d1 100644
--- a/fields/code_small/field.php
+++ b/fields/code_small/field.php
@@ -12,7 +12,7 @@
*/
// Код (Codemirror)
- function get_field_code_small ($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength='', $document_fields=array(), $rubric_id=0, $default='', $_tpl=null)
+ function get_field_code_small($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength='', $document_fields=array(), $rubric_id=0, $default='', $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/date_unix_time/field.php b/fields/date_unix_time/field.php
index b59675e..90acf79 100644
--- a/fields/date_unix_time/field.php
+++ b/fields/date_unix_time/field.php
@@ -12,7 +12,7 @@
*/
// Дата (TimeStamp)
- function get_field_date($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_date_unix_time($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/doc_from_rub_list/field.php b/fields/doc_from_rub_list/field.php
index c8a4b0e..3a40673 100644
--- a/fields/doc_from_rub_list/field.php
+++ b/fields/doc_from_rub_list/field.php
@@ -12,7 +12,7 @@
*/
// Документ из рубрики
- function get_field_doc_from_rub_all($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_doc_from_rub_list($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_DB, $AVE_Template;
diff --git a/fields/doc_from_rub_tree/field.php b/fields/doc_from_rub_tree/field.php
index fc50761..d084c77 100644
--- a/fields/doc_from_rub_tree/field.php
+++ b/fields/doc_from_rub_tree/field.php
@@ -12,7 +12,7 @@
*/
// Документ из рубрики
- function get_field_doc_from_rub($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_doc_from_rub_tree($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_DB, $AVE_Template;
diff --git a/fields/doc_link/field.php b/fields/doc_link/field.php
index 0ab8bfa..3f315d2 100644
--- a/fields/doc_link/field.php
+++ b/fields/doc_link/field.php
@@ -12,7 +12,7 @@
*/
// Ссылка
- function get_field_link($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_doc_link($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/docrubtizer/field.php b/fields/docrubtizer/field.php
index 56b6732..e836f98 100644
--- a/fields/docrubtizer/field.php
+++ b/fields/docrubtizer/field.php
@@ -2,7 +2,7 @@
/**
* Teasers
*/
- function get_field_teasers($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength = '', $doc_fields=array(), $rubric_id=0, $default='', $_tpl=null)
+ function get_field_docrubtizer($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength = '', $doc_fields=array(), $rubric_id=0, $default='', $_tpl=null)
{
global $AVE_DB, $AVE_Template;
diff --git a/fields/download_file_button/field.php b/fields/download_file_button/field.php
index 2077aff..b25aac7 100644
--- a/fields/download_file_button/field.php
+++ b/fields/download_file_button/field.php
@@ -12,7 +12,7 @@
*/
// Загрузить файл
- function get_field_download($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null){
+ function get_field_download_file_button($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null){
global $AVE_Template;
diff --git a/fields/image_cascade/field.php b/fields/image_cascade/field.php
index fd60e03..5d2e78e 100644
--- a/fields/image_cascade/field.php
+++ b/fields/image_cascade/field.php
@@ -12,7 +12,7 @@
*/
// Изображение (Каскад)
- function get_field_image_multi($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_image_cascade($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template, $img_pixel;
diff --git a/fields/multi_line_large/field.php b/fields/multi_line_large/field.php
index 23e99db..bc09670 100644
--- a/fields/multi_line_large/field.php
+++ b/fields/multi_line_large/field.php
@@ -12,7 +12,7 @@
*/
// Многострочное
- function get_field_multi_line($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl = null)
+ function get_field_multi_line_large($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl = null)
{
global $AVE_Template;
diff --git a/fields/multi_line_medium/field.php b/fields/multi_line_medium/field.php
index b150b81..5be400d 100644
--- a/fields/multi_line_medium/field.php
+++ b/fields/multi_line_medium/field.php
@@ -12,7 +12,7 @@
*/
// Многострочное (Упрощенное)
- function get_field_multi_line_simple($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_multi_line_medium($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/multi_line_small/field.php b/fields/multi_line_small/field.php
index fd0b81e..be509ea 100644
--- a/fields/multi_line_small/field.php
+++ b/fields/multi_line_small/field.php
@@ -12,7 +12,7 @@
*/
// Многострочное (Слим)
- function get_field_multi_line_slim($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_multi_line_small($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/multi_links_three_parameter/field.php b/fields/multi_links_three_parameter/field.php
index 11e9c2e..c433945 100644
--- a/fields/multi_links_three_parameter/field.php
+++ b/fields/multi_links_three_parameter/field.php
@@ -12,7 +12,7 @@
*/
- function get_field_doc_files($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null){
+ function get_field_multi_links_three_parameter($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null){
global $AVE_Template;
@@ -47,13 +47,13 @@
if (is_string($v)) {
$list_item = explode('|', $v);
- // ✅ ИСПРАВЛЕНИЕ КАВЫЧЕК: Декодируем сущности из БД, затем экранируем для HTML (но без одинарных кавычек)
+ // ИСПРАВЛЕНИЕ КАВЫЧЕК: Декодируем сущности из БД, затем экранируем для HTML (но без одинарных кавычек)
$list[$k]['name'] = (isset($list_item[0])) ? htmlspecialchars(html_entity_decode($list_item[0], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['descr'] = (isset($list_item[1])) ? htmlspecialchars(html_entity_decode($list_item[1], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['url'] = (isset($list_item[2])) ? htmlspecialchars(html_entity_decode($list_item[2], ENT_QUOTES), ENT_NOQUOTES) : '';
} else {
// Если данные приходят в виде ассоциативного массива (новый формат)
- // ✅ ИСПРАВЛЕНИЕ КАВЫЧЕК
+ // ИСПРАВЛЕНИЕ КАВЫЧЕК
$list[$k]['name'] = (isset($v['name'])) ? htmlspecialchars(html_entity_decode($v['name'], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['descr'] = (isset($v['descr'])) ? htmlspecialchars(html_entity_decode($v['descr'], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['url'] = (isset($v['url'])) ? htmlspecialchars(html_entity_decode($v['url'], ENT_QUOTES), ENT_NOQUOTES) : '';
@@ -70,7 +70,7 @@
{
$list_item = explode('|', $v);
- // ✅ ИСПРАВЛЕНИЕ КАВЫЧЕК
+ // ИСПРАВЛЕНИЕ КАВЫЧЕК
$list[$k]['name'] = (isset($list_item[0])) ? htmlspecialchars(html_entity_decode($list_item[0], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['descr'] = (isset($list_item[1])) ? htmlspecialchars(html_entity_decode($list_item[1], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['url'] = (isset($list_item[2])) ? htmlspecialchars(html_entity_decode($list_item[2], ENT_QUOTES), ENT_NOQUOTES) : '';
@@ -235,7 +235,7 @@
if (!empty($field_value_new))
{
$serialized_value = @serialize($field_value_new);
- // ✅ ИСПРАВЛЕНИЕ SQL-ОШИБКИ: Экранируем сериализованные данные для корректной вставки в базу данных
+ // Экранируем сериализованные данные для корректной вставки в базу данных
return addslashes($serialized_value);
}
else
@@ -259,13 +259,13 @@
if (is_string($v)) {
$list_item = explode('|', $v);
- // ✅ ИСПРАВЛЕНИЕ КАВЫЧЕК
+ // ИСПРАВЛЕНИЕ КАВЫЧЕК
$list[$k]['name'] = (isset($list_item[0])) ? htmlspecialchars(html_entity_decode($list_item[0], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['descr'] = (isset($list_item[1])) ? htmlspecialchars(html_entity_decode($list_item[1], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['url'] = (isset($list_item[2])) ? htmlspecialchars(html_entity_decode($list_item[2], ENT_QUOTES), ENT_NOQUOTES) : '';
} else {
// Если данные приходят в виде ассоциативного массива (новый формат)
- // ✅ ИСПРАВЛЕНИЕ КАВЫЧЕК
+ // ИСПРАВЛЕНИЕ КАВЫЧЕК
$list[$k]['name'] = (isset($v['name'])) ? htmlspecialchars(html_entity_decode($v['name'], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['descr'] = (isset($v['descr'])) ? htmlspecialchars(html_entity_decode($v['descr'], ENT_QUOTES), ENT_NOQUOTES) : '';
$list[$k]['url'] = (isset($v['url'])) ? htmlspecialchars(html_entity_decode($v['url'], ENT_QUOTES), ENT_NOQUOTES) : '';
diff --git a/fields/multi_links_two_parameter/field.php b/fields/multi_links_two_parameter/field.php
index a79f0a5..c6cd8b0 100644
--- a/fields/multi_links_two_parameter/field.php
+++ b/fields/multi_links_two_parameter/field.php
@@ -13,7 +13,7 @@
// Мульти лист
-function get_field_multi_links($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null){
+function get_field_multi_links_two_parameter($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null){
global $AVE_Template;
global $AVE_DB;
diff --git a/fields/multi_list_one_parameter/field.php b/fields/multi_list_one_parameter/field.php
index 24cec78..b6ad3b0 100644
--- a/fields/multi_list_one_parameter/field.php
+++ b/fields/multi_list_one_parameter/field.php
@@ -11,10 +11,10 @@
*/
// Мульти лист
- function get_field_multi_list_single($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_multi_list_one_parameter($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
- global $AVE_DB; // Объявляем глобальный объект базы данных, если он нужен для других полей
+ global $AVE_DB;
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
diff --git a/fields/multi_list_three_parameter/field.php b/fields/multi_list_three_parameter/field.php
index 89e9bf2..acfed4e 100644
--- a/fields/multi_list_three_parameter/field.php
+++ b/fields/multi_list_three_parameter/field.php
@@ -11,7 +11,7 @@
*/
// Мульти лист
- function get_field_multi_list_triple($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_multi_list_three_parameter($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
global $AVE_DB;
diff --git a/fields/multi_list_two_parameter/field.php b/fields/multi_list_two_parameter/field.php
index bab3472..8b700b9 100644
--- a/fields/multi_list_two_parameter/field.php
+++ b/fields/multi_list_two_parameter/field.php
@@ -12,7 +12,7 @@
*/
// Мульти лист
- function get_field_multi_list($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
+ function get_field_multi_list_two_parameter($field_value, $action, $field_id=0, $tpl='', $tpl_empty=0, &$maxlength=null, $document_fields=array(), $rubric_id=0, $default=null, $_tpl=null)
{
global $AVE_Template;
global $AVE_DB;
diff --git a/fields/rubrics_templates_id/field.php b/fields/rubrics_templates_id/field.php
index e4a777a..79b929e 100644
--- a/fields/rubrics_templates_id/field.php
+++ b/fields/rubrics_templates_id/field.php
@@ -12,7 +12,7 @@
*/
// Шаблоны рубрик
-function get_field_rubrics($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null)
+function get_field_rubrics_templates_id($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null)
{
global $AVE_DB, $AVE_Template;
diff --git a/fields/single_line_numeric_one/field.php b/fields/single_line_numeric_one/field.php
index 5f7e96b..9f5d5a2 100644
--- a/fields/single_line_numeric_one/field.php
+++ b/fields/single_line_numeric_one/field.php
@@ -12,7 +12,7 @@
*/
// Однострочное числовое
- function get_field_single_line_numeric ($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
+ function get_field_single_line_numeric_one($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
{
global $AVE_Template;
diff --git a/fields/single_line_numeric_three/field.php b/fields/single_line_numeric_three/field.php
index 4dd2828..9087a73 100644
--- a/fields/single_line_numeric_three/field.php
+++ b/fields/single_line_numeric_three/field.php
@@ -12,7 +12,7 @@
*/
// Однострочное числовое (Три значения)
- function get_field_single_line_numeric_three ($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl=null)
+ function get_field_single_line_numeric_three($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl=null)
{
global $AVE_Template;
diff --git a/fields/single_line_string/field.php b/fields/single_line_string/field.php
index 1c6246b..ee94e43 100644
--- a/fields/single_line_string/field.php
+++ b/fields/single_line_string/field.php
@@ -12,7 +12,7 @@
*/
// Однострочное
- function get_field_single_line ($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
+ function get_field_single_line_string($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
{
global $AVE_Template;
diff --git a/fields/tags/field.php b/fields/tags/field.php
index bf58cb7..12ab8d0 100644
--- a/fields/tags/field.php
+++ b/fields/tags/field.php
@@ -12,7 +12,7 @@
*/
// Tags
- function get_field_tags ($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
+ function get_field_tags($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl = null)
{
global $AVE_DB, $AVE_Template;
diff --git a/fields/youtube_video/field.php b/fields/youtube_video/field.php
index 70b5651..bc0f5c9 100644
--- a/fields/youtube_video/field.php
+++ b/fields/youtube_video/field.php
@@ -24,7 +24,7 @@
*/
// YouTube
- function get_field_youtube($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl=null)
+ function get_field_youtube_video($field_value, $action, $field_id = 0, $tpl = '', $tpl_empty = 0, &$maxlength = null, $document_fields = array(), $rubric_id = 0, $default = null, $_tpl=null)
{
global $AVE_Template;
diff --git a/install/data_base.sql b/install/data_base.sql
index 87b3151..a13a5b9 100644
--- a/install/data_base.sql
+++ b/install/data_base.sql
@@ -254,8 +254,8 @@ INSERT INTO `%%PRFX%%_navigation_items` VALUES
(1,1,1,'/','Главная','','_self','','','','','0','1','0','1');#inst#
INSERT INTO `%%PRFX%%_rubric_fields` VALUES
- (1, 1, 0, 'header', 'Заголовок', 'single_line', '0', '1', '', '0', '', '', ''),
- (2, 1, 0, 'text', 'Текст', 'multi_line', '0', '2', '', '0', '', '', '');#inst#
+ (1, 1, 0, 'header', 'Заголовок', 'single_line_string', '0', '1', '', '0', '', '', ''),
+ (2, 1, 0, 'text', 'Текст', 'multi_line_large', '0', '2', '', '0', '', '', '');#inst#
INSERT INTO `%%PRFX%%_rubric_permissions` VALUES
(1, 1, 1, 'alles'),