Author: fil@rezo.net
Date: Tue Aug 15 17:18:12 2006
New Revision: 4541
Log:
pas de bouton update quand le repertoire de squelette n'est pas sous svn, ou pas accesdsible en ecrirture
Modified:
_plugins_branche_stable_/_spip_1_9_0_/squelettes_update/balise/formulaire_admin.php
_plugins_branche_stable_/_spip_1_9_0_/squelettes_update/formulaires/formulaire_admin.html
_plugins_branche_stable_/_spip_1_9_0_/squelettes_update/lang/squelup_fr.php
_plugins_branche_stable_/_spip_1_9_0_/squelettes_update/squelup_options.php
Modified: _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/balise/formulaire_admin.php
--- _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/balise/formulaire_admin.php (original)
+++ _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/balise/formulaire_admin.php Tue Aug 15 17:18:12 2006
@@ -177,7 +177,8 @@
'analyser' => $analyser,
'lang' => $lang,
'xhtml_error' => isset($GLOBALS['xhtml_error']) ? $GLOBALS['xhtml_error'] : '',
- 'svn_up_result' => isset($GLOBALS['svn_update_result'])?$GLOBALS['svn_update_result'] : ''
+ 'svn_up_result' => isset($GLOBALS['svn_update_result'])?$GLOBALS['svn_update_result'] : '',
+ 'svn_up_dir_skel' => isset($GLOBALS['svn_up_dir_skel'])?$GLOBALS['svn_up_dir_skel'] : ''
)
);
}
Modified: _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/formulaires/formulaire_admin.html
--- _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/formulaires/formulaire_admin.html (original)
+++ _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/formulaires/formulaire_admin.html Tue Aug 15 17:18:12 2006
@@ -1,5 +1,6 @@
<div[ class="(#ENV{divclass,spip-admin-bloc})"] dir="#LANG_DIR">[
- <a href="(#ENV{analyser})" class="spip-admin-boutons"><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
+ [<a href="[(#SELF|parametre_url{var_svn,update}|parametre_url{var_mode,recalcul})]" class="spip-admin-boutons"><:squelup:update:> ((#ENV{svn_up_dir_skel}))[ (#ENV{svn_up_result})]</a>
+ ]<a href="(#ENV{analyser})" class="spip-admin-boutons"><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
<a href="[(#ENV{voir_article})]" class="spip-admin-boutons"><:admin_modifier_article:> ((#ENV{id_article}))</a>][
<a href="[(#ENV{voir_breve})]" class="spip-admin-boutons"><:admin_modifier_breve:> ((#ENV{id_breve}))</a>][
<a href="[(#ENV{voir_rubrique})]" class="spip-admin-boutons"><:admin_modifier_rubrique:> ((#ENV{id_rubrique}))</a>][
@@ -11,5 +12,4 @@
<a href="(#ENV{statistiques})" class="spip-admin-boutons">[<:info_visites:> (#ENV{visites})][; <:info_popularite_5:> (#ENV{popularite})]</a>][
<a href="(#ENV{preview})" class="spip-admin-boutons"><:previsualisation:></a>][
<a href="(#ENV{debug})" class="spip-admin-boutons"><:admin_debug:></a>]
- <a href="[(#SELF|parametre_url{svn,update}|parametre_url{var_mode,recalcul})]" class="spip-admin-boutons"><:squelup:update:>[ (#ENV{svn_up_result})]</a>
</div>
\ No newline at end of file
Modified: _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/lang/squelup_fr.php
--- _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/lang/squelup_fr.php (original)
+++ _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/lang/squelup_fr.php Tue Aug 15 17:18:12 2006
@@ -3,7 +3,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
$GLOBALS[$GLOBALS['idx_lang']] = array(
-'update' => 'Update&Recalcul'
+'update' => 'svn up'
);
Modified: _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/squelup_options.php
--- _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/squelup_options.php (original)
+++ _plugins_branche_stable_/_spip_1_9_0_/squelettes_update/squelup_options.php Tue Aug 15 17:18:12 2006
@@ -1,5 +1,20 @@
<?php
-if ((_request('svn')=='update') AND ($GLOBALS['spip_admin'])){
+
+if (_DIR_RESTREINT AND $auteur_session['statut'] == '0minirezo') {
+
+ $GLOBALS['svn_up_dir_skel'] = "squelettes";
+ if (isset($GLOBALS['dossier_squelettes'])
+ && $GLOBALS['dossier_squelettes']!=""){
+ $GLOBALS['svn_up_dir_skel'] = explode(':',$GLOBALS['dossier_squelettes']);
+ $GLOBALS['svn_up_dir_skel'] = $GLOBALS['svn_up_dir_skel'][0];
+ }
+ if (!($GLOBALS['svn_up_dir_skel']
+ AND is_dir($GLOBALS['svn_up_dir_skel'].'/.svn')
+ AND is_writable($GLOBALS['svn_up_dir_skel'])
+ ))
+ $GLOBALS['svn_up_dir_skel'] = NULL;
+
+if (_request('var_svn')=='update') {
if (_request('username')!==NULL){
include_spip('inc/meta');
@@ -21,16 +36,12 @@
}
}
- $squelette = "squelettes";
- if (isset($GLOBALS['dossier_squelettes'])
- && $GLOBALS['dossier_squelettes']!=""){
- $squelette = explode(':',$GLOBALS['dossier_squelettes']);
- $squelette = reset($squelette);
- }
$out = array();
- exec("svn $user update $squelette",$out);
+ exec("svn $user update ".$GLOBALS['svn_up_dir_skel'],$out);
if (!$GLOBALS['svn_update_result'] = end($out))
$GLOBALS['svn_update_result'] = 'erreur svn';
}
+}
+
?>