Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv970
Modified Files:
inc-calcul.php3 inc-forum.php3 inc-messforum.php3
inc-public-global.php3 spip_redirect.php3
Added Files:
htaccess-html.txt htaccess-propres.txt
Removed Files:
inc-urls-dist.php3
Log Message:
backport lab Urlspropres
backport lab <div> pour les documents
backport lab <strong> au lieu de <b> pour les {{}} (pourquoi? je ne sais pas)
Index: inc-calcul.php3
RCS file: /home/spip-cvs/spip/inc-calcul.php3,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- inc-calcul.php3 13 Sep 2004 22:26:23 -0000 1.105
+++ inc-calcul.php3 17 Sep 2004 22:10:47 -0000 1.106
@@ -29,8 +29,10 @@
// Gestionnaire d'URLs
-if (@file_exists("inc-urls.php3")) { include_local ("inc-urls.php3"); }
-else { include_local ("inc-urls-dist.php3"); }
+if (@file_exists("inc-urls.php3"))
+ include_local("inc-urls.php3");
+else
+ include_local("inc-urls-".$GLOBALS['type_urls'].".php3");
// Le squelette compile est-il trop vieux ?
--- inc-urls-dist.php3 DELETED ---
--- NEW FILE: htaccess-html.txt ---
###########################################################
# Fichier .htaccess pour les URLs 'html' ; a installer #
# si vous reglez $type_urls='html' #
# dans ecrire/mes_options.php3 ou dans mes_fonctions.php3 #
# (fichier associe : inc-urls-html.php3) #
###########################################################
RewriteEngine On
### si votre site est en sous-domaine, preciser ci-dessous
# RewriteBase /sous/domaine/
RewriteRule ^rubrique([0-9]+)\.html$ rubrique.php3?id_rubrique=$1 [QSA,L]
RewriteRule ^article([0-9]+)\.html$ article.php3?id_article=$1 [QSA,L]
RewriteRule ^breve([0-9]+)\.html$ breve.php3?id_breve=$1 [QSA,L]
RewriteRule ^mot([0-9]+)\.html$ mot.php3?id_mot=$1 [QSA,L]
RewriteRule ^auteur([0-9]+)\.html$ auteur.php3?id_auteur=$1 [QSA,L]
Index: spip_redirect.php3
RCS file: /home/spip-cvs/spip/spip_redirect.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spip_redirect.php3 26 Aug 2004 03:47:01 -0000 1.6
+++ spip_redirect.php3 17 Sep 2004 22:10:47 -0000 1.7
@@ -4,12 +4,11 @@
include ("ecrire/inc_version.php3");
-if (@file_exists("inc-urls.php3")) {
- include_local ("inc-urls.php3");
-}
-else {
- include_local ("inc-urls-dist.php3");
-}
+// Gestionnaire d'URLs
+if (@file_exists("inc-urls.php3"))
+ include_local("inc-urls.php3");
+else
+ include_local("inc-urls-".$GLOBALS['type_urls'].".php3");
if ($id_article) {
$url = generer_url_article($id_article);
--- NEW FILE: htaccess-propres.txt ---
###########################################################
# Fichier .htaccess pour les URLs propres ; a installer #
# si vous reglez $type_urls='propre' #
# dans ecrire/mes_options.php3 ou dans mes_fonctions.php3 #
# (fichier associe : inc-urls-propres.php3) #
###########################################################
RewriteEngine On
### si votre site est en sous-domaine, preciser ci-dessous
# RewriteBase /sous/domaine/
# Rediriger les mots et breves sans le "+" final
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(\+[^/\.\+]+)$ /$1+ [QSA,R]
# Les mots-cles
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^\+-[^/\.]+-\+$ mot.php3 [QSA,E=url_propre:$0]
# Les breves
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^\+[^/\.]+\+$ breve.php3 [QSA,E=url_propre:$0]
# Les rubriques
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^-[^/\.]+-$ rubrique.php3 [QSA,E=url_propre:$0]
# Les articles
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^[^/\.]+$ article.php3 [QSA,E=url_propre:$0]
Index: inc-public-global.php3
RCS file: /home/spip-cvs/spip/inc-public-global.php3,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- inc-public-global.php3 11 Sep 2004 23:32:28 -0000 1.142
+++ inc-public-global.php3 17 Sep 2004 22:10:47 -0000 1.143
@@ -206,7 +206,7 @@
top: 0px;
left: 0px;
position: absolute;
- "><a href="'.$url.'"><img src="ecrire/img_pack/naviguer-site.gif" align="left" border="0" /></a>
+ "><a href="'.$url.'"><img src="ecrire/img_pack/naviguer-site.png" align="left" border="0" /></a>
'.majuscules(_T('previsualisation')).'</div>';
}
Index: inc-messforum.php3
RCS file: /home/spip-cvs/spip/inc-messforum.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- inc-messforum.php3 27 Aug 2004 04:27:02 -0000 1.10
+++ inc-messforum.php3 17 Sep 2004 22:10:47 -0000 1.11
@@ -6,8 +6,11 @@
include_ecrire('inc_forum.php3');
include_local('inc-forum.php3');
-if (file_exists("inc-urls.php3")) { include_local ("inc-urls.php3"); }
-else {include_local ("inc-urls-dist.php3"); }
+// Gestionnaire d'URLs
+if (@file_exists("inc-urls.php3"))
+ include_local("inc-urls.php3");
+else
+ include_local("inc-urls-".$GLOBALS['type_urls'].".php3");
// Ce fichier inclus par inc-public a un comportement special
// Voir commentaires dans celui-ci et dans inc-forum
Index: inc-forum.php3
RCS file: /home/spip-cvs/spip/inc-forum.php3,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- inc-forum.php3 13 Sep 2004 08:37:29 -0000 1.82
+++ inc-forum.php3 17 Sep 2004 22:10:47 -0000 1.83
@@ -15,12 +15,11 @@
include_ecrire('inc_barre.php3');
include_ecrire('inc_forum.php3');
-if (@file_exists("inc-urls.php3")) {
- include_local ("inc-urls.php3");
-}
-else {
- include_local ("inc-urls-dist.php3");
-}
+// Gestionnaire d'URLs
+if (@file_exists("inc-urls.php3"))
+ include_local("inc-urls.php3");
+else
+ include_local("inc-urls-".$GLOBALS['type_urls'].".php3");
/*******************************/