diff --git a/ecrire/inc/admin.php b/ecrire/inc/admin.php index 137be2314637cc92171f10e9e45516d9ee911312..67afdb4a40e5e055330c5ea4d5811378d421fd58 100644 --- a/ecrire/inc/admin.php +++ b/ecrire/inc/admin.php @@ -33,6 +33,7 @@ function debut_admin($script, $action, $commentaire='') { } $signal = fichier_admin($action); + spip_log("debut_admin $signal"); if (@file_exists($dir . $signal)) { spip_log ("Action admin: $action"); return true; @@ -51,15 +52,12 @@ function debut_admin($script, $action, $commentaire='') { 'fichier' => array( 'label' => _T('info_creer_repertoire'), 'valeur' => '' - ), - 'bouton' => array( - 'label' => _T('info_creer_repertoire_2', array('repertoire' => joli_repertoire($dir))) .bouton_suivant(_T('bouton_recharger_page')), - 'valeur' => 'bouton', - 'hidden' => true - ) - ) - ) - . "</form>"; + )), + ('<br />' + . _T('info_creer_repertoire_2', array('repertoire' => joli_repertoire($dir))) + . bouton_suivant(_T('bouton_recharger_page')))) + . "</form>"; + minipres(_T('info_action', array('action' => $action)), $form, " onload='barre_inserer(\"$signal\", document.forms[0].fichier)'"); @@ -83,9 +81,11 @@ function fin_admin($action) { function copy_request($script) { $hidden = ""; - $_POST['exec'] = $script; + $args = $_POST; + $args['exec'] = $script; + unset($args['fichier']); include_spip('inc/filtres'); - foreach($_POST as $n => $c) { + foreach($args as $n => $c) { $hidden .= "\n<input type='hidden' name='$n' value='" . entites_html($c) . "' />"; diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php index fe04705be217cb0e27602a11a402614bd9e47e06..ac487f02b2db49827b0abd5b44a6c73474e3f655 100644 --- a/ecrire/inc/minipres.php +++ b/ecrire/inc/minipres.php @@ -95,22 +95,22 @@ function info_etape($titre, $complement = ''){ } // http://doc.spip.org/@fieldset -function fieldset($legend, $champs = array()) { +function fieldset($legend, $champs = array(), $horchamps='') { $fieldset = "<fieldset>\n" . ($legend ? "<legend>".$legend."</legend>\n" : ''); foreach($champs as $nom => $contenu) { $type = $contenu['hidden'] ? 'hidden' : (preg_match(',^pass,', $nom) ? 'password' : 'text'); $class = $contenu['hidden'] ? '' : "class='formo' size='40' "; $fieldset .= "<label for='".$nom."'>".$contenu['label']."</label>\n"; - $fieldset .= "<input ".$class."type='".$type."' name='".$nom."' value='".$contenu['valeur']."' />\n"; + $fieldset .= "<input ".$class."type='".$type."' name='".$nom."'\nvalue='".$contenu['valeur']."' />\n"; } - $fieldset .= "</fieldset>\n"; + $fieldset .= "$horchamps</fieldset>\n"; return $fieldset; } // http://doc.spip.org/@bouton_suivant function bouton_suivant($code = 'bouton_suivant') { - return "\n<span class='suivant'><input id='suivant' type='submit' class='fondl' value=\"" . + return "\n<span class='suivant'><input id='suivant' type='submit' class='fondl'\nvalue=\"" . _T($code) . " >>\" /></span>\n"; }