Author: erational@erational.org
Date: Wed Apr 5 10:40:19 2006
New Revision: 2624
Log:
integre prefixe de table ($table_prefix)
Modified:
_contribs_/_rss_/spip2spip/TODO.txt
_contribs_/_rss_/spip2spip/ecrire/spip2spip-install.php3
_contribs_/_rss_/spip2spip/ecrire/spip2spip-syndic.php3
_contribs_/_rss_/spip2spip/ecrire/spip2spip.php3
_contribs_/_rss_/spip2spip/spip2spip-cron.php3
Modified: _contribs_/_rss_/spip2spip/TODO.txt
--- _contribs_/_rss_/spip2spip/TODO.txt (original)
+++ _contribs_/_rss_/spip2spip/TODO.txt Wed Apr 5 10:40:19 2006
@@ -7,7 +7,6 @@
date: 2006.03.27
-----------------------------------------------
-- Gérer préfixe personnalisé dans les tables
- Traduire dans d'autres langues
- Gérer les documents et images. (documents distants ?)
- Pouvoir modifier les paramètres spip2spip-cron via le backoffice (statut par defaut ...)
Modified: _contribs_/_rss_/spip2spip/ecrire/spip2spip-install.php3
--- _contribs_/_rss_/spip2spip/ecrire/spip2spip-install.php3 (original)
+++ _contribs_/_rss_/spip2spip/ecrire/spip2spip-install.php3 Wed Apr 5 10:40:19 2006
@@ -9,10 +9,11 @@
*/
-// FIXME-TODO tester l'existence SQL ? utliser les prefixe tables ?
+// FIXME-TODO tester l'existence SQL ?
// require
include ("inc.php3");
+global $table_prefix;
//-------------------------------
// Main
@@ -29,7 +30,7 @@
//
// spip2spip installed ?
-$sql = "SELECT COUNT(titre) AS c FROM spip_groupes_mots WHERE titre='spip2spip'";
+$sql = "SELECT COUNT(titre) AS c FROM ".$table_prefix."_groupes_mots WHERE titre='spip2spip'";
$k = spip_fetch_array(spip_query($sql));
if ($k['c']==1){
debut_cadre_relief();
@@ -46,24 +47,18 @@
debut_cadre_relief();
// creer table spip2spip
echo "<h4>"._T('spiptospip:install_spip2spip_1')."</h4>\n";
-$sql ="CREATE TABLE spip_spip2spip (
+$sql ="CREATE TABLE ".$table_prefix."_spip2spip (
`id` int(5) NOT NULL auto_increment,
`site_titre` varchar(254) NOT NULL default '',
`site_rss` varchar(254) NOT NULL default '',
- `last_syndic` timestamp NOT NULL default '0000-00-00 00:00:00',
+ `last_syndic` timestamp,
PRIMARY KEY (`id`)
);";
spip_query($sql);
-
-// ajout des données site
-echo « <h4> »._T(‹ spiptospip:install_spip2spip_2 ›)."</h4>\n";
-$sql = « INSERT INTO `spip_spip2spip` VALUES (1, ‹ test ›, ‹ http://127.0.0.1/backend_spip2spip.php3 ›); »;
-spip_query($sql);
-
// ajout du groupe mot
echo « <h4> »._T(‹ spiptospip:install_spip2spip_3 ›)."</h4>\n";
-$sql = « INSERT INTO `spip_groupes_mots` VALUES (100, ‹ spip2spip ›, ' ».addslashes(_T(‹ spiptospip:install_spip2spip_4 ›))."’, ‹ ".addslashes(_T(‹ spiptospip:install_spip2spip_5 ›))." ›, ‹ oui ›, ‹ ›, ‹ oui ›, ‹ ›, ‹ oui ›, ‹ ›, ‹ oui ›, ‹ oui ›, ‹ non ›, ‹ ›)";
+$sql = « INSERT INTO « .$table_prefix. »_groupes_mots VALUES (’’, ‹ spip2spip ›, ' ».addslashes(_T(‹ spiptospip:install_spip2spip_4 ›))."’, ‹ ".addslashes(_T(‹ spiptospip:install_spip2spip_5 ›))." ›, ‹ non ›, ‹ ›, ‹ oui ›, ‹ ›, ‹ oui ›, ‹ ›, ‹ oui ›, ‹ oui ›, ‹ non ›, ‹ ›)";
spip_query($sql);
echo "<div style='color:green;margin:10px 0'>"._T('spiptospip:install_spip2spip_99')."</div>";
Modified: _contribs_/_rss_/spip2spip/ecrire/spip2spip-syndic.php3
--- _contribs_/_rss_/spip2spip/ecrire/spip2spip-syndic.php3 (original)
+++ _contribs_/_rss_/spip2spip/ecrire/spip2spip-syndic.php3 Wed Apr 5 10:40:19 2006
@@ -17,6 +17,7 @@
//-------------------------------
// Recupere la config
//-------------------------------
+global $table_prefix;
// groupe mot cle "licence" installe ? (contrib: http://www.spip-contrib.net/Filtre-Licence )
if (get_id_groupemot("licence")) $isLicenceInstalled = true;
else $isLicenceInstalled = false;
@@ -42,9 +43,9 @@
// recuperer les sites à syndiquer
if (isset($_GET['id_site'])) {
$id_site = (int) $_GET['id_site'];
- $sql = "SELECT * FROM spip_spip2spip WHERE id=$id_site";
+ $sql = "SELECT * FROM ".$table_prefix."_spip2spip WHERE id=$id_site";
} else {
- $sql = "SELECT * FROM spip_spip2spip"; // on syndique tous les sites
+ $sql = "SELECT * FROM ".$table_prefix."_spip2spip"; // on syndique tous les sites
}
$sites = spip_query($sql);
while($row_site = spip_fetch_array($sites)) {
@@ -68,7 +69,7 @@
// Est que l'article n'a pas été déjà importée ?
if (isset($article['titre'])) {
$current_titre = $article['titre'];
- $sql2 = "SELECT COUNT(titre) as c FROM spip_articles WHERE titre='".addslashes($current_titre)."'";
+ $sql2 = "SELECT COUNT(titre) as c FROM ".$table_prefix."_articles WHERE titre='".addslashes($current_titre)."'";
$nb_article = spip_fetch_array(spip_query($sql2));
if ($nb_article['c']!=0) {
// article déjà connu
@@ -106,7 +107,7 @@
$_ps .= addslashes(_T('spiptospip:article_license'))." ".$_licence;
// ....dans la table articles
- $sql3 = "INSERT INTO spip_articles (lang,surtitre,titre,soustitre,id_rubrique,descriptif,chapo,texte,ps,statut,accepter_forum,date) ";
+ $sql3 = "INSERT INTO ".$table_prefix."_articles (lang,surtitre,titre,soustitre,id_rubrique,descriptif,chapo,texte,ps,statut,accepter_forum,date) ";
$sql3.="VALUES( '$_lang','$_surtitre','$_titre','$_soustitre',$_id_rubrique,'$_descriptif','$_chapo','$_texte','$_ps','$_statut','pos','$_date')";
spip_query($sql3);
$id_nouvel_article = spip_insert_id();
@@ -119,7 +120,7 @@
foreach($auteurs as $auteur) {
$id_auteur = get_id_auteur($auteur);
if ($id_auteur) {
- $sql="INSERT INTO spip_auteurs_articles (id_auteur, id_article) VALUES ($id_auteur, $id_nouvel_article)";
+ $sql="INSERT INTO ".$table_prefix."_auteurs_articles (id_auteur, id_article) VALUES ($id_auteur, $id_nouvel_article)";
spip_query($sql);
}
}
@@ -129,7 +130,7 @@
if ($_licence !="" && isLicenceInstalled) {
$id_mot = get_id_mot($_licence);
if ($id_mot) {
- $sql = "INSERT INTO spip_mots_articles (id_mot, id_article) VALUES ($id_mot,$id_nouvel_article)";
+ $sql = "INSERT INTO ".$table_prefix."_mots_articles (id_mot, id_article) VALUES ($id_mot,$id_nouvel_article)";
spip_query($sql);
}
}
@@ -162,7 +163,7 @@
}
// update syndic date
- $sql = "UPDATE spip_spip2spip SET last_syndic = NOW() WHERE id=$current_id LIMIT 1";
+ $sql = "UPDATE ".$table_prefix."_spip2spip SET last_syndic = NOW() WHERE id=$current_id LIMIT 1";
spip_query($sql);
}
Modified: _contribs_/_rss_/spip2spip/ecrire/spip2spip.php3
--- _contribs_/_rss_/spip2spip/ecrire/spip2spip.php3 (original)
+++ _contribs_/_rss_/spip2spip/ecrire/spip2spip.php3 Wed Apr 5 10:40:19 2006
@@ -14,6 +14,7 @@
include_ecrire ("inc_config.php3");
include_ecrire ("inc-spip2spip.php3");
+global $table_prefix;
//-------------------------------
// Some action ?
@@ -22,14 +23,14 @@
// del ?
if ($_GET['action'] == 'del') {
$my_id = $_GET['id'];
- $sql = "DELETE FROM spip_spip2spip WHERE id = $my_id LIMIT 1";
+ $sql = "DELETE FROM ".$table_prefix."_spip2spip WHERE id = $my_id LIMIT 1";
spip_query($sql);
}
// add ?
if ($_GET['action'] == 'add') {
$my_url = addslashes(trim($_GET['url']));
$my_site = addslashes(trim($_GET['site']));
- $sql = "INSERT INTO spip_spip2spip VALUES ('', '".$my_site."' ,'".$my_url."','0000-00-00 00:00:00');";
+ $sql = "INSERT INTO ".$table_prefix."_spip2spip VALUES ('', '".$my_site."' ,'".$my_url."','0000-00-00 00:00:00');";
spip_query($sql);
}
}
@@ -37,6 +38,7 @@
//-------------------------------
// Main
//-------------------------------
+
debut_page(_T('spiptospip:copy_spip2spip'), "administration", "configuration","contenu");
echo "<br / ><br />";
gros_titre(_T('spiptospip:copy_spip2spip'));
@@ -52,7 +54,7 @@
//
// spip2spip installed ?
-$sql = "SELECT COUNT(titre) AS c FROM spip_groupes_mots WHERE titre='spip2spip'";
+$sql = "SELECT COUNT(titre) AS c FROM ".$table_prefix."_groupes_mots WHERE titre='spip2spip'";
$k = spip_fetch_array(spip_query($sql));
if ($k['c']!=1){
debut_cadre_relief();
@@ -70,7 +72,7 @@
echo "<h3>"._T('spiptospip:site_manage')."</h3>\n";
// sites inscrits
-$sql = "SELECT * FROM spip_spip2spip ORDER BY site_titre";
+$sql = "SELECT * FROM ".$table_prefix."_spip2spip ORDER BY site_titre";
$result_copie = spip_query($sql);
echo "<table border='0' cellpadding=3 cellspacing=0 width='100%' class='arial2'>\n";
echo "<tr style='background:#ff6600;font-weight:bold;'>\n";
Modified: _contribs_/_rss_/spip2spip/spip2spip-cron.php3
--- _contribs_/_rss_/spip2spip/spip2spip-cron.php3 (original)
+++ _contribs_/_rss_/spip2spip/spip2spip-cron.php3 Wed Apr 5 10:40:19 2006
@@ -17,6 +17,7 @@
//-------------------------------
// Recupere la config
//-------------------------------
+global $table_prefix;
// groupe mot cle "licence" installe ? (contrib: http://www.spip-contrib.net/Filtre-Licence )
if (get_id_groupemot("licence")) $isLicenceInstalled = true;
[... 56 lines stripped ...]