ave-cms-team/ave-cms
2
0
Fork 0
mirror of https://github.com/avecms/AVE.cms.git synced 2025-01-22 07:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
M@dD3n 2019-08-29 13:12:11 +03:00
parent e408e21ae7
commit e2a35c89a6
6 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
class/class.core.php
View File

@ -784,7 +784,7 @@
return false;
$cache['id'] = (int)$cache['id'];
$cache['id'] = 'documents/compiled/' . (floor($cache['id'] / 1000)) . '/' . $cache['id'];
$cache['id'] = 'documents/' . (floor($cache['id'] / 1000)) . '/' . $cache['id'];
$cache['file'] = $this->_get_cache_hash() . '.compiled';
@ -1771,7 +1771,7 @@
else
$AVE_DB->clearCacheUrl('url_' . $hash_url);
$this->curentdoc = $AVE_DB->Query($sql, $cache_time, 'url_' . $hash_url, true, '.fetch')->FetchRow();
$this->curentdoc = $AVE_DB->Query($sql, $cache_time, 'url_' . $hash_url, true, '.url')->FetchRow();
if ($this->curentdoc)
{
@ -1803,7 +1803,7 @@
rub.Id = '" . $this->curentdoc->rubric_id . "'
";
$query = $AVE_DB->Query($sql, $cache_time, 'rub_' . $this->curentdoc->rubric_id, true, '.fetch')->FetchRow();
$query = $AVE_DB->Query($sql, $cache_time, 'rub_' . $this->curentdoc->rubric_id, true, '.rubric')->FetchRow();
$this->curentdoc = (object) array_merge((array) $query, (array) $this->curentdoc);

8
class/class.database.php
View File

@ -784,21 +784,21 @@
if (substr($cache_id, 0, 3) == 'dat')
{
$cache_id = (int)str_replace('dat_', '', $cache_id);
return $cache_id = 'documents/data/' . (floor($cache_id / 1000)) . '/' . $cache_id;
return $cache_id = 'documents/' . (floor($cache_id / 1000)) . '/' . $cache_id;
}
//-- Если это скомпилированный шаблон документа, то меняем расположение
if (substr($cache_id, 0, 3) == 'cmd')
{
$cache_id = (int)str_replace('cmd_', '', $cache_id);
return $cache_id = 'documents/compiled/' . (floor($cache_id / 1000)) . '/' . $cache_id;
return $cache_id = 'documents/' . (floor($cache_id / 1000)) . '/' . $cache_id;
}
//-- Если это поля документа, то меняем расположение
if (substr($cache_id, 0, 3) == 'fld')
{
$cache_id = (int)str_replace('fld_', '', $cache_id);
return $cache_id = 'documents/fields/' . (floor($cache_id / 1000)) . '/' . $cache_id;
return $cache_id = 'documents/' . (floor($cache_id / 1000)) . '/' . $cache_id;
}
//-- Сборка страницы
@ -812,7 +812,7 @@
if (substr($cache_id, 0, 3) == 'brd')
{
$cache_id = (int)str_replace('brd_', '', $cache_id);
return $cache_id = 'documents/breadcrumbs/' . (floor($cache_id / 1000)) . '/' . $cache_id;
return $cache_id = 'documents/' . (floor($cache_id / 1000)) . '/' . $cache_id;
}
//-- Если это рубрика, то меняем расположение

2
fields/multi_links/field.php
View File

@ -1,4 +1,4 @@
<?
<?php
/**
* AVE.cms

2
fields/rubrics/field.php
View File

@ -1,4 +1,4 @@
<?
<?php
/**
* AVE.cms

11
functions/func.fields.php
View File

@ -406,11 +406,14 @@
* @internal param int $id id документа
* @return mixed
*/
function get_document_fields ($document_id, $values = null)
function get_document_fields ($document_id, $values = null, $static = true)
{
global $AVE_DB, $AVE_Core; //$request_documents
static $document_fields = array();
if ($static)
static $document_fields = [];
else
$document_fields = [];
if (! is_numeric($document_id))
return false;
@ -450,7 +453,7 @@
" . $where;
$cache_id = (int)$AVE_Core->curentdoc->Id;
$cache_id = 'documents/fields/' . (floor($cache_id / 1000)) . '/' . $cache_id;
$cache_id = 'documents/' . (floor($cache_id / 1000)) . '/' . $cache_id;
$cache_file = md5($query) . '.fields';
@ -487,7 +490,7 @@
$row['field_value'] = (string)$row['field_value'] . (string)$row['field_value_more'];
if ($values)
$row['field_value']=(isset($values[$row['rubric_field_id']]) ? $values[$row['rubric_field_id']] : $row['field_value']);
$row['field_value'] = (isset($values[$row['rubric_field_id']]) ? $values[$row['rubric_field_id']] : $row['field_value']);
if ($row['field_value'] === '')
{

94
lib/debug/debug.js
View File

@ -1,35 +1,77 @@
$(document).ready(function() {
var Debug = {
$('#debug_btn').on('click', function() {
initialized: false,
$bar = $('#debug_bar');
init: function () {
if ($bar.css('display') == 'none') {
$(document.body).css('overflow', 'hidden');
$bar.show();
} else {
$(document.body).css('overflow', '');
$bar.hide();
}
if (this.initialized)
return;
});
this.initialized = true;
$('.debug_tabs > li').on('click', function() {
$('.debug_tabs > li').removeClass('selected');
$('.debug_tab').hide();
$(this).addClass('selected');
$('#'+this.id+'-cont').show();
if($.cookie){
$.cookie('__debug_bar', this.id, {expires: 7, path: '/'});
}
});
this.build();
this.events();
},
if($.cookie){
var id = $.cookie('__debug_bar');
var tab = $('.debug_tabs > li#'+id);
if(tab.length > 0){
tab.click();
build: function () {
this.debugCookie();
},
events: function () {
this.debugButton();
this.debugTabs();
},
debugButton: function () {
$('#debug_btn').on('click', function(event) {
event.preventDefault();
$bar = $('#debug_bar');
if ($bar.css('display') == 'none') {
$(document.body).css('overflow', 'hidden');
$bar.show();
} else {
$(document.body).css('overflow', 'inherit');
$bar.hide();
}
});
},
debugTabs: function () {
$('.debug_tabs > li').on('click', function(event) {
event.preventDefault();
$('.debug_tabs > li').removeClass('selected');
$('.debug_tab').hide();
$(this).addClass('selected');
$('#' + this.id + '-cont').show();
if ($.cookie) {
$.cookie('__debug_bar', this.id, {expires: 7, path: '/'});
}
});
},
debugCookie: function () {
if ($.cookie) {
var id = $.cookie('__debug_bar');
var tab = $('.debug_tabs > li#' + id);
if (tab.length > 0) {
tab.click();
}
}
}
};
}); //document.ready
$(document).ready(function() {
Debug.init();
});