From f8e7c16df347b0e4176360ea7027645890a96163 Mon Sep 17 00:00:00 2001
From: Artem Vasilev <kernusr@users.noreply.github.com>
Date: Fri, 18 Feb 2022 14:41:46 +0300
Subject: [PATCH] v.1.1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Исправлена настройка точного показателя отказов
* Небольшие исправления и улучшения в коде
* update copyright date
---
 fields/mediator.php                           |  4 +-
 .../en-GB/en-GB.plg_system_yametrikinsert.ini |  4 +-
 .../en-GB.plg_system_yametrikinsert.sys.ini   |  4 +-
 .../ru-RU/ru-RU.plg_system_yametrikinsert.ini |  4 +-
 .../ru-RU.plg_system_yametrikinsert.sys.ini   |  4 +-
 media/css/adminstyle.css                      |  4 +-
 script.php                                    |  4 +-
 yametrikinsert.php                            | 69 +++++++++----------
 yametrikinsert.xml                            |  2 +-
 9 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/fields/mediator.php b/fields/mediator.php
index b8cfaeb..de19dea 100644
--- a/fields/mediator.php
+++ b/fields/mediator.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package    Joomla - Yandex.Metrika insert
- * @version    1.1.2
+ * @version    1.1.3
  * @author     Artem Vasilev - webmasterskaya.xyz
- * @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+ * @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
  * @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
  * @link       https://webmasterskaya.xyz/
  */
diff --git a/language/en-GB/en-GB.plg_system_yametrikinsert.ini b/language/en-GB/en-GB.plg_system_yametrikinsert.ini
index 94e37b9..6184309 100644
--- a/language/en-GB/en-GB.plg_system_yametrikinsert.ini
+++ b/language/en-GB/en-GB.plg_system_yametrikinsert.ini
@@ -1,8 +1,8 @@
 ;
 ; @package    Joomla - Yandex.Metrika insert
-; @version    1.1.2
+; @version    1.1.3
 ; @author     Artem Vasilev - webmasterskaya.xyz
-; @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+; @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
 ; @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
 ; @link       https://webmasterskaya.xyz/
 ;
diff --git a/language/en-GB/en-GB.plg_system_yametrikinsert.sys.ini b/language/en-GB/en-GB.plg_system_yametrikinsert.sys.ini
index c9aa825..763fa03 100644
--- a/language/en-GB/en-GB.plg_system_yametrikinsert.sys.ini
+++ b/language/en-GB/en-GB.plg_system_yametrikinsert.sys.ini
@@ -1,8 +1,8 @@
 ;
 ; @package    Joomla - Yandex.Metrika insert
-; @version    1.1.2
+; @version    1.1.3
 ; @author     Artem Vasilev - webmasterskaya.xyz
-; @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+; @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
 ; @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
 ; @link       https://webmasterskaya.xyz/
 ;
diff --git a/language/ru-RU/ru-RU.plg_system_yametrikinsert.ini b/language/ru-RU/ru-RU.plg_system_yametrikinsert.ini
index ea9eef2..17bc962 100644
--- a/language/ru-RU/ru-RU.plg_system_yametrikinsert.ini
+++ b/language/ru-RU/ru-RU.plg_system_yametrikinsert.ini
@@ -1,8 +1,8 @@
 ;
 ; @package    Joomla - Yandex.Metrika insert
-; @version    1.1.2
+; @version    1.1.3
 ; @author     Artem Vasilev - webmasterskaya.xyz
-; @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+; @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
 ; @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
 ; @link       https://webmasterskaya.xyz/
 ;
diff --git a/language/ru-RU/ru-RU.plg_system_yametrikinsert.sys.ini b/language/ru-RU/ru-RU.plg_system_yametrikinsert.sys.ini
index 5bb6970..54ad57d 100644
--- a/language/ru-RU/ru-RU.plg_system_yametrikinsert.sys.ini
+++ b/language/ru-RU/ru-RU.plg_system_yametrikinsert.sys.ini
@@ -1,8 +1,8 @@
 ;
 ; @package    Joomla - Yandex.Metrika insert
-; @version    1.1.2
+; @version    1.1.3
 ; @author     Artem Vasilev - webmasterskaya.xyz
-; @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+; @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
 ; @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
 ; @link       https://webmasterskaya.xyz/
 ;
diff --git a/media/css/adminstyle.css b/media/css/adminstyle.css
index 443fcad..7526f37 100644
--- a/media/css/adminstyle.css
+++ b/media/css/adminstyle.css
@@ -1,8 +1,8 @@
 /**
  * @package    Joomla - Yandex.Metrika insert
- * @version    1.1.2
+ * @version    1.1.3
  * @author     Artem Vasilev - webmasterskaya.xyz
- * @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+ * @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
  * @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
  * @link       https://webmasterskaya.xyz/
  */
diff --git a/script.php b/script.php
index ae6dfb2..dd0035a 100644
--- a/script.php
+++ b/script.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package    Joomla - Yandex.Metrika insert
- * @version    1.1.2
+ * @version    1.1.3
  * @author     Artem Vasilev - webmasterskaya.xyz
- * @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+ * @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
  * @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
  * @link       https://webmasterskaya.xyz/
  */
