Merge branch 'drupal-forms-api-usage' of github.com:alvinjohnsonso/tawk-drupal into pattern-matching

Author: alvinjohnsonso

includes/tawk_to.helper.php

@@ -54,7 +54,7 @@ public static function get_iframe_url() {
         'widget_id' => '',
       );
     }
-    return TawkHelper::get_base_url() . '/generic/widgets?currentWidgetId=' . $widget['widget_id'] . '&currentPageId=' . $widget['page_id'];
+    return TawkHelper::get_base_url() . '/generic/widgets?currentWidgetId=' . $widget['widget_id'] . '&currentPageId=' . $widget['page_id'] . '&pltf=drupal';
   }
 
   /**

js/tawk_to.admin.js

@@ -7,7 +7,7 @@ jQuery(document).ready(function() {
   tawktoSettings = Drupal.settings.tawkto || {};
 
   var currentHost = window.location.protocol + "//" + window.location.host;
-  var url = tawktoSettings.iframeUrl + "&pltf=drupal&parentDomain=" + currentHost;
+  var url = tawktoSettings.iframeUrl + "&parentDomain=" + currentHost;
 
   jQuery("#tawkIframe").attr("src", url);
 

tawk_to.module

@@ -48,14 +48,13 @@ function tawk_to_preprocess_page(&$variables) {
     }
 
     // prepare visibility
-    $currentUrl = $base_url.$_SERVER['REQUEST_URI'];
+    $current_url = $base_url.$_SERVER['REQUEST_URI'];
 
     if (false === $options->always_display) {
-      $showPages = json_decode($options->show_oncustom);
+      $show_pages = json_decode($options->show_oncustom);
       $show = false;
 
-
-      if (UrlPatternMatcher::match($currentUrl, $showPages)) {
+      if (UrlPatternMatcher::match($current_url, $show_pages)) {
         $show = true;
       }
 
@@ -80,9 +79,9 @@ function tawk_to_preprocess_page(&$variables) {
         $hide_pages = json_decode($options->hide_oncustom);
         $show = true;
 
-        $currentUrl = (string) $currentUrl;
+        $current_url = (string) $current_url;
 
-        if (UrlPatternMatcher::match($currentUrl, $hide_pages)) {
+        if (UrlPatternMatcher::match($current_url, $hide_pages)) {
           $show = false;
         }