ave-cms-team/ave-cms-alt
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

работа с полями Мультилист (1,2,3) - фиксы + исправления. кавычки.

Browse Source
This commit is contained in:
Repellent
2025-11-26 17:26:37 +05:00
parent 4c57540d18
commit a1712b32c9
5 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fields/multi_list/field.php
View File

@@ -15,9 +15,10 @@
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)
{
global $AVE_Template;
global $AVE_DB;
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_name = basename($fld_dir);
$lang_file = $fld_dir . 'lang/' . (defined('ACP') ? $_SESSION['admin_language'] : $_SESSION['user_language']) . '.txt';
@@ -34,7 +35,7 @@
$items = array();
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -42,8 +43,8 @@
foreach($items as $k => $v){
$list_item = explode('|', $v);
$list[$k]['param'] = (isset($list_item[0])) ? htmlspecialchars($list_item[0], ENT_QUOTES) : '';
$list[$k]['value'] = (isset($list_item[1])) ? htmlspecialchars($list_item[1], ENT_QUOTES) : '';
$list[$k]['param'] = (isset($list_item[0])) ? $list_item[0] : '';
$list[$k]['value'] = (isset($list_item[1])) ? $list_item[1] : '';
}
$items = $list;
@@ -55,13 +56,14 @@
foreach($items as $k => $v){
$list_item = explode('|', $v);
$list[$k]['param'] = (isset($list_item[0])) ? htmlspecialchars($list_item[0], ENT_QUOTES) : '';
$list[$k]['value'] = (isset($list_item[1])) ? htmlspecialchars($list_item[1], ENT_QUOTES) : '';
$list[$k]['param'] = (isset($list_item[0])) ? $list_item[0] : '';
$list[$k]['value'] = (isset($list_item[1])) ? $list_item[1] : '';
}
$items = $list;
}
$AVE_Template->assign('doc_id', $_REQUEST['Id']);
// NOTE: Проверил, здесь нет невидимого символа, как вы прислали в последнем сообщении
$AVE_Template->assign('doc_id', $_REQUEST['Id']);
$AVE_Template->assign('field_dir', $fld_name);
$AVE_Template->assign('items', $items);
$AVE_Template->assign('field_id', $field_id);
@@ -72,7 +74,8 @@
break;
case 'doc':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -119,7 +122,8 @@
break;
case 'req':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -170,13 +174,18 @@
{
if(! empty($v['param']))
{
$field_value_new[] = $v['param'] . ($v['value'] ? '|' . $v['value'] : '');
$param_safe = stripslashes(trim($v['param']));
$value_safe = stripslashes(trim($v['value']));
$field_value_new[] = $param_safe . ($value_safe ? '|' . $value_safe : '');
}
}
if (isset($field_value_new))
{
return @serialize($field_value_new);
$serialized_value = @serialize($field_value_new);
return addslashes($serialized_value);
}
else
{
@@ -188,7 +197,7 @@
if (empty($field_value))
return $field_value;
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{

25
fields/multi_list_single/field.php
View File

@@ -14,9 +14,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)
{
global $AVE_Template;
global $AVE_DB; // Объявляем глобальный объект базы данных, если он нужен для других полей
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_name = basename($fld_dir);
$lang_file = $fld_dir . 'lang/' . (defined('ACP') ? $_SESSION['admin_language'] : $_SESSION['user_language']) . '.txt';
@@ -33,11 +34,13 @@
$items = array();
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
$items = $items;
foreach($items as $k => $v){
$items[$k] = $v;
}
}
else
{
@@ -55,7 +58,8 @@
break;
case 'doc':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -102,7 +106,8 @@
break;
case 'req':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -153,13 +158,15 @@
{
if (! empty($v))
{
$field_value_new[] = $v;
$field_value_new[] = stripslashes($v);
}
}
if (isset($field_value_new))
{
return @serialize($field_value_new);
$serialized_value = @serialize($field_value_new);
return addslashes($serialized_value);
}
else
{
@@ -171,7 +178,7 @@
if (empty($field_value))
return $field_value;
return unserialize($field_value);
return @unserialize($field_value);
break;
case 'name':

2
fields/multi_list_single/tpl/field.tpl
View File

@@ -1,6 +1,6 @@
{if $multi_list_single != 'load'}
{assign var=multi_list_single value='' scope="global"}
{if $smarty.request.outside}
{if isset($smarty.request.outside) && $smarty.request.outside}
<script src="{$ABS_PATH}fields/{$field_dir}/js/outside.js" type="text/javascript"></script>
{else}
<script src="{$ABS_PATH}fields/{$field_dir}/js/field.js" type="text/javascript"></script>

37
fields/multi_list_triple/field.php
View File

@@ -14,9 +14,10 @@
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)
{
global $AVE_Template;
global $AVE_DB;
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_dir = dirname(__FILE__) . '/';
$tpl_dir = $fld_dir . 'tpl/';
$fld_name = basename($fld_dir);
$lang_file = $fld_dir . 'lang/' . (defined('ACP') ? $_SESSION['admin_language'] : $_SESSION['user_language']) . '.txt';
@@ -33,7 +34,7 @@
$items = array();
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -42,9 +43,9 @@
{
$list_item = explode('|', $v);
$list[$k]['param'] = (isset($list_item[0])) ? htmlspecialchars($list_item[0], ENT_QUOTES) : '';
$list[$k]['value'] = (isset($list_item[1])) ? htmlspecialchars($list_item[1], ENT_QUOTES) : '';
$list[$k]['value2'] = (isset($list_item[2])) ? htmlspecialchars($list_item[2], ENT_QUOTES) : '';
$list[$k]['param'] = (isset($list_item[0])) ? $list_item[0] : '';
$list[$k]['value'] = (isset($list_item[1])) ? $list_item[1] : '';
$list[$k]['value2'] = (isset($list_item[2])) ? $list_item[2] : '';
}
$items = $list;
@@ -58,9 +59,9 @@
{
$list_item = explode('|', $v);
$list[$k]['param'] = (isset($list_item[0])) ? htmlspecialchars($list_item[0], ENT_QUOTES) : '';
$list[$k]['value'] = (isset($list_item[1])) ? htmlspecialchars($list_item[1], ENT_QUOTES) : '';
$list[$k]['value2'] = (isset($list_item[2])) ? htmlspecialchars($list_item[2], ENT_QUOTES) : '';
$list[$k]['param'] = (isset($list_item[0])) ? $list_item[0] : '';
$list[$k]['value'] = (isset($list_item[1])) ? $list_item[1] : '';
$list[$k]['value2'] = (isset($list_item[2])) ? $list_item[2] : '';
}
$items = $list;
@@ -77,7 +78,8 @@
break;
case 'doc':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -124,7 +126,8 @@
break;
case 'req':
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{
@@ -175,13 +178,19 @@
{
if(!empty($v['param']))
{
$field_value_new[] = $v['param'] . '|' . $v['value'] . '|' . $v['value2'];
$param_safe = stripslashes(trim($v['param']));
$value_safe = stripslashes(trim($v['value']));
$value2_safe = stripslashes(trim($v['value2']));
$field_value_new[] = $param_safe . '|' . $value_safe . '|' . $value2_safe;
}
}
if (isset($field_value_new))
{
return @serialize($field_value_new);
$serialized_value = @serialize($field_value_new);
return addslashes($serialized_value);
}
else
{
@@ -193,7 +202,7 @@
if (empty($field_value))
return $field_value;
$items = unserialize($field_value);
$items = (trim($field_value) !== '') ? @unserialize($field_value) : [];
if ($items != false)
{

2
fields/multi_list_triple/tpl/field.tpl
View File

@@ -1,6 +1,6 @@
{if $multi_list_triple != 'load'}
{assign var=multi_list_triple value='' scope="global"}
{if $smarty.request.outside}
{if isset($smarty.request.outside) && $smarty.request.outside}
<script src="{$ABS_PATH}fields/{$field_dir}/js/outside.js" type="text/javascript"></script>
{else}
<script src="{$ABS_PATH}fields/{$field_dir}/js/field.js" type="text/javascript"></script>