Subversion Repositories Applications.projet

Compare Revisions

Regard whitespace Rev 431 → Rev 399

/trunk/jrest/cli.php
File deleted
\ No newline at end of file
/trunk/jrest/util/images/pme-delete.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/pme-change.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/pme-copy.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/pme-view.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/alt/pme-delete.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/alt/pme-change.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/alt/pme-copy.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/images/alt/pme-view.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/jrest/util/cel_inventory.php
File deleted
/trunk/jrest/util/phpMyEditSetup.php
File deleted
/trunk/jrest/util/phpMyEdit.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-messages.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-report.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-htmlarea.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-slide.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-mce-cal.class.php
File deleted
/trunk/jrest/util/extensions/phpMyEdit-calpopup.class.php
File deleted
/trunk/jrest/util/lang/PME.lang.RU.inc
File deleted
/trunk/jrest/util/lang/PME.lang.EN-US.inc
File deleted
/trunk/jrest/util/lang/PME.lang.DE.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ZH-SG.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ES-MX.inc
File deleted
/trunk/jrest/util/lang/PME.lang.DK.inc
File deleted
/trunk/jrest/util/lang/PME.lang.EL.inc
File deleted
/trunk/jrest/util/lang/PME.lang.EN.inc
File deleted
/trunk/jrest/util/lang/PME.lang.FR.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ES.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ES-AR.inc
File deleted
/trunk/jrest/util/lang/PME.lang.SE.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ET.inc
File deleted
/trunk/jrest/util/lang/PME.lang.NL.inc
File deleted
/trunk/jrest/util/lang/PME.lang.EU.inc
File deleted
/trunk/jrest/util/lang/PME.lang.PL.inc
File deleted
/trunk/jrest/util/lang/PME.lang.IT.inc
File deleted
/trunk/jrest/util/lang/PME.lang.CZ.inc
File deleted
/trunk/jrest/util/lang/PME.lang.SK.inc
File deleted
/trunk/jrest/util/lang/PME.lang.RO.inc
File deleted
/trunk/jrest/util/lang/PME.lang.ZH.inc
File deleted
/trunk/jrest/util/lang/PME.lang.PT.inc
File deleted
/trunk/jrest/util/lang/PME.lang.CA.inc
File deleted
/trunk/jrest/util/lang/PME.lang.PT-BR.inc
File deleted
/trunk/jrest/util/lang/PME.lang.TR.inc
File deleted
/trunk/jrest/XML/Parser/Simple.php
File deleted
/trunk/jrest/XML/RSS.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Tree/Node.php
File deleted
/trunk/jrest/XML/Parser.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS11Element.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS2Element.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS1.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS11.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS2.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/AtomElement.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS09Element.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/Exception.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/Atom.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS09.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/Type.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Feed/Parser/RSS1Element.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Util.php
File deleted
\ No newline at end of file
/trunk/jrest/XML/Tree.php
File deleted
/trunk/jrest/lib/PDFProductor.php
File deleted
/trunk/jrest/lib/WdHTMLParser.php
File deleted
\ No newline at end of file
/trunk/jrest/lib/Writer.php
File deleted
/trunk/jrest/lib/Log.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Format.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Worksheet.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/OLEwriter.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Parser.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Workbook.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer/BIFFwriter.php
File deleted
/trunk/jrest/lib/Spreadsheet/Excel/Writer.php
File deleted
/trunk/jrest/lib/ezmlmAccessObject.class.php
File deleted
\ No newline at end of file
/trunk/jrest/lib/zip.php
File deleted
/trunk/jrest/lib/PEAR.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/timesb.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/helvetica.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/symbol.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/helveticab.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/courier.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/timesi.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/timesbi.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/zapfdingbats.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/helveticai.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/helveticabi.php
File deleted
/trunk/jrest/lib/File/PDF/fonts/times.php
File deleted
/trunk/jrest/lib/HTTP/Download.php
File deleted
/trunk/jrest/lib/HTTP/HTTP/Header.php
File deleted
/trunk/jrest/lib/JSON.php
File deleted
/trunk/jrest/lib/PDF.php
File deleted
/trunk/jrest/lib/SpreadsheetProductor.php
File deleted
/trunk/jrest/services/ProjetSyndication.php
File deleted
/trunk/jrest/services/squelettes/rss1.tpl.xml
File deleted
\ No newline at end of file
/trunk/jrest/services/squelettes/rss2.tpl.xml
File deleted
/trunk/jrest/services/squelettes/diff.tpl.html
File deleted
\ No newline at end of file
/trunk/jrest/services/squelettes/atom.tpl.xml
File deleted
\ No newline at end of file
/trunk/jrest/services/MigrationWiki.php
4,10 → 4,15
const dry_run = false;
public function __construct($config, $demarrer_session= true) {
parent::__construct($config, $demarrer_session);
define('NL',"\n");
}
private function executerRequeteManip($requete, $mode_fetch = false) {
// Fonction de commodité pour afficher les requetes au lieu de les executer
if (self::dry_run) {
echo str_replace('),','),'.NL, $requete);
echo '<pre>'.str_replace('),','),'.NL, $requete).'</pre>';
return true;
} else {
if($mode_fetch) {
20,20 → 25,17
private function executerRequete($requete, $mode_fetch = false) {
if (self::dry_run) {
echo '<pre>'.str_replace('),','),'.NL, $requete).'</pre>';
echo '<pre>'.str_replace('),','),'.NL, $requete).'</pre>'.NL.NL;
}
 
$retour = $this->bdd->query($requete)->fetchAll($mode_fetch);
return $retour;
return $this->bdd->query($requete)->fetchAll($mode_fetch);
}
public function __construct($config, $demarrer_session= true) {
parent::__construct($config, $demarrer_session);
define('NL',"\n");
}
public function getElement($uid){
 
public function getElement($uid){
exit;
$nom_admin = $this->config['appli']['nom_admin_wiki'];
$mail_admin = $this->config['appli']['adresse_admin_wiki'];
$pass_admin = $this->config['appli']['pass_admin_wiki'];
 
$requete_projets_wikinis = 'SELECT * FROM gen_wikini';
$wikinis_projets = $this->executerRequete($requete_projets_wikinis, PDO::FETCH_ASSOC);
40,15 → 42,16
foreach($wikinis_projets as $wikini) {
 
// test sur un wiki
if($wikini['gewi_code_alpha_wikini'] != 'relais') {
/*if($wikini['gewi_code_alpha_wikini'] != 'bibliobota') {
continue;
}
}*/
 
$base = $wikini['gewi_bdd_nom'];
$prefixe = $wikini['gewi_table_prefix'];
$chemin_wiki_sur_site = $this->config['appli']['chemin_wikis_integres'];
$chemin_wiki = $wikini['gewi_chemin'];
//$chemin_wiki = $wikini['gewi_chemin'];
$chemin_wiki = '/home/aurelien/web/wikini/'.$wikini['gewi_code_alpha_wikini'];
echo NL.'Traitement du wiki '.$chemin_wiki.NL;
echo NL.$chemin_wiki.NL;
60,24 → 63,23
$chemin_base_wiki_defaut = $this->config['appli']['chemin_wiki_defaut'];
$nom_admin = $this->config['appli']['nom_admin_wiki'];
$mail_admin = $this->config['appli']['adresse_admin_wiki'];
$pass_admin = $this->config['appli']['pass_admin_wiki'];
$infos_admin = array('name' =>$nom_admin, 'email' => $mail_admin, 'password' => $pass_admin);
//if(!$this->verifierPresenceTableTriple($base, $prefixe)) {
if(!$this->verifierPresenceTableTriple($base, $prefixe)) {
echo 'migration du wiki '.$wikini['gewi_code_alpha_wikini'].NL;
// $this->creerTableTriple($base, $prefixe);
// $this->ajouterUtilisateurAdmin($base,$prefixe, $infos_admin);
$this->creerTableTriple($base, $prefixe);
$this->ajouterUtilisateurAdmin($base,$prefixe, $infos_admin);
$this->copierFichiersWikini($chemin_base_wiki_defaut, $chemin_wiki);
$this->changerVersionWakkaConfig($chemin_wiki);
echo 'migration du wiki '.$wikini['gewi_code_alpha_wikini'].' effectuée '.NL.NL.NL.NL;
//} else {
// echo 'wiki dejà à jour '.$wikini['gewi_code_alpha_wikini'].NL.NL.NL.NL;
//}
} else {
echo 'wiki dejà à jour '.$wikini['gewi_code_alpha_wikini'].NL.NL.NL.NL;
}
$this->ajoutPageFormatees($chemin_wiki, $infos_admin);
}
}
 
private function verifierPresenceTableTriple($base, $prefixe) {
148,7 → 150,7
$this->executerRequeteManip($requete_suppression_si_admin_present);
$requete_creation_admin = "INSERT INTO ".$base.'.'.$prefixe."users SET ".
$requete_creation_admin = "insert into ".$base.'.'.$prefixe."users set ".
"signuptime = now(), ".
"name = '".$infos_admin['name']."', ".
"email = '".$infos_admin['email']."', ".
159,9 → 161,9
private function changerVersionWakkaConfig($chemin_wikini) {
 
if(file_exists($chemin_wikini.'/wakka.config.php')) {
if(file_exists($chemin_wikini.'wakka.config.php')) {
$contenu_wakka_config = file_get_contents($chemin_wikini.'/wakka.config.php');
$contenu_wakka_config = file_get_contents($chemin_wikini.'wakka.config.php');
$contenu_wakka_config_maj = str_replace('"wikini_version" => "0.4.3"','"wikini_version" => "0.5.0"',$contenu_wakka_config);
$contenu_wakka_config_maj = str_replace("'wikini_version' => '0.4.3'","'wikini_version' => '0.5.0'",$contenu_wakka_config_maj);
168,28 → 170,104
if(self::dry_run) {
echo 'Wakka Config mis à jour '.$contenu_wakka_config_maj.NL;
} else {
file_put_contents($chemin_wikini.'/wakka.config.php', $contenu_wakka_config_maj);
//file_put_contents($chemin_wikini.'wakka.config.php', $contenu_wakka_config_maj);
}
echo 'Changement de la version de wikini '.NL;
} else {
echo 'Attention ! le fichier '.$chemin_wikini.'/wakka.config.php n\'existe pas '.NL;
echo 'Attention ! le fichier '.$chemin_wikini.'wakka.config.php n\'existe pas '.NL;
}
}
private function copierFichiersWikini($chemin_base_wiki_defaut, $chemin_wiki_dest) {
if(self::dry_run) {
echo 'copie de '.$chemin_base_wiki_defaut.' vers '.$chemin_wiki_dest.NL;
if(self::dry_run) {
$copie_recursive = true;
} else {
if(trim($chemin_base_wiki_defaut) != '/' && trim($chemin_wiki_dest) != '/') {
echo " cp -Rf -a ".$chemin_base_wiki_defaut."* ".$chemin_wiki_dest."/ 2>&1 ";
$copie_recursive = shell_exec( " cp -Rf -a ".$chemin_base_wiki_defaut."* ".$chemin_wiki_dest."/ 2>&1 " );
$copie_recursive = shell_exec( " cp -Rf -a ".$chemin_base_wiki_defaut."* ".$chemin_wiki_dest." 2>&1 " );
}
}
return $copie_recursive;
}
private function ajoutPageFormatees($chemin_wikini, $utilisateur) {
$chemin_base_wiki_defaut = $this->config['appli']['chemin_wiki_defaut'];
require_once($chemin_base_wiki_defaut.'wakka_class.php');
$nom_admin = $this->config['appli']['nom_admin_wiki'];
$chemin_wikini = rtrim($chemin_wikini,'/');
require_once($chemin_wikini.'/wakka.config.php');
// la variable $wakkaConfig est contenu dans le fichier wakka.config.php
$config = $wakkaConfig;
$wiki = new Wiki($config);
$wiki->SetGroupACL("admins", $nom_admin);
$wiki->setUser($utilisateur);
//insertion des pages de documentation et des pages standards
$d = dir($chemin_base_wiki_defaut.'/setup/doc/');
while ($doc = $d->read()){
if (is_dir($doc) || substr($doc, -4) != '.txt') {continue;}
$pagecontent = implode ('', file($chemin_base_wiki_defaut.'/setup/doc/'.$doc));
$pagecontent = mb_convert_encoding($pagecontent,'UTF-8','ISO-8859-15');
if ($doc=='_root_page.txt'){
$pagename = $config["root_page"];
}else{
$pagename = substr($doc,0,strpos($doc,'.txt'));
}
?>
$base = $config['mysql_database'];
$requete_existence_page = "Select tag from ".$base.".".$config['table_prefix']."pages where tag='$pagename'";
$existence_page = $this->executerRequete($requete_existence_page);
if (is_array($existence_page) && count($existence_page) > 0) {
echo 'la page '.$pagename.' existe déjà '.NL;
} else {
echo 'Ajout de la page '.$pagename.NL;
$requete_maj_pages_anciennes = "UPDATE ".$base.".".$config['table_prefix']."pages ".
"SET ".
"latest = 'N'".
"WHERE tag = '$pagename'";
$reussite = $this->executerRequeteManip($requete_maj_pages_anciennes);
$requete_insertion_page = "INSERT INTO ".$base.".".$config['table_prefix']."pages ".
"SET tag = '$pagename', ".
"body = ".$this->bdd->quote($pagecontent).", ".
"user = '".$nom_admin."', ".
"owner = '".$nom_admin."', " .
"time = now(), ".
"latest = 'Y'";
$reussite = $this->executerRequeteManip($requete_insertion_page);
if(!$reussite) {
echo 'echec de l\'ajout de la page '.$pagename.NL;
} else {
// mise à jour des liens entre pages
$wiki->SetPage($wiki->LoadPage($pagename,"",0));
$wiki->ClearLinkTable();
$wiki->StartLinkTracking();
$wiki->TrackLinkTo($pagename);
$wiki->StopLinkTracking();
$wiki->WriteLinkTable();
$wiki->ClearLinkTable();
}
}
}
}
}
?>
/trunk/jrest/services/Resume.php
30,11 → 30,12
'(SELECT psu_id_projet FROM projet_statut_utilisateurs'.
' WHERE psu_id_utilisateur = '.$this->bdd->quote($id_utilisateur).')'.
' GROUP BY ps_ce_projet'.
' ORDER BY ps_msg_derniere_semaine DESC';
' ORDER BY ps_msg_derniere_semaine DESC'.
' LIMIT 0,5';
$resume = array();
 
$resume['titre'] = 'Mes projets les plus actifs';
$resume['titre'] = 'Vos projets les plus actifs';
$resume['lien_appli'] = '<a href="http://www.tela-botanica.org/page:liste_projets"> Voir tous les projets </a>';
 
$projets = $this->bdd->query($requete_projets)->fetchAll();
/trunk/jrest/services/Documents.php
34,7 → 34,7
$resume = array();
 
$resume['titre'] = 'Mes derniers documents déposés';
$resume['titre'] = 'Vos derniers documents déposés';
//$resume['lien_appli'] = '<a href="http://www.tela-botanica.org/page:liste_projets"> Voir tous les projets </a>';
 
$docs = $this->bdd->query($requete_docs_projets)->fetchAll();
46,8 → 46,6
$infos_projet = $this->obtenirInformationsProjet($doc['pd_ce_projet']);
//print_r($infos_projet);
$nom_projet = $infos_projet[0]['p_titre'];
$date_formatee = strftime( "%d/%m/%Y" , strtotime( $doc['pd_date_de_mise_a_jour'] ) );
/trunk/jrest/services/ProjetService.php
86,6 → 86,28
return $listes_projets;
}
protected function obtenirListesExternesAssocieesAuProjet($id_projet) {
 
$requete_liste_projets = 'SELECT * FROM agora '.
'WHERE plle_id_liste IN '.
'(SELECT plle_id_liste from projet_lien_liste_externe '.
'WHERE plle_id_projet='.$this->bdd->quote($id_projet).')' ;
 
try {
$listes_projets = $this->bdd->query($requete_liste_projets)->fetchAll(PDO::FETCH_ASSOC);
} catch (PDOException $e) {
Log::getInstance()->ajouterEntree('projet','Fichier: '.$e->getFile().' Ligne: '.$e->getLine().' '.$e->getMessage());
return array();
}
 
 
if(!$listes_projets || count($listes_projets) <= 0) {
return array();
}
 
return $listes_projets;
}
protected function supprimerInscriptionAListeProjet($id_utilisateur, $id_liste) {
$requete_suppression_liste = 'DELETE FROM projet_inscription_liste '.
118,6 → 140,7
 
try {
$est_abonne = '0' ;
// TODO: externaliser l'adresse
$xml_abonne = new SimpleXMLElement(file_get_contents('http://vpopmail.tela-botanica.org/est_abonne.php?domaine=tela-botanica.org&liste='.$nom_liste.'&mail='.$mail)) ;
$est_abonne = $xml_abonne[0] ;
 
139,10 → 162,12
}
 
protected function inscriptionListe($nom_liste, $mail) {
// TODO: externaliser l'adresse
return $inscription_abonne = file_get_contents('http://vpopmail.tela-botanica.org/ajout_abonne.php?domaine=tela-botanica.org&liste='.$nom_liste.'&mail='.$mail) ;
}
 
protected function desinscriptionListe($nom_liste, $mail) {
// TODO: externaliser l'adresse
return $suppression_abonne = file_get_contents('http://vpopmail.tela-botanica.org/suppression_abonne.php?domaine=tela-botanica.org&liste='.$nom_liste.'&mail='.$mail) ;
}
}
/trunk/jrest/jrest.ini.php
1,30 → 1,24
;<?/*
[settings]
baseURL = "/client/projet/jrest/"
baseURL = "/projet_bp/jrest/"
 
; Default
[appli]
phptype = mysql
username = telabotap
password = "shah=Ph3"
username = aurelien
password = Canard
hostspec = localhost
database = tela_prod_v4
database = papyrus_bp
url_service_liste = vpopmail.tela-botanica.org/
domaine_service_liste = tela-botanica.org
url_base_projet = http://www.tela-botanica.org/page:liste_projets
guid = urn:lsid:tela-botanica.org:%s:%s
adresse_appli_projet = http://www.tela-botanica.org/page:liste_projets
addresse_telechargement_docs = http://www.tela-botanica.org/projets/%s/telechargement/%s
 
chemin_wikis_integres = /home/telabotap/www/wikini/
chemin_wiki_defaut = /home/telabotap/www/client/integrateur_wikini/bibliotheque/wikini_0_5/
nom_admin_wiki = WikiAdmin
adresse_admin_wiki = accueil@tela-botanica.org
pass_admin_wiki = "wqa&WQA1"
 
; Identification
[database_ident]
phptype = mysql
username = telabotap
password = "shah=Ph3"
username = aurelien
password = Canard
hostspec = localhost
database = tela_prod
annuaire = annuaire_tela
35,7 → 29,7
 
; LOGS
[log]
cheminlog = "/client/projet/jrest/logs/"
cheminlog = "/home/aurelien/Logs/"
timezone = "Europe/Paris"
taillemax = 100000