diff --git a/yametrikinsert.php b/yametrikinsert.php
index a0e8620..2394ee9 100644
--- a/yametrikinsert.php
+++ b/yametrikinsert.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package    Joomla - Yandex.Metrika insert
- * @version    1.1.2
+ * @version    1.1.3
  * @author     Artem Vasilev - webmasterskaya.xyz
- * @copyright  Copyright (c) 2018 - 2020 Webmasterskaya. All rights reserved.
+ * @copyright  Copyright (c) 2018 - 2022 Webmasterskaya. All rights reserved.
  * @license    GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
  * @link       https://webmasterskaya.xyz/
  */
@@ -89,45 +89,38 @@ public function onAfterRender()
 			return false;
 		}
 
-        $cur_domain = ltrim(trim(parse_url(JURI::root(), PHP_URL_HOST)), '.');
-
-        // Устанавливает cookie для режима отладки метрики
-        if($this->params->get('yametrik_debug', 0) == 1){
-	        $this->app->input->cookie->set(
-                    '_ym_debug',
-                    1,
-                    0,
-                    $this->app->get('cookie_path', '/'),
-                    '.'. $cur_domain,
-                    $this->app->isSSLConnection()
-            );
-        } else {
-	        $this->app->input->cookie->set(
-		        '_ym_debug',
-		        null,
-		        time() - 3600,
-		        $this->app->get('cookie_path', '/'),
-		        '.'. $cur_domain,
-		        $this->app->isSSLConnection()
-	        );
-        }
-
 		// Prepare array of params.
 		$yaParams = [
 			'triggerEvent'        => true,
-			'webvisor'            => $this->params->get('yametrik_webvisor', 0) ? true : false,
-			'clickmap'            => $this->params->get('yametrik_clickmap', 0) ? true : false,
-			'trackHash'           => $this->params->get('yametrik_trackHash', 0) ? true : false,
-			'trackLinks'          => $this->params->get('yametrik_trackLinks', 0) ? true : false,
-			'ecommerce'           => $this->params->get('yametrik_ecommerce',
-				0) ? $this->params->get('yametrik_ecommerce_container',
-				'dataLayer') : false,
-			'defer'               => $this->params->get('yametrik_defer', 0) ? false : true,
-			'accurateTrackBounce' => $this->params->get('yametrik_yametrik_accurateTrackBounce',
-				0) ? $this->params->get('yametrik_accurateTrackBounce_delay', 15000) : false,
-			'childIframe'         => $this->params->get('yametrik_childIframe', 0) ? true : false,
+			'webvisor'            => (bool) $this->params->get('yametrik_webvisor', 0),
+			'clickmap'            => (bool) $this->params->get('yametrik_clickmap', 0),
+			'trackHash'           => (bool) $this->params->get('yametrik_trackHash', 0),
+			'trackLinks'          => (bool) $this->params->get('yametrik_trackLinks', 0),
+			'defer'               => !$this->params->get('yametrik_defer', 0),
+			'childIframe'         => (bool) $this->params->get('yametrik_childIframe', 0),
 		];
 
+		switch ($this->params->get('yametrik_ecommerce', 0))
+		{
+			case 1:
+				$yaParams['ecommerce'] = $this->params->get('yametrik_ecommerce_container', 'dataLayer');
+				break;
+			default:
+				$yaParams['ecommerce'] = false;
+		}
+
+		switch ($this->params->get('yametrik_accurateTrackBounce', 1))
+		{
+			case 0:
+				$yaParams['accurateTrackBounce'] = false;
+				break;
+			case 2:
+				$yaParams['accurateTrackBounce'] = $this->params->get('yametrik_accurateTrackBounce_delay', 15000);
+				break;
+			default:
+				$yaParams['accurateTrackBounce'] = true;
+		}
+
 		// Bypass
 		if ($this->params->get('yametrik_bypass', 1) == 0)
 		{
@@ -152,7 +145,7 @@ public function onAfterRender()
 		}
 
 		// Send client IP
-		if ($this->params->get('yametrik_send_ip', 0))
+		if (!!$this->params->get('yametrik_send_ip', 0))
 		{
 			$yaParams['params']['ip'] = $_SERVER['REMOTE_ADDR'];
 		}
@@ -314,7 +307,7 @@ protected function allowMetrika()
 	 *
 	 * @since      1.0.0
 	 *
-	 * @copyright  Copyright (c) 2018 - 2020 Septdir Workshop. All rights reserved.
+	 * @copyright  Copyright (c) 2018 - 2022 Septdir Workshop. All rights reserved.
 	 * @author     Septdir Workshop - www.septdir.com
 	 * @link       https://www.septdir.com/
 	 */
diff --git a/yametrikinsert.xml b/yametrikinsert.xml
index 6b8b6d5..a5a741d 100644
--- a/yametrikinsert.xml
+++ b/yametrikinsert.xml
@@ -7,7 +7,7 @@
     <license>GNU General Public License version 3 or later; see LICENSE.txt</license>
     <authorEmail>dev@webmasterskaya.xyz</authorEmail>
     <authorUrl>https://webmasterskaya.xyz</authorUrl>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <description>PLG_SYSTEM_YAMETRIKINSERT_DESCRIPTION</description>
     <scriptfile>script.php</scriptfile>
     <languages folder="language">