diff --git a/ecrire/inc/admin.php b/ecrire/inc/admin.php index dd8b6cdf59e976b5af8ace2010f03e913328c16e..090c0c498e021dfd9352e8de77372e4610346da4 100644 --- a/ecrire/inc/admin.php +++ b/ecrire/inc/admin.php @@ -45,19 +45,19 @@ function debut_admin($form, $action, $commentaire='') { minipres(_T('info_action', array('action' => $action)), $commentaire . $form - . "\n<p><b>"._T('info_authentification_ftp')."</b>" - . aide("ftp_auth") - . "\n<p>" - . _T('info_creer_repertoire') - . "\n<p align='center'>\n<INPUT TYPE='text' NAME='fichier' CLASS='fondl' VALUE=\"". - $signal - . "\" size='30'>" - . "\n<p>" - . _T('info_creer_repertoire_2', - array('repertoire' => joli_repertoire($dir))) - . "\n<p align='right'><INPUT TYPE='submit' VALUE='" - . _T('bouton_recharger_page') - . "' CLASS='fondo'>" + . fieldset(_T('info_authentification_ftp').aide("ftp_auth"), + array( + 'fichier' => array( + 'label' => _T('info_creer_repertoire'), + 'valeur' => $signal + ), + 'bouton' => array( + 'label' => _T('info_creer_repertoire_2', array('repertoire' => joli_repertoire($dir))).bouton_suivant(_T('bouton_recharger_page')), + 'valeur' => 'bouton', + 'hidden' => true + ) + ) + ) . "</form>"); } diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 0ed8ade3f87137bf84f346dc549f8d0e2c2dbd79..b9a67df4e8efc2ee3ae916da5acb46da0fd95cda 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -428,11 +428,13 @@ function _L($text, $args=array()) { } // Afficher "ecrire/data/" au lieu de "data/" dans les messages +// ou tmp/ au lieu de ../tmp/ // http://doc.spip.org/@joli_repertoire function joli_repertoire($rep) { $a = substr($rep,0,1); if ($a<>'.' AND $a<>'/') $rep = (_DIR_RESTREINT?'':_DIR_RESTREINT_ABS).$rep; + $rep = preg_replace(',(^\.\.\/),', '', $rep); return $rep; } @@ -971,7 +973,7 @@ function spip_initialisation($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) { define('_DIR_LOGOS', $pa); define('_DIR_IMG_ICONES', $pa . "icones/"); - define('_DIR_DUMP', $ti . "data/"); + define('_DIR_DUMP', $ti . "dump/"); define('_DIR_SESSIONS', $ti . "sessions/"); define('_DIR_TRANSFERT', $ti . "upload/"); define('_DIR_CACHE', $ti . "CACHE/");