diff --git a/ecrire/action/export_all.php b/ecrire/action/export_all.php index 4e27dc62fb067ee0f8a4f6a432aa8d321004480e..b57cbe5ce0eaeed1a29f4be821d3428656cf972c 100644 --- a/ecrire/action/export_all.php +++ b/ecrire/action/export_all.php @@ -61,7 +61,13 @@ function export_all_fin($file, $meta) $subdir = dirname($file); $dir = dirname($subdir); $nom = basename($file); - if (@rename($file, $dir . '/' . $nom)) { + $dest = $dir . '/' . $nom; + if (file_exists($dest)) { + $n = 1; + while (@file_exists($new = "$dir/$n-$nom")) $n++; + @rename($dest, $new); + } + if (@rename($file, $dest)) { spip_unlink($subdir); spip_log("$file renomme en $dir/$nom"); } diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php index bfd1ebda3f77121fe038d022562466d84298bfdd..df799d1fe9c12221a6b071d606a33040135f3a8b 100644 --- a/ecrire/exec/admin_tech.php +++ b/ecrire/exec/admin_tech.php @@ -81,16 +81,9 @@ function exec_admin_tech_dist() $chercher_rubrique = charger_fonction('chercher_rubrique', 'inc'); $form = $chercher_rubrique(0, 'rubrique', !$GLOBALS['connect_toutes_rubriques'], 0, 'admin_tech_selection_titre'); - if (strpos($form,'<select')!==false) { - $form .= "<div style='text-align: $spip_lang_right;'>" - . '<input class="fondo" type="submit" value="' - . _T('bouton_choisir') - .'" />' - . "</div>"; - } $res .= "\n<p><label for='id_parent'>" . - _L('Vous pouvez limiter la sauvegarde à la rubrique: ') . + _L("Dans un but de fusion avec une autre base, vous pouvez limiter la sauvegarde à la rubrique: ") . "</label>" . $form . "</p>"; diff --git a/ecrire/exec/informer.php b/ecrire/exec/informer.php index 5796aa175c09fec95049e16cd9104eb49f174bce..b43c8baa9115a3941284eff7971790ec0a71438b 100644 --- a/ecrire/exec/informer.php +++ b/ecrire/exec/informer.php @@ -23,7 +23,7 @@ function exec_informer_dist() $col = intval(_request('col')); $exclus = intval(_request('exclus')); $do = _request('do'); - spip_log("informer($id, $col, $exclus, _request('rac'), _request('type'), $do"); + if (!preg_match('/^\w+$/', $do)) die(); if (!$do) $do = 'aff_selection_titre';