@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('inc/presentation'); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @return string Code HTML |
| 33 | 33 | **/ |
| 34 | 34 | function exec_puce_statut_dist() { |
| 35 | - exec_puce_statut_args(_request('id'), _request('type')); |
|
| 35 | + exec_puce_statut_args(_request('id'), _request('type')); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -52,25 +52,25 @@ discard block |
||
| 52 | 52 | * @return string Code HTML |
| 53 | 53 | **/ |
| 54 | 54 | function exec_puce_statut_args($id, $type) { |
| 55 | - $id = intval($id); |
|
| 56 | - if ($table_objet_sql = table_objet_sql($type) |
|
| 57 | - and $d = lister_tables_objets_sql($table_objet_sql) |
|
| 58 | - and isset($d['statut_textes_instituer']) |
|
| 59 | - and $d['statut_textes_instituer'] |
|
| 60 | - ) { |
|
| 61 | - $prim = id_table_objet($type); |
|
| 62 | - if (isset($d['field']['id_rubrique'])) { |
|
| 63 | - $select = "id_rubrique,statut"; |
|
| 64 | - } else { |
|
| 65 | - $select = "0 as id_rubrique,statut"; |
|
| 66 | - } |
|
| 67 | - $r = sql_fetsel($select, $table_objet_sql, "$prim=$id"); |
|
| 68 | - $statut = $r['statut']; |
|
| 69 | - $id_rubrique = $r['id_rubrique']; |
|
| 70 | - } else { |
|
| 71 | - $id_rubrique = $id; |
|
| 72 | - $statut = 'prop'; // arbitraire |
|
| 73 | - } |
|
| 74 | - $puce_statut = charger_fonction('puce_statut', 'inc'); |
|
| 75 | - ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true)); |
|
| 55 | + $id = intval($id); |
|
| 56 | + if ($table_objet_sql = table_objet_sql($type) |
|
| 57 | + and $d = lister_tables_objets_sql($table_objet_sql) |
|
| 58 | + and isset($d['statut_textes_instituer']) |
|
| 59 | + and $d['statut_textes_instituer'] |
|
| 60 | + ) { |
|
| 61 | + $prim = id_table_objet($type); |
|
| 62 | + if (isset($d['field']['id_rubrique'])) { |
|
| 63 | + $select = "id_rubrique,statut"; |
|
| 64 | + } else { |
|
| 65 | + $select = "0 as id_rubrique,statut"; |
|
| 66 | + } |
|
| 67 | + $r = sql_fetsel($select, $table_objet_sql, "$prim=$id"); |
|
| 68 | + $statut = $r['statut']; |
|
| 69 | + $id_rubrique = $r['id_rubrique']; |
|
| 70 | + } else { |
|
| 71 | + $id_rubrique = $id; |
|
| 72 | + $statut = 'prop'; // arbitraire |
|
| 73 | + } |
|
| 74 | + $puce_statut = charger_fonction('puce_statut', 'inc'); |
|
| 75 | + ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true)); |
|
| 76 | 76 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('inc/minipres'); |
@@ -42,28 +42,28 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | **/ |
| 44 | 44 | function exec_install_dist() { |
| 45 | - $etape = _request('etape'); |
|
| 46 | - $deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT)); |
|
| 45 | + $etape = _request('etape'); |
|
| 46 | + $deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT)); |
|
| 47 | 47 | |
| 48 | - // Si deja installe, on n'a plus le droit qu'a l'etape chmod |
|
| 49 | - // pour chgt post-install ou aux etapes supplementaires |
|
| 50 | - // de declaration de base externes. |
|
| 51 | - // Mais alors il faut authentifier car ecrire/index.php l'a omis |
|
| 48 | + // Si deja installe, on n'a plus le droit qu'a l'etape chmod |
|
| 49 | + // pour chgt post-install ou aux etapes supplementaires |
|
| 50 | + // de declaration de base externes. |
|
| 51 | + // Mais alors il faut authentifier car ecrire/index.php l'a omis |
|
| 52 | 52 | |
| 53 | - if ($deja and in_array($etape, array('chmod', 'sup1', 'sup2'))) { |
|
| 53 | + if ($deja and in_array($etape, array('chmod', 'sup1', 'sup2'))) { |
|
| 54 | 54 | |
| 55 | - $auth = charger_fonction('auth', 'inc'); |
|
| 56 | - if (!$auth()) { |
|
| 57 | - verifier_visiteur(); |
|
| 58 | - $deja = (!autoriser('configurer')); |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - if ($deja) { |
|
| 62 | - // Rien a faire ici |
|
| 63 | - echo minipres(); |
|
| 64 | - } else { |
|
| 65 | - include_spip('base/create'); |
|
| 66 | - $fonc = charger_fonction("etape_$etape", 'install'); |
|
| 67 | - $fonc(); |
|
| 68 | - } |
|
| 55 | + $auth = charger_fonction('auth', 'inc'); |
|
| 56 | + if (!$auth()) { |
|
| 57 | + verifier_visiteur(); |
|
| 58 | + $deja = (!autoriser('configurer')); |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + if ($deja) { |
|
| 62 | + // Rien a faire ici |
|
| 63 | + echo minipres(); |
|
| 64 | + } else { |
|
| 65 | + include_spip('base/create'); |
|
| 66 | + $fonc = charger_fonction("etape_$etape", 'install'); |
|
| 67 | + $fonc(); |
|
| 68 | + } |
|
| 69 | 69 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -25,25 +25,25 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | function exec_404_dist() { |
| 27 | 27 | |
| 28 | - $exec = _request('exec'); |
|
| 28 | + $exec = _request('exec'); |
|
| 29 | 29 | |
| 30 | - $titre = "exec_$exec"; |
|
| 31 | - $navigation = ''; |
|
| 32 | - $extra = ''; |
|
| 30 | + $titre = "exec_$exec"; |
|
| 31 | + $navigation = ''; |
|
| 32 | + $extra = ''; |
|
| 33 | 33 | |
| 34 | - include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini |
|
| 35 | - $commencer_page = charger_fonction('commencer_page', 'inc'); |
|
| 36 | - echo $commencer_page($titre); |
|
| 34 | + include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini |
|
| 35 | + $commencer_page = charger_fonction('commencer_page', 'inc'); |
|
| 36 | + echo $commencer_page($titre); |
|
| 37 | 37 | |
| 38 | - echo debut_gauche("404_$exec", true); |
|
| 39 | - echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 38 | + echo debut_gauche("404_$exec", true); |
|
| 39 | + echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 40 | 40 | |
| 41 | - echo creer_colonne_droite('404', true); |
|
| 42 | - echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 41 | + echo creer_colonne_droite('404', true); |
|
| 42 | + echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 43 | 43 | |
| 44 | - echo debut_droite('404', true); |
|
| 45 | - echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>'; |
|
| 46 | - echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 44 | + echo debut_droite('404', true); |
|
| 45 | + echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>'; |
|
| 46 | + echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
|
| 47 | 47 | |
| 48 | - echo fin_gauche(), fin_page(); |
|
| 48 | + echo fin_gauche(), fin_page(); |
|
| 49 | 49 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
| 43 | 43 | |
| 44 | 44 | echo debut_droite('404', true); |
| 45 | - echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>'; |
|
| 45 | + echo "<h1 class='grostitre'>"._T('fichier_introuvable', array('fichier' => $exec)).'</h1>'; |
|
| 46 | 46 | echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => '')); |
| 47 | 47 | |
| 48 | 48 | echo fin_gauche(), fin_page(); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -27,23 +27,23 @@ discard block |
||
| 27 | 27 | * @uses ajax_retour() |
| 28 | 28 | **/ |
| 29 | 29 | function exec_plonger_dist() { |
| 30 | - include_spip('inc/actions'); |
|
| 30 | + include_spip('inc/actions'); |
|
| 31 | 31 | |
| 32 | - $rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac')); |
|
| 33 | - $id = intval(_request('id')); |
|
| 34 | - $exclus = intval(_request('exclus')); |
|
| 35 | - $col = intval(_request('col')); |
|
| 36 | - $do = _request('do'); |
|
| 37 | - if (preg_match('/^\w*$/', $do)) { |
|
| 38 | - if (!$do) { |
|
| 39 | - $do = 'aff'; |
|
| 40 | - } |
|
| 32 | + $rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac')); |
|
| 33 | + $id = intval(_request('id')); |
|
| 34 | + $exclus = intval(_request('exclus')); |
|
| 35 | + $col = intval(_request('col')); |
|
| 36 | + $do = _request('do'); |
|
| 37 | + if (preg_match('/^\w*$/', $do)) { |
|
| 38 | + if (!$do) { |
|
| 39 | + $do = 'aff'; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - $plonger = charger_fonction('plonger', 'inc'); |
|
| 43 | - $r = $plonger($id, spip_htmlentities($rac), array(), $col, $exclus, $do); |
|
| 44 | - } else { |
|
| 45 | - $r = ''; |
|
| 46 | - } |
|
| 42 | + $plonger = charger_fonction('plonger', 'inc'); |
|
| 43 | + $r = $plonger($id, spip_htmlentities($rac), array(), $col, $exclus, $do); |
|
| 44 | + } else { |
|
| 45 | + $r = ''; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - ajax_retour($r); |
|
| 48 | + ajax_retour($r); |
|
| 49 | 49 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 10 | - return; |
|
| 10 | + return; |
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | include_spip('inc/actions'); |
@@ -21,23 +21,23 @@ discard block |
||
| 21 | 21 | * @uses ajax_retour() |
| 22 | 22 | */ |
| 23 | 23 | function exec_info_plugin_dist() { |
| 24 | - if (!autoriser('configurer', '_plugins')) { |
|
| 25 | - include_spip('inc/minipres'); |
|
| 26 | - echo minipres(); |
|
| 27 | - } else { |
|
| 28 | - $plug = _DIR_RACINE . htmlspecialchars(_request('plugin')); |
|
| 29 | - $get_infos = charger_fonction('get_infos', 'plugins'); |
|
| 30 | - $dir = ""; |
|
| 31 | - if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) { |
|
| 32 | - $dir = _DIR_PLUGINS; |
|
| 33 | - } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) { |
|
| 34 | - $dir = _DIR_PLUGINS_DIST; |
|
| 35 | - } |
|
| 36 | - if ($dir) { |
|
| 37 | - $plug = substr($plug, strlen($dir)); |
|
| 38 | - } |
|
| 39 | - $info = $get_infos($plug, false, $dir); |
|
| 40 | - $afficher_plugin = charger_fonction("afficher_plugin", "plugins"); |
|
| 41 | - ajax_retour(affiche_bloc_plugin($plug, $info, $dir)); |
|
| 42 | - } |
|
| 24 | + if (!autoriser('configurer', '_plugins')) { |
|
| 25 | + include_spip('inc/minipres'); |
|
| 26 | + echo minipres(); |
|
| 27 | + } else { |
|
| 28 | + $plug = _DIR_RACINE . htmlspecialchars(_request('plugin')); |
|
| 29 | + $get_infos = charger_fonction('get_infos', 'plugins'); |
|
| 30 | + $dir = ""; |
|
| 31 | + if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) { |
|
| 32 | + $dir = _DIR_PLUGINS; |
|
| 33 | + } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) { |
|
| 34 | + $dir = _DIR_PLUGINS_DIST; |
|
| 35 | + } |
|
| 36 | + if ($dir) { |
|
| 37 | + $plug = substr($plug, strlen($dir)); |
|
| 38 | + } |
|
| 39 | + $info = $get_infos($plug, false, $dir); |
|
| 40 | + $afficher_plugin = charger_fonction("afficher_plugin", "plugins"); |
|
| 41 | + ajax_retour(affiche_bloc_plugin($plug, $info, $dir)); |
|
| 42 | + } |
|
| 43 | 43 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | include_spip('inc/minipres'); |
| 26 | 26 | echo minipres(); |
| 27 | 27 | } else { |
| 28 | - $plug = _DIR_RACINE . htmlspecialchars(_request('plugin')); |
|
| 28 | + $plug = _DIR_RACINE.htmlspecialchars(_request('plugin')); |
|
| 29 | 29 | $get_infos = charger_fonction('get_infos', 'plugins'); |
| 30 | 30 | $dir = ""; |
| 31 | 31 | if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) { |
@@ -17,38 +17,38 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Exec de la page de destruction des tables de SPIP |
| 25 | 25 | **/ |
| 26 | 26 | function exec_base_delete_all_dist() { |
| 27 | - include_spip('inc/autoriser'); |
|
| 28 | - if (!autoriser('detruire')) { |
|
| 29 | - include_spip('inc/minipres'); |
|
| 30 | - echo minipres(); |
|
| 31 | - } else { |
|
| 32 | - include_spip('base/dump'); |
|
| 33 | - $res = base_lister_toutes_tables('', array(), array(), true); |
|
| 34 | - if (!$res) { |
|
| 35 | - include_spip('inc/minipres'); |
|
| 36 | - spip_log("Erreur base de donnees"); |
|
| 37 | - echo minipres(_T('info_travaux_titre'), |
|
| 38 | - _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>"); |
|
| 39 | - } else { |
|
| 40 | - $res = base_saisie_tables('delete', $res); |
|
| 41 | - include_spip('inc/headers'); |
|
| 42 | - $res = "\n<ol style='text-align:left'><li>\n" . |
|
| 43 | - join("</li>\n<li>", $res) . |
|
| 44 | - '</li></ol>'; |
|
| 45 | - $admin = charger_fonction('admin', 'inc'); |
|
| 46 | - $res = $admin('delete_all', _T('titre_page_delete_all'), $res); |
|
| 47 | - if (!$res) { |
|
| 48 | - redirige_url_ecrire('install', ''); |
|
| 49 | - } else { |
|
| 50 | - echo $res; |
|
| 51 | - } |
|
| 52 | - } |
|
| 53 | - } |
|
| 27 | + include_spip('inc/autoriser'); |
|
| 28 | + if (!autoriser('detruire')) { |
|
| 29 | + include_spip('inc/minipres'); |
|
| 30 | + echo minipres(); |
|
| 31 | + } else { |
|
| 32 | + include_spip('base/dump'); |
|
| 33 | + $res = base_lister_toutes_tables('', array(), array(), true); |
|
| 34 | + if (!$res) { |
|
| 35 | + include_spip('inc/minipres'); |
|
| 36 | + spip_log("Erreur base de donnees"); |
|
| 37 | + echo minipres(_T('info_travaux_titre'), |
|
| 38 | + _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>"); |
|
| 39 | + } else { |
|
| 40 | + $res = base_saisie_tables('delete', $res); |
|
| 41 | + include_spip('inc/headers'); |
|
| 42 | + $res = "\n<ol style='text-align:left'><li>\n" . |
|
| 43 | + join("</li>\n<li>", $res) . |
|
| 44 | + '</li></ol>'; |
|
| 45 | + $admin = charger_fonction('admin', 'inc'); |
|
| 46 | + $res = $admin('delete_all', _T('titre_page_delete_all'), $res); |
|
| 47 | + if (!$res) { |
|
| 48 | + redirige_url_ecrire('install', ''); |
|
| 49 | + } else { |
|
| 50 | + echo $res; |
|
| 51 | + } |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -35,12 +35,12 @@ |
||
| 35 | 35 | include_spip('inc/minipres'); |
| 36 | 36 | spip_log("Erreur base de donnees"); |
| 37 | 37 | echo minipres(_T('info_travaux_titre'), |
| 38 | - _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>"); |
|
| 38 | + _T('titre_probleme_technique')."<p><tt>".sql_errno()." ".sql_error()."</tt></p>"); |
|
| 39 | 39 | } else { |
| 40 | 40 | $res = base_saisie_tables('delete', $res); |
| 41 | 41 | include_spip('inc/headers'); |
| 42 | - $res = "\n<ol style='text-align:left'><li>\n" . |
|
| 43 | - join("</li>\n<li>", $res) . |
|
| 42 | + $res = "\n<ol style='text-align:left'><li>\n". |
|
| 43 | + join("</li>\n<li>", $res). |
|
| 44 | 44 | '</li></ol>'; |
| 45 | 45 | $admin = charger_fonction('admin', 'inc'); |
| 46 | 46 | $res = $admin('delete_all', _T('titre_page_delete_all'), $res); |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @package SPIP\Core\Rubriques |
| 17 | 17 | **/ |
| 18 | 18 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 19 | - return; |
|
| 19 | + return; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | include_spip('inc/actions'); |
@@ -28,21 +28,21 @@ discard block |
||
| 28 | 28 | * @uses ajax_retour() |
| 29 | 29 | **/ |
| 30 | 30 | function exec_selectionner_dist() { |
| 31 | - $id = intval(_request('id')); |
|
| 32 | - $exclus = intval(_request('exclus')); |
|
| 33 | - $type = _request('type'); |
|
| 34 | - $rac = _request('racine'); |
|
| 35 | - $do = _request('do'); |
|
| 36 | - if (preg_match('/^\w*$/', $do)) { |
|
| 37 | - if (!$do) { |
|
| 38 | - $do = 'aff'; |
|
| 39 | - } |
|
| 31 | + $id = intval(_request('id')); |
|
| 32 | + $exclus = intval(_request('exclus')); |
|
| 33 | + $type = _request('type'); |
|
| 34 | + $rac = _request('racine'); |
|
| 35 | + $do = _request('do'); |
|
| 36 | + if (preg_match('/^\w*$/', $do)) { |
|
| 37 | + if (!$do) { |
|
| 38 | + $do = 'aff'; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - $selectionner = charger_fonction('selectionner', 'inc'); |
|
| 41 | + $selectionner = charger_fonction('selectionner', 'inc'); |
|
| 42 | 42 | |
| 43 | - $r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do); |
|
| 44 | - } else { |
|
| 45 | - $r = ''; |
|
| 46 | - } |
|
| 47 | - ajax_retour($r); |
|
| 43 | + $r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do); |
|
| 44 | + } else { |
|
| 45 | + $r = ''; |
|
| 46 | + } |
|
| 47 | + ajax_retour($r); |
|
| 48 | 48 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('inc/actions'); |
@@ -29,20 +29,20 @@ discard block |
||
| 29 | 29 | * @uses ajax_retour() |
| 30 | 30 | **/ |
| 31 | 31 | function exec_informer_dist() { |
| 32 | - $id = intval(_request('id')); |
|
| 33 | - $col = intval(_request('col')); |
|
| 34 | - $exclus = intval(_request('exclus')); |
|
| 35 | - $do = _request('do'); |
|
| 32 | + $id = intval(_request('id')); |
|
| 33 | + $col = intval(_request('col')); |
|
| 34 | + $exclus = intval(_request('exclus')); |
|
| 35 | + $do = _request('do'); |
|
| 36 | 36 | |
| 37 | - if (preg_match('/^\w*$/', $do)) { |
|
| 38 | - if (!$do) { |
|
| 39 | - $do = 'aff'; |
|
| 40 | - } |
|
| 37 | + if (preg_match('/^\w*$/', $do)) { |
|
| 38 | + if (!$do) { |
|
| 39 | + $do = 'aff'; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - $informer = charger_fonction('informer', 'inc'); |
|
| 43 | - $res = $informer($id, $col, $exclus, _request('rac'), _request('type'), $do); |
|
| 44 | - } else { |
|
| 45 | - $res = ''; |
|
| 46 | - } |
|
| 47 | - ajax_retour($res); |
|
| 42 | + $informer = charger_fonction('informer', 'inc'); |
|
| 43 | + $res = $informer($id, $col, $exclus, _request('rac'), _request('type'), $do); |
|
| 44 | + } else { |
|
| 45 | + $res = ''; |
|
| 46 | + } |
|
| 47 | + ajax_retour($res); |
|
| 48 | 48 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('inc/actions'); |
@@ -30,63 +30,63 @@ discard block |
||
| 30 | 30 | **/ |
| 31 | 31 | function exec_upgrade_dist() { |
| 32 | 32 | |
| 33 | - if (!_FILE_CONNECT) { |
|
| 34 | - redirige_url_ecrire("install"); |
|
| 35 | - } |
|
| 33 | + if (!_FILE_CONNECT) { |
|
| 34 | + redirige_url_ecrire("install"); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - // Si reinstallation necessaire, message ad hoc |
|
| 38 | - if (_request('reinstall') == 'oui') { |
|
| 39 | - include_spip('inc/minipres'); |
|
| 40 | - $r = minipres(_T('titre_page_upgrade'), |
|
| 41 | - "<p><b>" |
|
| 42 | - . _T('texte_nouvelle_version_spip_1') |
|
| 43 | - . "</b><p> " |
|
| 44 | - . _T('texte_nouvelle_version_spip_2', |
|
| 45 | - array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')) |
|
| 46 | - . generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '', |
|
| 47 | - _T('bouton_relancer_installation'))); |
|
| 48 | - echo $r; |
|
| 49 | - } elseif (_request('fin')) { |
|
| 50 | - include_spip('inc/plugin'); |
|
| 51 | - actualise_plugins_actifs(); |
|
| 52 | - include_spip('inc/headers'); |
|
| 53 | - $res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul'); |
|
| 54 | - echo redirige_formulaire($res); |
|
| 55 | - } else { |
|
| 37 | + // Si reinstallation necessaire, message ad hoc |
|
| 38 | + if (_request('reinstall') == 'oui') { |
|
| 39 | + include_spip('inc/minipres'); |
|
| 40 | + $r = minipres(_T('titre_page_upgrade'), |
|
| 41 | + "<p><b>" |
|
| 42 | + . _T('texte_nouvelle_version_spip_1') |
|
| 43 | + . "</b><p> " |
|
| 44 | + . _T('texte_nouvelle_version_spip_2', |
|
| 45 | + array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')) |
|
| 46 | + . generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '', |
|
| 47 | + _T('bouton_relancer_installation'))); |
|
| 48 | + echo $r; |
|
| 49 | + } elseif (_request('fin')) { |
|
| 50 | + include_spip('inc/plugin'); |
|
| 51 | + actualise_plugins_actifs(); |
|
| 52 | + include_spip('inc/headers'); |
|
| 53 | + $res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul'); |
|
| 54 | + echo redirige_formulaire($res); |
|
| 55 | + } else { |
|
| 56 | 56 | |
| 57 | - if (!isset($GLOBALS['meta']['version_installee'])) { |
|
| 58 | - $GLOBALS['meta']['version_installee'] = 0.0; |
|
| 59 | - } else { |
|
| 60 | - $GLOBALS['meta']['version_installee'] = |
|
| 61 | - (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']); |
|
| 62 | - } |
|
| 63 | - # NB: str_replace car, sur club-internet, il semble que version_installe soit |
|
| 64 | - # enregistree au format '1,812' et non '1.812' |
|
| 57 | + if (!isset($GLOBALS['meta']['version_installee'])) { |
|
| 58 | + $GLOBALS['meta']['version_installee'] = 0.0; |
|
| 59 | + } else { |
|
| 60 | + $GLOBALS['meta']['version_installee'] = |
|
| 61 | + (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']); |
|
| 62 | + } |
|
| 63 | + # NB: str_replace car, sur club-internet, il semble que version_installe soit |
|
| 64 | + # enregistree au format '1,812' et non '1.812' |
|
| 65 | 65 | |
| 66 | - // Erreur downgrade |
|
| 67 | - // (cas de double installation de fichiers SPIP sur une meme base) |
|
| 68 | - if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) { |
|
| 69 | - $commentaire = _T('info_mise_a_niveau_base_2'); |
|
| 70 | - } // Commentaire standard upgrade |
|
| 71 | - else { |
|
| 72 | - $commentaire = _T('texte_mise_a_niveau_base_1'); |
|
| 73 | - } |
|
| 66 | + // Erreur downgrade |
|
| 67 | + // (cas de double installation de fichiers SPIP sur une meme base) |
|
| 68 | + if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) { |
|
| 69 | + $commentaire = _T('info_mise_a_niveau_base_2'); |
|
| 70 | + } // Commentaire standard upgrade |
|
| 71 | + else { |
|
| 72 | + $commentaire = _T('texte_mise_a_niveau_base_1'); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]"; |
|
| 75 | + $commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]"; |
|
| 76 | 76 | |
| 77 | - $_POST['reinstall'] = 'non'; // pour copy_request dans admin |
|
| 78 | - include_spip('inc/headers'); |
|
| 79 | - $admin = charger_fonction('admin', 'inc'); |
|
| 80 | - $res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire); |
|
| 81 | - if ($res) { |
|
| 82 | - echo $res; |
|
| 83 | - } else { |
|
| 84 | - // effacer les alea pour forcer leur relecture |
|
| 85 | - // si jamais ils ont change pendant l'upgrade |
|
| 86 | - unset($GLOBALS['meta']['alea_ephemere']); |
|
| 87 | - unset($GLOBALS['meta']['alea_ephemere_ancien']); |
|
| 88 | - $res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true); |
|
| 89 | - echo redirige_formulaire($res); |
|
| 90 | - } |
|
| 91 | - } |
|
| 77 | + $_POST['reinstall'] = 'non'; // pour copy_request dans admin |
|
| 78 | + include_spip('inc/headers'); |
|
| 79 | + $admin = charger_fonction('admin', 'inc'); |
|
| 80 | + $res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire); |
|
| 81 | + if ($res) { |
|
| 82 | + echo $res; |
|
| 83 | + } else { |
|
| 84 | + // effacer les alea pour forcer leur relecture |
|
| 85 | + // si jamais ils ont change pendant l'upgrade |
|
| 86 | + unset($GLOBALS['meta']['alea_ephemere']); |
|
| 87 | + unset($GLOBALS['meta']['alea_ephemere_ancien']); |
|
| 88 | + $res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true); |
|
| 89 | + echo redirige_formulaire($res); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | 92 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | . _T('texte_nouvelle_version_spip_1') |
| 43 | 43 | . "</b><p> " |
| 44 | 44 | . _T('texte_nouvelle_version_spip_2', |
| 45 | - array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')) |
|
| 45 | + array('connect' => '<tt>'._FILE_CONNECT.'</tt>')) |
|
| 46 | 46 | . generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '', |
| 47 | 47 | _T('bouton_relancer_installation'))); |
| 48 | 48 | echo $r; |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $GLOBALS['meta']['version_installee'] = 0.0; |
| 59 | 59 | } else { |
| 60 | 60 | $GLOBALS['meta']['version_installee'] = |
| 61 | - (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']); |
|
| 61 | + (double) str_replace(',', '.', $GLOBALS['meta']['version_installee']); |
|
| 62 | 62 | } |
| 63 | 63 | # NB: str_replace car, sur club-internet, il semble que version_installe soit |
| 64 | 64 | # enregistree au format '1,812' et non '1.812' |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $commentaire = _T('texte_mise_a_niveau_base_1'); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - $commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]"; |
|
| 75 | + $commentaire .= "<br />[".$GLOBALS['meta']['version_installee']."/".$GLOBALS['spip_version_base']."]"; |
|
| 76 | 76 | |
| 77 | 77 | $_POST['reinstall'] = 'non'; // pour copy_request dans admin |
| 78 | 78 | include_spip('inc/headers'); |