From 3a9e3a73af8a595c0ade48a077931fa7f8a6a916 Mon Sep 17 00:00:00 2001
From: merelendor
diff --git a/bitrix/php_interface/init.php b/bitrix/php_interface/init.php
index 03c9a5e..d9acc7c 100644
--- a/bitrix/php_interface/init.php
+++ b/bitrix/php_interface/init.php
@@ -119,6 +119,8 @@ class HttpExceptionHandlerOutput extends \Bitrix\Main\Diag\HttpExceptionHandlerO
include($_SERVER["DOCUMENT_ROOT"] . "/local/templates/500/header.php");
include $_SERVER['DOCUMENT_ROOT'] . '/500.php';
include($_SERVER["DOCUMENT_ROOT"] . "/local/templates/500/footer.php");
+
+ CHTTP::SetStatus("500 Internal Server Error");
}
}
}
diff --git a/local/components/evolution/catalog/component.php b/local/components/evolution/catalog/component.php
index 3913d1a..1d073db 100644
--- a/local/components/evolution/catalog/component.php
+++ b/local/components/evolution/catalog/component.php
@@ -23,6 +23,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(CModule::IncludeModule('iblock'))
{
$breadcrumbs = [];
+ $canonical = [];
$arResult = [
'SELECTED' => [],
@@ -112,6 +113,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
"NAME" => $brands_ar_res['NAME'],
"URL" => "https://".SITE_SERVER_NAME.$arParams['PATH'].$arResult['SELECTED']['BRAND']."/",
]);
+
+ array_push($canonical, $arParams['BRAND']);
}
$arResult['EXTENDED'] = true;
@@ -153,6 +156,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
"URL" => "https://".SITE_SERVER_NAME.$arParams['PATH'].$arResult['SELECTED']['BRAND']."/".$arResult['SELECTED']['MODEL']."/",
]);
+ array_push($canonical, $arParams['MODEL']);
+
if(!is_null($arParams['REGION']) && $arParams['REGION'] !== "root")
{
if($models_ar_res['PROPERTIES']['REGIONS']['VALUE'] !== "Да")
@@ -518,7 +523,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
/*
$ar_city['LEADER_NAME'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_NAME']['VALUE'];
$ar_city['LEADER_POSITION'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE'];
-
+
if(!empty($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE']))
{
$ar_city['LEADER_PHOTO'] = CFile::GetPath($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_PHOTO']['VALUE']);
@@ -533,6 +538,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
"URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/",
]);
+ array_unshift($canonical, $ar_city['CODE']);
+
if(!empty($arResult['SELECTED']['MODEL']))
{
//array_unshift($breadcrumbs, [
@@ -544,7 +551,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный.");
$APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг");
- $APPLICATION->AddHeadString('');
+ //$APPLICATION->AddHeadString('');
}
elseif(!empty($arResult['SELECTED']['BRAND']))
{
@@ -557,7 +564,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный.");
$APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг");
- $APPLICATION->AddHeadString('');
+ //$APPLICATION->AddHeadString('');
}
else
{
@@ -570,8 +577,15 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$APPLICATION->SetPageProperty("description", "Лизинговая компания Эволюция предлагает быстрое оформление авто в лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП. Выгодные цены, спецпредложения, простое оформление, консультирование и сопровождение.");
$APPLICATION->SetPageProperty("keywords", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE'].", лизинг авто ".$ar_city['NAME'].", купить машину в лизинг ".$ar_city['NAME']."");
- $APPLICATION->AddHeadString('');
+ //$APPLICATION->AddHeadString('');
}
+
+ $APPLICATION->AddHeadString(' 0 ? "/" : "").'"/>');
+ }
+
+ if(!isset($ar_city))
+ {
+ define('ERROR_404', 'Y');
}
}
}
@@ -579,6 +593,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
{
if(!isset($arParams['PROGRAM']))
{
+ $APPLICATION->AddHeadString(' 0 ? "/" : "").'"/>');
+ /*
if(isset($arResult['SELECTED']['BRAND']))
{
if(isset($arResult['SELECTED']['MODEL']))
@@ -594,6 +610,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
{
$APPLICATION->AddHeadString('');
}
+ */
}
}
diff --git a/local/components/evolution/catalog/templates/.default/template.php b/local/components/evolution/catalog/templates/.default/template.php
index c4338ac..9642ed7 100644
--- a/local/components/evolution/catalog/templates/.default/template.php
+++ b/local/components/evolution/catalog/templates/.default/template.php
@@ -47,7 +47,7 @@ else
$title = $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL'];
}
- $subtitle = " в лизинг";
+ $subtitle = " в лизинг для юридических лиц и ИП";
}
}
diff --git a/local/include/body.php b/local/include/body.php
new file mode 100644
index 0000000..414414a
--- /dev/null
+++ b/local/include/body.php
@@ -0,0 +1,25 @@
+
+
+
+ global $USER; ?>
+
diff --git a/local/templates/404/header.php b/local/templates/404/header.php index 9d14dd4..eb60ff5 100644 --- a/local/templates/404/header.php +++ b/local/templates/404/header.php @@ -3,80 +3,29 @@ IncludeTemplateLangFile(__FILE__); ?>
- CJSCore::Init(array("jquery3")); ?> - - - - - $APPLICATION->SetAdditionalCSS("/local/templates/evolution/css/style.css"); ?> - $APPLICATION->AddHeadScript('/local/templates/evolution/js/react.production.min.js'); ?> - $APPLICATION->AddHeadScript('/local/templates/evolution/js/react-dom.production.min.js'); ?> - $APPLICATION->AddHeadScript('/local/templates/evolution/js/babel.min.js'); ?> - - - - - - $APPLICATION->ShowHead(); ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -