diff --git a/core/core.php b/core/core.php index 30514814..4a940c7f 100644 --- a/core/core.php +++ b/core/core.php @@ -1393,15 +1393,9 @@ class core extends common { } // Redirection if($output['redirect']) { - if (!empty($output['script']) ) { - $this->addOutput ([ - 'script' => $output['script'] - ]); - } else { - http_response_code(301); - header('Location:' . $output['redirect']); - exit(); - } + http_response_code(301); + header('Location:' . $output['redirect']); + exit(); } } // Données en sortie applicables même lorsqu'une notice est présente diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php index 10091706..e000e5f8 100644 --- a/module/redirection/redirection.php +++ b/module/redirection/redirection.php @@ -18,14 +18,8 @@ class redirection extends common { 'config' => self::GROUP_MODERATOR, 'index' => self::GROUP_VISITOR ]; - public static $openIn = [ - 'tab' => 'Un nouvel onglet', - 'lity' => 'Une popup intégrée', - 'popup' => 'Une popup', - 'window' => 'La fenêtre' - ]; - const REDIRECTION_VERSION = '1.4'; + const REDIRECTION_VERSION = '1.3'; /** * Configuration @@ -33,10 +27,7 @@ class redirection extends common { public function config() { // Soumission du formulaire if($this->isPost()) { - $this->setData(['module', $this->getUrl(0), [ - 'url' => $this->getInput('redirectionConfigUrl', helper::FILTER_URL, true), - 'target' => $this->getInput('redirectionConfigTarget'), - ]]); + $this->setData(['module', $this->getUrl(0), 'url', $this->getInput('redirectionConfigUrl', helper::FILTER_URL, true)]); // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl() . $this->getUrl(), @@ -72,33 +63,9 @@ class redirection extends common { else { // Incrémente le compteur de clics $this->setData(['module', $this->getUrl(0), 'count', helper::filter($this->getData(['module', $this->getUrl(0), 'count']) + 1, helper::FILTER_INT)]); - - switch ($this->getData(['module', $this->getUrl(0), 'target'])) { - case 'tab': - $script = ' window.history.back(); - window.open("' . $this->getData(['module',$this->getUrl(0), 'url']) . '", "_blank");'; - break; - case 'lity': - $script = '$(document).on("lity:close", function(event, instance) { - location.replace("' . helper::baseURl() . '"); - }); - // Open a URL in a lightbox - var lightbox = lity("'. $this->getData(['module',$this->getUrl(0), 'url']) .'"); - - // Bind as an event handler - $(document).on("click", "[data-lightbox]", lity);'; - break; - case "popup": - $script = ' window.history.back(); - window.open("' . $this->getData(['module',$this->getUrl(0), 'url']) . '", "_blank", "toolbar=0,location=0,menubar=0");'; - break; - case 'window': - $script = ''; - } // Valeurs en sortie $this->addOutput([ 'redirect' => $this->getData(['module', $this->getUrl(0), 'url']), - 'script' => $script, 'state' => true ]); } diff --git a/module/redirection/view/config/config.php b/module/redirection/view/config/config.php index 40901a52..97102956 100644 --- a/module/redirection/view/config/config.php +++ b/module/redirection/view/config/config.php @@ -21,10 +21,6 @@ 'placeholder' => 'http://', 'value' => $this->getData(['module', $this->getUrl(0), 'url']) ]); ?> - 'Ouvrir dans', - 'selected' => $this->getData(['module', $this->getUrl(0), 'target']) - ]); ?>