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

fix +++

Browse Source
This commit is contained in:
Repellent
2025-11-28 21:33:10 +05:00
parent f40b08e49a
commit 92f33d5451
2 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/templates/documents/form.tpl
View File

@@ -358,7 +358,7 @@ $(document).ready(function(){ldelim}
<select style="width: 400px;" name="rubric_tmpl_id" id="rubric_tmpl_id">
<option value="0" {if $smarty.request.action == 'new'}selected="selected"{/if}>{#DOC_TEMPLATE_DEFAULT#}</option>
{foreach from=$rubric_tmpls item=tmpl}
<option value="{$tmpl->id}"{if $document->rubric_tmpl_id == $tmpl->id}selected="selected"{/if}>{$tmpl->title}</option>
<option value="{$tmpl->id}"{if $document->rubric_tmpl_id|default:0 == $tmpl->id}selected="selected"{/if}>{$tmpl->title}</option>
{/foreach}
</select>
<div class="fix"></div>

85
fields/docrubtizer/field.php
View File

@@ -5,9 +5,9 @@
function get_field_teasers($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;
$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';
@@ -22,7 +22,7 @@
$items = array();
$items = unserialize($field_value);
$items = @unserialize($field_value);
if($items != false){
@@ -64,8 +64,9 @@
break;
case 'doc':
$items = (isset($field_value))
? unserialize($field_value)
? @unserialize($field_value)
: array();
$res = array();
@@ -76,7 +77,7 @@
{
$item = explode('|', $item);
if ($item[1])
if (isset($item[1]) && $item[1])
$res[] = showteaser($item[1]);
}
}
@@ -92,7 +93,8 @@
case 'api' :
if (! empty($field_value))
return unserialize($field_value);
return @unserialize($field_value);
return $field_value;
break;
@@ -103,52 +105,65 @@
case 'search':
if (!isset($_REQUEST['q']) || !isset($_REQUEST['rubric_id'])) {
echo json_encode([]);
exit;
}
$search_query = addslashes($_REQUEST['q']);
$rubric_id = (int)$_REQUEST['rubric_id'];
$field_default = explode(',', $default);
// ✅ ИСПРАВЛЕНИЕ: Безопасная проверка существования ключей [0] и [1]
$use_field_0 = isset($field_default[0]) && $field_default[0];
$use_field_1 = isset($field_default[1]) && $field_default[1];
$use_field_0 = isset($field_default[0]) && (int)$field_default[0];
$use_field_1 = isset($field_default[1]) && (int)$field_default[1];
$zap_1 = ($use_field_0) ? ',' : '';
$zap_1 = ($use_field_0 || $use_field_1) ? ',' : '';
$zap_2 = ($use_field_0 && $use_field_1) ? ',' : '';
$select_fields = [];
if ($use_field_0) {
$select_fields[] = 'b.field_value as b1';
}
if ($use_field_1) {
$select_fields[] = 'c.field_value as c1';
}
$select_clause = (!empty($select_fields)) ? ',' . implode(',', $select_fields) : '';
$sel_1 = ($use_field_0) ? 'b.field_value as b1' : '';
$sel_2 = ($use_field_1) ? 'c.field_value as c1' : '';
$from_fields = [];
if ($use_field_0) {
$from_fields[] = PREFIX . '_document_fields b';
}
if ($use_field_1) {
$from_fields[] = PREFIX . '_document_fields c';
}
$from_clause = (!empty($from_fields)) ? ',' . implode(',', $from_fields) : '';
$from_1 = ($use_field_0) ? PREFIX . '_document_fields b' : '';
$from_2 = ($use_field_1) ? PREFIX . '_document_fields c' : '';
$search_1 = ($use_field_0) ? "AND (b.document_id=a.Id AND b.rubric_field_id = " . $field_default[0] . ")" : '';
$search_2 = ($use_field_1) ? "AND (c.document_id=a.Id AND c.rubric_field_id = " . $field_default[1] . ")" : '';
$search_1 = ($use_field_0) ? "AND (b.document_id=a.Id AND b.rubric_field_id = " . (int)$field_default[0] . ")" : '';
$search_2 = ($use_field_1) ? "AND (c.document_id=a.Id AND c.rubric_field_id = " . (int)$field_default[1] . ")" : '';
$or_1 = ($use_field_0) ? "OR (UPPER(b.field_value) LIKE UPPER('%" . $_REQUEST['q'] . "%'))" : '';
$or_2 = ($use_field_1) ? "OR (UPPER(c.field_value) LIKE UPPER('%" . $_REQUEST['q'] . "%'))" : '';
$or_1 = ($use_field_0) ? "OR (UPPER(b.field_value) LIKE UPPER('%" . $search_query . "%'))" : '';
$or_2 = ($use_field_1) ? "OR (UPPER(c.field_value) LIKE UPPER('%" . $search_query . "%'))" : '';
$sql = $AVE_DB->Query("
$sql = $AVE_DB->Query("
SELECT
a.Id,
a.document_title
$zap_1
$sel_1
$zap_2
$sel_2
{$select_clause}
FROM
" . PREFIX . "_documents a
$zap_1
" . $from_1 . "
$zap_2
" . $from_2 . "
{$from_clause}
WHERE
a.rubric_id = '" . $_REQUEST['rubric_id'] . "'
AND
/* a.rubric_id = '" . $rubric_id . "'
AND */
a.document_status = 1
" . $search_1 . "
" . $search_2 . "
AND
(
(UPPER(document_title) LIKE UPPER('%" . $_REQUEST['q'] . "%'))
$or_1
$or_2
(UPPER(document_title) LIKE UPPER('%" . $search_query . "%'))
" . $or_1 . "
" . $or_2 . "
)
GROUP BY a.Id
LIMIT 0,5
@@ -161,8 +176,8 @@ case 'search':
$doc_finded[] = array(
'doc_id' => $row->Id,
'doc_title' => $row->document_title,
'doc_name' => (($use_field_0) ? $row->b1 : $row->document_title),
'doc_article' => (($use_field_1) ? $row->c1 : '')
'doc_name' => (($use_field_0) ? (isset($row->b1) ? $row->b1 : '') : $row->document_title),
'doc_article' => (($use_field_1) ? (isset($row->c1) ? $row->c1 : '') : '')
);
}