diff --git a/.gitattributes b/.gitattributes
index 01cb9d8b5b538e08f738018adcf82550e2660c69..148efe3d59cec96e0b3f70888cae4c6e34844e54 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -293,6 +293,7 @@ ecrire/inc_mini_nav.php -text
ecrire/inc_minipres.php -text
ecrire/inc_naviguer.php -text
ecrire/inc_popularites.php3 -text
+ecrire/inc_sites_edit.php -text
ecrire/inc_spip_cal.php -text
ecrire/inc_spip_image.php -text
ecrire/inc_statistiques_repartition.php -text
diff --git a/ecrire/inc_sites_edit.php b/ecrire/inc_sites_edit.php
new file mode 100644
index 0000000000000000000000000000000000000000..e25b1da5df50d9998fa4a376401b54fef4b4eb9a
--- /dev/null
+++ b/ecrire/inc_sites_edit.php
@@ -0,0 +1,209 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2005 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+if (!defined("_ECRIRE_INC_VERSION")) return;
+include_ecrire("inc_presentation.php3");
+
+function sites_edit()
+{
+ global $champs_extra, $clean_link, $connect_statut, $descriptif, $id_rubrique, $id_secteur, $id_syndic, $new, $nom_site, $syndication, $target, $url_site, $url_syndic;
+
+$query = "SELECT * FROM spip_syndic WHERE id_syndic=" . intval($id_syndic);
+$result = spip_query($query);
+if ($row = spip_fetch_array($result)) {
+ $id_syndic = $row["id_syndic"];
+ $id_rubrique = $row["id_rubrique"];
+ $nom_site = $row["nom_site"];
+ $url_site = $row["url_site"];
+ $url_syndic = $row["url_syndic"];
+ $descriptif = $row["descriptif"];
+ $syndication = $row["syndication"];
+ $extra=$row["extra"];
+}
+else {
+ $syndication = 'non';
+ $new = 'oui';
+ if (!intval($id_rubrique))
+ list($id_rubrique) = spip_fetch_array(spip_query("SELECT id_rubrique FROM spip_rubriques WHERE id_parent='0' ORDER BY titre LIMIT 1"));
+
+}
+
+debut_page(_T('info_site_reference_2'), "documents", "sites");
+
+debut_grand_cadre();
+
+afficher_hierarchie($id_rubrique);
+
+fin_grand_cadre();
+
+debut_gauche();
+debut_droite();
+debut_cadre_formulaire();
+
+echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
+echo "<tr width='100%'>";
+
+if ($new != 'oui') {
+ echo "<td>";
+ icone(_T('icone_retour'), "sites.php3?id_syndic=$id_syndic", 'site-24.gif', "rien.gif");
+ echo "</td>";
+ echo "<td>". http_img_pack('rien.gif', " ", "width='10'") . "</td>\n";
+}
+echo "<td width='100%'>";
+echo _T('titre_referencer_site');
+gros_titre($nom_site);
+echo "</td></tr></table>";
+echo "<p>";
+
+
+
+if ($new == 'oui'){
+
+ if ($connect_statut == '0minirezo' OR $GLOBALS['meta']["proposer_sites"] > 0) {
+ debut_cadre_relief("site-24.gif");
+
+ $link = new Link('sites.php3');
+ $link->addVar('id_rubrique', $id_rubrique);
+ $link->addVar('new', 'oui');
+ $link->addVar('redirect', $clean_link->getUrl());
+ $link->addVar('analyser_site', 'oui');
+ echo $link->getForm();
+
+ echo "<font face='Verdana,Arial,Sans,sans-serif' size=2>"._T('texte_referencement_automatique')."</font>";
+ echo "<div align='right'><input type=\"text\" name=\"url\" class='fondl' value=\"http://\">";
+ echo "<input type=\"submit\" name=\"submit\" value=\""._T('bouton_ajouter')."\" class='fondo'>";
+
+ fin_cadre_relief();
+ echo "</form>";
+
+ echo "<p><blockquote><b>"._T('texte_non_fonction_referencement')."</b>";
+ $cadre_ouvert = true;
+ debut_cadre_enfonce("site-24.gif");
+
+ }
+
+}
+
+$link = new Link($target);
+$link->addVar('new');
+$link->addVar('modifier_site', 'oui');
+$link->addVar('syndication_old', $syndication);
+echo $link->getForm('POST');
+
+$nom_site = entites_html($nom_site);
+$url_site = entites_html($url_site);
+$url_syndic = entites_html($url_syndic);
+
+echo _T('info_nom_site_2')."<br>";
+echo "<input type='text' class='formo' name='nom_site' value=\"$nom_site\" size='40'><p>";
+if (strlen($url_site)<8) $url_site="http://";
+echo _T('entree_adresse_site')."<br>";
+echo "<input type='text' class='formo' name='url_site' value=\"$url_site\" size='40'><p>";
+
+ if ($id_rubrique == 0) $logo_parent = "racine-site-24.gif";
+ else {
+ $query = "SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'";
+ $result=spip_query($query);
+ while($row=spip_fetch_array($result)){
+ $parent_parent=$row['id_parent'];
+ }
+ if ($parent_parent == 0) $logo_parent = "secteur-24.gif";
+ else $logo_parent = "rubrique-24.gif";
+ }
+
+ debut_cadre_couleur("$logo_parent", false, "", _T('entree_interieur_rubrique'));
+
+ // selecteur de rubriques
+ include_ecrire('inc_rubriques.php3');
+ $restreint = ($GLOBALS['statut'] == 'publie');
+ echo selecteur_rubrique($id_rubrique, 'site', $restreint);
+
+ fin_cadre_couleur();
+
+echo "<p /><b>"._T('entree_description_site')."</b><br>";
+echo "<textarea name='descriptif' rows='8' class='forml' cols='40' wrap=soft>";
+echo $descriptif;
+echo "</textarea>\n";
+
+$activer_syndic = $GLOBALS['meta']["activer_syndic"];
+
+echo "<input type='hidden' name='syndication_old' value=\"$syndication\">";
+
+if ($activer_syndic != "non") {
+ debut_cadre_enfonce();
+ if ($syndication == "non") {
+ echo "<INPUT TYPE='radio' NAME='syndication' VALUE='non' id='syndication_non' CHECKED>";
+ }
+ else {
+ echo "<INPUT TYPE='radio' NAME='syndication' VALUE='non' id='syndication_non'>";
+ }
+ echo " <b><label for='syndication_non'>"._T('bouton_radio_non_syndication')."</label></b><p>";
+
+ if ($syndication == "non") {
+ echo "<INPUT TYPE='radio' NAME='syndication' VALUE='oui' id='syndication_oui'>";
+ }
+ else {
+ echo "<INPUT TYPE='radio' NAME='syndication' VALUE='oui' id='syndication_oui' CHECKED>";
+ }
+ echo " <b><label for='syndication_oui'>"._T('bouton_radio_syndication')."</label></b>";
+ echo aide("rubsyn");
+
+
+ echo "<table cellpadding=0 cellspacing=0 border=0 width=100%><tr><td width=50> </td><td>";
+
+ if (strlen($url_syndic) < 8) $url_syndic = "http://";
+ echo _T('entree_adresse_fichier_syndication');
+ echo "<br>";
+
+ // cas d'une liste de flux detectee par feedfinder : menu
+ if (preg_match(',^select: (.+),', $url_syndic, $regs)) {
+ $feeds = explode(' ',$regs[1]);
+ echo "<select name='url_syndic'>\n";
+ foreach ($feeds as $feed) {
+ echo '<option value="'.entites_html($feed).'">'.$feed."</option>\n";
+ }
+ echo "</select>\n";
+ }
+ // cas normal
+ else {
+ echo "<INPUT TYPE='text' CLASS='formo' NAME='url_syndic' VALUE=\"$url_syndic\" SIZE='40'><P>";
+ echo "<INPUT TYPE='hidden' NAME='old_syndic' VALUE=\"$url_syndic\"";
+ }
+ echo "</td></tr></table>";
+
+ fin_cadre_enfonce();
+}
+else {
+ echo "<INPUT TYPE='Hidden' NAME='syndication' VALUE=\"$syndication\">";
+ echo "<INPUT TYPE='hidden' NAME='url_syndic' VALUE=\"$url_syndic\"";
+}
+
+
+if ($champs_extra) {
+ include_ecrire("inc_extra.php3");
+ extra_saisie($extra, 'sites', intval($id_secteur));
+ }
+
+
+echo "<div ALIGN='right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_enregistrer')."' CLASS='fondo'></div>";
+echo "</FORM>";
+
+if ($cadre_ouvert) {
+ fin_cadre_enfonce();
+ echo "</blockquote>\n";
+}
+
+fin_cadre_formulaire();
+
+fin_page();
+}
+?>
diff --git a/ecrire/sites_edit.php3 b/ecrire/sites_edit.php3
index 8163dd13844698b10f47520d5a42f76ccbcb592f..2fe0d69a9d6849864202a92c72c7a464c539dffd 100644
--- a/ecrire/sites_edit.php3
+++ b/ecrire/sites_edit.php3
@@ -10,226 +10,7 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-
-
include ("inc.php3");
-include_ecrire("inc_presentation.php3");
-include_ecrire("inc_texte.php3");
-include_ecrire("inc_urls.php3");
-include_ecrire("inc_rubriques.php3");
-
-include_ecrire ("inc_sites.php3");
-
-$proposer_sites = $GLOBALS['meta']["proposer_sites"];
-
-function premiere_rubrique(){
- $query="SELECT * FROM spip_rubriques WHERE id_parent='0' ORDER BY titre LIMIT 1";
- $result=spip_query($query);
-
- while($row=spip_fetch_array($result)){
- $my_rubrique=$row['id_rubrique'];
- }
- return $my_rubrique;
-
-}
-
-
-$proposer_sites = $GLOBALS['meta']["proposer_sites"];
-
-$query = "SELECT * FROM spip_syndic WHERE id_syndic='$id_syndic'";
-$result = spip_query($query);
-if ($row = spip_fetch_array($result)) {
- $id_syndic = $row["id_syndic"];
- $id_rubrique = $row["id_rubrique"];
- $nom_site = $row["nom_site"];
- $url_site = $row["url_site"];
- $url_syndic = $row["url_syndic"];
- $descriptif = $row["descriptif"];
- $syndication = $row["syndication"];
- $extra=$row["extra"];
-}
-else {
- $syndication = 'non';
- $new = 'oui';
-}
-if (!$id_rubrique > 0) $id_rubrique = premiere_rubrique();
-
-
-
-debut_page(_T('info_site_reference_2'), "documents", "sites");
-
-
-debut_grand_cadre();
-
-afficher_hierarchie($id_rubrique);
-
-fin_grand_cadre();
-
-
-debut_gauche();
-debut_droite();
-debut_cadre_formulaire();
-
-
-echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
-echo "<tr width='100%'>";
-
-if ($new != 'oui') {
- echo "<td>";
- icone(_T('icone_retour'), "sites.php3?id_syndic=$id_syndic", 'site-24.gif', "rien.gif");
- echo "</td>";
- echo "<td>". http_img_pack('rien.gif', " ", "width='10'") . "</td>\n";
-}
-echo "<td width='100%'>";
-echo _T('titre_referencer_site');
-gros_titre($nom_site);
-echo "</td></tr></table>";
-echo "<p>";
-
-
-
-if ($new == 'oui'){
-
- $proposer_sites = $GLOBALS['meta']["proposer_sites"];
- if ($connect_statut == '0minirezo' OR $proposer_sites > 0) {
- debut_cadre_relief("site-24.gif");
-
- $link = new Link('sites.php3');
- $link->addVar('id_rubrique', $id_rubrique);
- $link->addVar('new', 'oui');
- $link->addVar('redirect', $clean_link->getUrl());
- $link->addVar('analyser_site', 'oui');
- echo $link->getForm();
-
- echo "<font face='Verdana,Arial,Sans,sans-serif' size=2>"._T('texte_referencement_automatique')."</font>";
- echo "<div align='right'><input type=\"text\" name=\"url\" class='fondl' value=\"http://\">";
- echo "<input type=\"submit\" name=\"submit\" value=\""._T('bouton_ajouter')."\" class='fondo'>";
-
- fin_cadre_relief();
- echo "</form>";
-
- echo "<p><blockquote><b>"._T('texte_non_fonction_referencement')."</b>";
- $cadre_ouvert = true;
- debut_cadre_enfonce("site-24.gif");
-
- }
-
-}
-
-
-$link = new Link($target);
-$link->addVar('new');
-$link->addVar('modifier_site', 'oui');
-$link->addVar('syndication_old', $syndication);
-echo $link->getForm('POST');
-
-$nom_site = entites_html($nom_site);
-$url_site = entites_html($url_site);
-$url_syndic = entites_html($url_syndic);
-
-echo _T('info_nom_site_2')."<br>";
-echo "<input type='text' class='formo' name='nom_site' value=\"$nom_site\" size='40'><p>";
-if (strlen($url_site)<8) $url_site="http://";
-echo _T('entree_adresse_site')."<br>";
-echo "<input type='text' class='formo' name='url_site' value=\"$url_site\" size='40'><p>";
-
-
-
- if ($id_rubrique == 0) $logo_parent = "racine-site-24.gif";
- else {
- $query = "SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'";
- $result=spip_query($query);
- while($row=spip_fetch_array($result)){
- $parent_parent=$row['id_parent'];
- }
- if ($parent_parent == 0) $logo_parent = "secteur-24.gif";
- else $logo_parent = "rubrique-24.gif";
- }
-
- debut_cadre_couleur("$logo_parent", false, "", _T('entree_interieur_rubrique'));
-
- // selecteur de rubriques
- include_ecrire('inc_rubriques.php3');
- $restreint = ($GLOBALS['statut'] == 'publie');
- echo selecteur_rubrique($id_rubrique, 'site', $restreint);
-
- fin_cadre_couleur();
-
-echo "<p /><b>"._T('entree_description_site')."</b><br>";
-echo "<textarea name='descriptif' rows='8' class='forml' cols='40' wrap=soft>";
-echo $descriptif;
-echo "</textarea>\n";
-
-$activer_syndic = $GLOBALS['meta']["activer_syndic"];
-
-echo "<input type='hidden' name='syndication_old' value=\"$syndication\">";
-
-if ($activer_syndic != "non") {
- debut_cadre_enfonce();
- if ($syndication == "non") {
- echo "<INPUT TYPE='radio' NAME='syndication' VALUE='non' id='syndication_non' CHECKED>";
- }
- else {
- echo "<INPUT TYPE='radio' NAME='syndication' VALUE='non' id='syndication_non'>";
- }
- echo " <b><label for='syndication_non'>"._T('bouton_radio_non_syndication')."</label></b><p>";
-
- if ($syndication == "non") {
- echo "<INPUT TYPE='radio' NAME='syndication' VALUE='oui' id='syndication_oui'>";
- }
- else {
- echo "<INPUT TYPE='radio' NAME='syndication' VALUE='oui' id='syndication_oui' CHECKED>";
- }
- echo " <b><label for='syndication_oui'>"._T('bouton_radio_syndication')."</label></b>";
- echo aide("rubsyn");
-
-
- echo "<table cellpadding=0 cellspacing=0 border=0 width=100%><tr><td width=50> </td><td>";
-
- if (strlen($url_syndic) < 8) $url_syndic = "http://";
- echo _T('entree_adresse_fichier_syndication');
- echo "<br>";
-
- // cas d'une liste de flux detectee par feedfinder : menu
- if (preg_match(',^select: (.+),', $url_syndic, $regs)) {
- $feeds = explode(' ',$regs[1]);
- echo "<select name='url_syndic'>\n";
- foreach ($feeds as $feed) {
- echo '<option value="'.entites_html($feed).'">'.$feed."</option>\n";
- }
- echo "</select>\n";
- }
- // cas normal
- else {
- echo "<INPUT TYPE='text' CLASS='formo' NAME='url_syndic' VALUE=\"$url_syndic\" SIZE='40'><P>";
- echo "<INPUT TYPE='hidden' NAME='old_syndic' VALUE=\"$url_syndic\"";
- }
- echo "</td></tr></table>";
-
- fin_cadre_enfonce();
-}
-else {
- echo "<INPUT TYPE='Hidden' NAME='syndication' VALUE=\"$syndication\">";
- echo "<INPUT TYPE='hidden' NAME='url_syndic' VALUE=\"$url_syndic\"";
-}
-
-
-if ($champs_extra) {
- include_ecrire("inc_extra.php3");
- extra_saisie($extra, 'sites', $id_secteur);
- }
-
-
-echo "<div ALIGN='right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_enregistrer')."' CLASS='fondo'></div>";
-echo "</FORM>";
-
-if ($cadre_ouvert) {
- fin_cadre_enfonce();
- echo "</blockquote>\n";
-}
-
-fin_cadre_formulaire();
-
-fin_page();
-
+$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
+$var_f();
?>