From 9d67b88d477f47910727a5eb6257a912d7b2c9e1 Mon Sep 17 00:00:00 2001 From: Antoine Mille Date: Fri, 27 Jan 2017 14:18:59 +0100 Subject: [PATCH 1/3] MO: Fix url insert --- ps_menutoplinks.class.php | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/ps_menutoplinks.class.php b/ps_menutoplinks.class.php index a20c28e..1a73b38 100644 --- a/ps_menutoplinks.class.php +++ b/ps_menutoplinks.class.php @@ -67,6 +67,16 @@ class Ps_MenuTopLinks return array('link' => $link, 'label' => $label, 'new_window' => $new_window); } + public static function updateUrl($link) + { + for($i = 1; $i <= count($link); $i++) { + if (substr($link[$i], 0, 4) === "www.") { + $link[$i] = "http://" . $link[$i]; + } + } + return $link; + } + public static function add($link, $label, $newWindow = 0, $id_shop) { if (!is_array($label)) { @@ -76,6 +86,7 @@ class Ps_MenuTopLinks return false; } + $link = self::updateUrl($link); Db::getInstance()->insert( 'linksmenutop', array( @@ -89,15 +100,15 @@ class Ps_MenuTopLinks foreach ($label as $id_lang=>$label) { $result &= Db::getInstance()->insert( - 'linksmenutop_lang', - array( - 'id_linksmenutop'=>(int)$id_linksmenutop, - 'id_lang'=>(int)$id_lang, - 'id_shop'=>(int)$id_shop, - 'label'=>pSQL($label), - 'link'=>pSQL($link[$id_lang]) - ) - ); + 'linksmenutop_lang', + array( + 'id_linksmenutop'=>(int)$id_linksmenutop, + 'id_lang'=>(int)$id_lang, + 'id_shop'=>(int)$id_shop, + 'label'=>pSQL($label), + 'link'=>pSQL($link[$id_lang]) + ) + ); } return $result; @@ -112,6 +123,7 @@ class Ps_MenuTopLinks return false; } + $link = self::updateUrl($link); Db::getInstance()->update( 'linksmenutop', array( @@ -134,13 +146,12 @@ class Ps_MenuTopLinks } } - public static function remove($id_linksmenutop, $id_shop) { $result = true; $result &= Db::getInstance()->delete('linksmenutop', 'id_linksmenutop = '.(int)$id_linksmenutop.' AND id_shop = '.(int)$id_shop); $result &= Db::getInstance()->delete('linksmenutop_lang', 'id_linksmenutop = '.(int)$id_linksmenutop); - + return $result; } } From 0ce21ed09e7d6380516d81127abe328e5a81d209 Mon Sep 17 00:00:00 2001 From: Antoine Mille Date: Thu, 2 Feb 2017 10:01:54 +0100 Subject: [PATCH 2/3] MO: change www to http --- ps_menutoplinks.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ps_menutoplinks.class.php b/ps_menutoplinks.class.php index 1a73b38..2172292 100644 --- a/ps_menutoplinks.class.php +++ b/ps_menutoplinks.class.php @@ -70,7 +70,7 @@ class Ps_MenuTopLinks public static function updateUrl($link) { for($i = 1; $i <= count($link); $i++) { - if (substr($link[$i], 0, 4) === "www.") { + if (substr($link[$i], 0, 7) !== "http://" && substr($link[$i], 0, 8) !== "https://") { $link[$i] = "http://" . $link[$i]; } } From 3a0499a46fd1bd2af58a30e00586ace7fb50b432 Mon Sep 17 00:00:00 2001 From: Antoine Mille Date: Fri, 3 Feb 2017 10:57:25 +0100 Subject: [PATCH 3/3] BO: Add placeholder on the link input --- ps_mainmenu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ps_mainmenu.php b/ps_mainmenu.php index f788bce..a91c51c 100644 --- a/ps_mainmenu.php +++ b/ps_mainmenu.php @@ -1072,6 +1072,7 @@ class Ps_MainMenu extends Module implements WidgetInterface array( 'type' => 'text', 'label' => $this->trans('Link', array(), 'Admin.Global'), + 'placeholder' => 'http://www.example.com', 'name' => 'link', 'lang' => true, ),