From b4723b129fe7e4eed1cc6b6ee9f645b8b8c7e573 Mon Sep 17 00:00:00 2001
From: root <aleksprm777@gmail.com>
Date: Wed, 12 Apr 2017 01:06:21 +0500
Subject: [PATCH] =?UTF-8?q?ver=201.1.2=20-=20fix=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=20-=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20404.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unicalendar/class.unicalendar.php | 6 +++---
 unicalendar/module.php            | 2 +-
 unicalendar/uca.res.php           | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/unicalendar/class.unicalendar.php b/unicalendar/class.unicalendar.php
index 9c7a2c2..81d1a84 100644
--- a/unicalendar/class.unicalendar.php
+++ b/unicalendar/class.unicalendar.php
@@ -40,12 +40,12 @@ class Unicalendar
        	$urubric_id = $v['uca_rubric_id'];
        	$udoc_id    = $v['uca_doc_id'];
        }	
-       	// Если выбрали вывести все документы из заданной рубрики - документы с Id=1 и Id=2 - выводиться не будут!
+       	// Если выбрали вывести все документы из заданной рубрики - документы с Id=1 (Главная) и 404 страница - выводиться не будут!
        	if ($uevents !='' && $uevents == '1'){
        	$sql = $AVE_DB->Query("
             SELECT Id, document_alias, document_title, document_published, document_meta_description 
             FROM " . PREFIX . "_documents
-            WHERE rubric_id = '" . $urubric_id . "' AND Id > 2
+            WHERE rubric_id = '" . $urubric_id . "' AND Id !=1 && Id != '".PAGE_NOT_FOUND_ID."'
         ");
        $results = array();
        while ($row = $sql->FetchAssocArray())
@@ -60,7 +60,7 @@ class Unicalendar
        	$sql = $AVE_DB->Query("
             SELECT Id, document_alias, document_title, document_published, document_meta_description 
             FROM " . PREFIX . "_documents
-            WHERE rubric_id = '" . $urubric_id . "' AND Id > 2 AND $udoc_id
+            WHERE rubric_id = '" . $urubric_id . "' AND Id !=1 && Id != '".PAGE_NOT_FOUND_ID."' AND $udoc_id
         ");
        $results = array();
        while ($row = $sql->FetchAssocArray())
diff --git a/unicalendar/module.php b/unicalendar/module.php
index 284d54d..e22bb85 100644
--- a/unicalendar/module.php
+++ b/unicalendar/module.php
@@ -14,7 +14,7 @@ if (defined('ACP'))
 {
     $modul['ModuleName'] = 'Универсальный календарь событий';
     $modul['ModuleSysName'] = 'unicalendar';
-    $modul['ModuleVersion'] = '1.1.1';
+    $modul['ModuleVersion'] = '1.1.2';
     $modul['ModuleDescription'] = '<br>Модуль позволяет создавать различные календари событий. <br> Для вывода календаря используйте системный тег <strong>[mod_unicalendar:XXX]</strong>';
     $modul['ModuleAutor'] = 'Repellent';
     $modul['ModuleCopyright'] = '&copy; AVE.cms Team 2017';
diff --git a/unicalendar/uca.res.php b/unicalendar/uca.res.php
index 8f3f2ee..042852c 100644
--- a/unicalendar/uca.res.php
+++ b/unicalendar/uca.res.php
@@ -15,7 +15,6 @@ if (isset($_POST['c']))
     $sql = $AVE_DB->Query("
     SELECT Id, rubric_title 
     FROM " . PREFIX . "_rubrics
-    WHERE Id !=2
     ");
     echo "<option style='color: #ABABAB;'  value='' >".$select_category."</option>";
     while($result = $sql->FetchRow()){
@@ -29,7 +28,7 @@ if (isset($_POST['a']))
    $sql = $AVE_DB->Query("
    SELECT Id, document_alias, document_title, document_published, document_meta_description 
    FROM " . PREFIX . "_documents
-   WHERE rubric_id = '" . $_POST['b'] . "' AND Id > 2
+   WHERE rubric_id = '" . $_POST['b'] . "' AND Id !=1 && Id != '".PAGE_NOT_FOUND_ID."'
    ");
 	$u_sel_doc = array();
 	while ($row = $sql->FetchAssocArray())