@@ -11,64 +11,64 @@ |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | function formulaires_rediriger_article_charger_dist($id_article, $retour = '') { |
| 18 | 18 | |
| 19 | - include_spip('inc/autoriser'); |
|
| 20 | - if (!autoriser('modifier', 'article', $id_article)) { |
|
| 21 | - return false; |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - $row = sql_fetsel('id_article,virtuel', 'spip_articles', 'id_article=' . intval($id_article)); |
|
| 25 | - if (!$row['id_article']) { |
|
| 26 | - return false; |
|
| 27 | - } |
|
| 28 | - include_spip('inc/lien'); |
|
| 29 | - $redirection = virtuel_redirige($row['virtuel']); |
|
| 30 | - |
|
| 31 | - if (!$redirection |
|
| 32 | - and $GLOBALS['meta']['articles_redirection'] != 'oui' |
|
| 33 | - ) { |
|
| 34 | - return false; |
|
| 35 | - } |
|
| 36 | - |
|
| 37 | - |
|
| 38 | - include_spip('inc/texte'); |
|
| 39 | - $valeurs = array( |
|
| 40 | - 'redirection' => $redirection, |
|
| 41 | - 'id' => $id_article, |
|
| 42 | - '_afficher_url' => ($redirection ? propre("[->$redirection]") : ''), |
|
| 43 | - ); |
|
| 44 | - |
|
| 45 | - return $valeurs; |
|
| 19 | + include_spip('inc/autoriser'); |
|
| 20 | + if (!autoriser('modifier', 'article', $id_article)) { |
|
| 21 | + return false; |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + $row = sql_fetsel('id_article,virtuel', 'spip_articles', 'id_article=' . intval($id_article)); |
|
| 25 | + if (!$row['id_article']) { |
|
| 26 | + return false; |
|
| 27 | + } |
|
| 28 | + include_spip('inc/lien'); |
|
| 29 | + $redirection = virtuel_redirige($row['virtuel']); |
|
| 30 | + |
|
| 31 | + if (!$redirection |
|
| 32 | + and $GLOBALS['meta']['articles_redirection'] != 'oui' |
|
| 33 | + ) { |
|
| 34 | + return false; |
|
| 35 | + } |
|
| 36 | + |
|
| 37 | + |
|
| 38 | + include_spip('inc/texte'); |
|
| 39 | + $valeurs = array( |
|
| 40 | + 'redirection' => $redirection, |
|
| 41 | + 'id' => $id_article, |
|
| 42 | + '_afficher_url' => ($redirection ? propre("[->$redirection]") : ''), |
|
| 43 | + ); |
|
| 44 | + |
|
| 45 | + return $valeurs; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | function formulaires_rediriger_article_verifier_dist($id_article, $retour = '') { |
| 49 | - $erreurs = array(); |
|
| 49 | + $erreurs = array(); |
|
| 50 | 50 | |
| 51 | - if (($redirection = _request('redirection')) == $id_article || $redirection == 'art' . $id_article) { |
|
| 52 | - $erreurs['redirection'] = _T('info_redirection_boucle'); |
|
| 53 | - } |
|
| 51 | + if (($redirection = _request('redirection')) == $id_article || $redirection == 'art' . $id_article) { |
|
| 52 | + $erreurs['redirection'] = _T('info_redirection_boucle'); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - return $erreurs; |
|
| 55 | + return $erreurs; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | function formulaires_rediriger_article_traiter_dist($id_article, $retour = '') { |
| 59 | 59 | |
| 60 | - $url = preg_replace(',^\s*https?://$,i', '', rtrim(_request('redirection'))); |
|
| 61 | - if ($url) { |
|
| 62 | - $url = corriger_caracteres($url); |
|
| 63 | - } |
|
| 60 | + $url = preg_replace(',^\s*https?://$,i', '', rtrim(_request('redirection'))); |
|
| 61 | + if ($url) { |
|
| 62 | + $url = corriger_caracteres($url); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - include_spip('action/editer_article'); |
|
| 66 | - article_modifier($id_article, array('virtuel' => $url)); |
|
| 65 | + include_spip('action/editer_article'); |
|
| 66 | + article_modifier($id_article, array('virtuel' => $url)); |
|
| 67 | 67 | |
| 68 | - $js = _AJAX ? '<script type="text/javascript">if (window.ajaxReload) ajaxReload("wysiwyg");</script>' : ''; |
|
| 68 | + $js = _AJAX ? '<script type="text/javascript">if (window.ajaxReload) ajaxReload("wysiwyg");</script>' : ''; |
|
| 69 | 69 | |
| 70 | - return array( |
|
| 71 | - 'message_ok' => ($url ? _T('info_redirection_activee') : _T('info_redirection_desactivee')) . $js, |
|
| 72 | - 'editable' => true |
|
| 73 | - ); |
|
| 70 | + return array( |
|
| 71 | + 'message_ok' => ($url ? _T('info_redirection_activee') : _T('info_redirection_desactivee')) . $js, |
|
| 72 | + 'editable' => true |
|
| 73 | + ); |
|
| 74 | 74 | } |