trim exit points & fix indentation

tawk · Aug 14, 2024 · cc31f21 · cc31f21
1 parent 081f9dc
commit cc31f21
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/prestashop1.6/tawkto.php b/prestashop1.6/tawkto.php
@@ -106,26 +106,26 @@ public function hookDisplayFooter()
                     $show = true;
                 }
 
-				if (!$show) {
-					if ('index' == $this->context->controller->php_self) {
-						if (false == $options->show_onfrontpage) {
-							return;
-						}
-					}
-					if ('category' == $this->context->controller->php_self) {
-						if (false == $options->show_oncategory) {
-							return;
-						}
-					}
-					if ('product' == $this->context->controller->php_self) {
-						if (false == $options->show_onproduct) {
-							return;
-						}
-					}
-				}
-
-                if (!$show && !in_array($this->context->controller->php_self, array('index', 'category', 'product'))) {
-                    return;
+                if (!$show) {
+                    if ('index' == $this->context->controller->php_self) {
+                        if ($options->show_onfrontpage) {
+                            $show = true;
+                        }
+                    }
+                    if ('category' == $this->context->controller->php_self) {
+                        if ($options->show_oncategory) {
+                            $show = true;
+                        }
+                    }
+                    if ('product' == $this->context->controller->php_self) {
+                        if ($options->show_onproduct) {
+                            $show = true;
+                        }
+                    }
+                }
+
+                if (!$show) {
+                    return '';
                 }
             }
         }

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
@@ -108,26 +108,26 @@ public function hookDisplayFooter()
 
                 if (!$show) {
                     if ('product' == $this->context->controller->php_self) {
-                        if (false==$options->show_onproduct) {
-                            return;
+                        if ($options->show_onproduct) {
+                            $show = true;
                         }
                     }
 
                     if ('category' == $this->context->controller->php_self) {
-                        if (false==$options->show_oncategory) {
-                            return;
+                        if ($options->show_oncategory) {
+                            $show = true;
                         }
                     }
 
                     if ('index' == $this->context->controller->php_self) {
-                        if (false==$options->show_onfrontpage) {
-                            return;
+                        if ($options->show_onfrontpage) {
+                            $show = true;
                         }
                     }
                 }
 
-                if (!$show && !in_array($this->context->controller->php_self, array('index', 'category', 'product'))) {
-                    return;
+                if (!$show) {
+                    return '';
                 }
             } else {
                 // hide on specified urls