/trunk/client/integrateur_wikini/integrateur_wikini.php |
---|
21,7 → 21,7 |
// | along with Foobar; if not, write to the Free Software | |
// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
// +------------------------------------------------------------------------------------------------------+ |
// CVS : $Id: integrateur_wikini.php,v 1.8 2005-09-20 20:25:39 ddelon Exp $ |
// CVS : $Id: integrateur_wikini.php,v 1.9 2005-09-23 13:58:07 ddelon Exp $ |
/** |
* Integrateur de page Wikini |
* |
33,7 → 33,7 |
//Autres auteurs : |
*@author Aucun |
*@copyright Tela-Botanica 2000-2004 |
*@version $Revision: 1.8 $ $Date: 2005-09-20 20:25:39 $ |
*@version $Revision: 1.9 $ $Date: 2005-09-23 13:58:07 $ |
* |
// +------------------------------------------------------------------------------------------------------+ |
// | ENTETE du PROGRAMME | |
122,7 → 122,7 |
return $result; |
} |
return Parent::FormOpen($method,$tag, $formMethod); |
return parent::FormOpen($method,$tag, $formMethod); |
} |
// Detournement des handlers : comme ca on peut faire ce que l'on veut .... |
/trunk/client/projet/synchroliste/liste/vide.txt |
---|
--- trunk/client/projet/classes/projetControleur.class.php (revision 452) |
+++ trunk/client/projet/classes/projetControleur.class.php (revision 453) |
@@ -19,7 +19,7 @@ |
// | License along with this library; if not, write to the Free Software | |
// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
// +------------------------------------------------------------------------------------------------------+ |
-// CVS : $Id: projetControleur.class.php,v 1.1 2005-09-22 14:02:48 ddelon Exp $ |
+// CVS : $Id: projetControleur.class.php,v 1.2 2005-09-23 13:58:07 ddelon Exp $ |
/** |
* Application projet |
* |
@@ -31,7 +31,7 @@ |
//Autres auteurs : |
*@author Aucun |
*@copyright Tela-Botanica 2000-2004 |
-*@version $Revision: 1.1 $ |
+*@version $Revision: 1.2 $ |
// +------------------------------------------------------------------------------------------------------+ |
*/ |
@@ -354,6 +354,8 @@ |
$arbre = new arbre() ; |
// recherche du projet principal |
+ $cime=''; |
+ |
foreach ($projetListe as $projet) { |
$this->_url->addQueryString (PROJET_VARIABLE_ID_PROJET, $projet->getId()) ; |
$this->_url->addQueryString(PROJET_VARIABLE_ACTION, PROJET_ACTION_VOIR_PARTICIPANT) ; |
/trunk/client/projet/tmp/ezmlm-php-outildetermination-200507 |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-synthese-200508 |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-outildetermination/200508 |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-outildetermination/200508-checksum |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-outildetermination/200507 |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-outildetermination/200507-checksum |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-synthese/200508 |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/ezmlm-php-synthese/200508-checksum |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/client/projet/tmp/vide.txt |
---|
--- trunk/papyrus/applications/admin_menu/bibliotheque/adme_menu_classique.fonct.php (revision 452) |
+++ trunk/papyrus/applications/admin_menu/bibliotheque/adme_menu_classique.fonct.php (revision 453) |
@@ -32,7 +32,7 @@ |
// pris connaissance de la licence CeCILL, et que vous en avez accepté les |
// termes. |
// ---- |
-// CVS : $Id: adme_menu_classique.fonct.php,v 1.23 2005-09-20 17:01:22 ddelon Exp $ |
+// CVS : $Id: adme_menu_classique.fonct.php,v 1.24 2005-09-23 13:58:07 ddelon Exp $ |
/** |
* Fonctions de gestion des menus classiques |
* |
@@ -48,7 +48,7 @@ |
*@author Alexandre GRANIER <alexandre@tela-botanica.org> |
*@author Laurent COUDOUNEAU <lc@gsite.org> |
*@copyright Tela-Botanica 2000-2004 |
-*@version $Revision: 1.23 $ $Date: 2005-09-20 17:01:22 $ |
+*@version $Revision: 1.24 $ $Date: 2005-09-23 13:58:07 $ |
// +------------------------------------------------------------------------------------------------------+ |
*/ |
@@ -216,7 +216,13 @@ |
// XHTML du nom du menu et de ses infos |
$xhtml_info = htmlentities(empty($ligne->gm_nom) ? ADME_LG_PARENTHESE_OUVRANTE.$ligne->gm_nom.ADME_LG_PARENTHESE_FERMANTE : $ligne->gm_nom); |
$xhtml_info .= ' '; |
- $xhtml_info .= ADME_LG_PARENTHESE_OUVRANTE.$ligne_app->gap_nom.' '.ADME_LG_SLASH.' '.$ligne->ga_prenom.ADME_LG_PARENTHESE_FERMANTE; |
+ if (!isset($ligne_app->gap_nom)) { |
+ $gap_nom=''; |
+ } |
+ else { |
+ $gap_nom=$ligne_app->gap_nom; |
+ } |
+ $xhtml_info .= ADME_LG_PARENTHESE_OUVRANTE.$gap_nom.' '.ADME_LG_SLASH.' '.$ligne->ga_prenom.ADME_LG_PARENTHESE_FERMANTE; |
$xhtml_info .= ' '."\n"; |
//------------------------------------------------------------------------------------------------------------------- |
@@ -261,7 +267,13 @@ |
// Si le menu à une application liée on regarde s'il y a une interface d'administration. |
- if ($ligne_app->gap_id_application != 0 && GEN_verifierPresenceInterfaceAdmin($db, $ligne_app->gap_id_application)) { |
+ if (!isset($ligne_app->gap_id_application)) { |
+ $gap_id_application=0; |
+ } |
+ else { |
+ $gap_id_application=$ligne_app->gap_id_application; |
+ } |
+ if ($gap_id_application != 0 && GEN_verifierPresenceInterfaceAdmin($db, $gap_id_application)) { |
$url->removeQueryString('adme_action'); |
$url->addQueryString('adme_action', ADME_LG_ACTION_ADMINISTRER); |
$xhtml_action .= '<a href="'.$url->getURL().'" title="'.ADME_LG_ACTION_ADMINISTRER_TITLE.'">'. |
@@ -1168,6 +1180,9 @@ |
/* +--Fin du code ----------------------------------------------------------------------------------------+ |
* |
* $Log: not supported by cvs2svn $ |
+* Revision 1.23 2005/09/20 17:01:22 ddelon |
+* php5 et bugs divers |
+* |
* Revision 1.22 2005/07/08 21:13:15 ddelon |
* Gestion indentation menu |
* |
/trunk/sites/commun/generique/squelettes/ateliers.html |
---|
New file |
0,0 → 1,81 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
<html xmlns="http://www.w3.org/1999/xhtml" > |
<head lang="<!-- PAPYRUS_SITE_LANGUE -->" > |
<!-- PAPYRUS_META_HTTP_EQUIV --> |
<title><!-- PAPYRUS_TITRE_PAGE --></title> |
<!-- PAPYRUS_META_NAME --> |
<!-- PAPYRUS_META_NAME_DC --> |
<link rel="stylesheet" type="text/css" media="screen" href="sites/commun/fr/styles/commun_simple.css" /> |
<script type="text/javascript" src="/sites/commun/fr/scripts/commun.js"></script> |
<style type="text/css" media="screen"> |
<!-- @import "sites/commun/fr/styles/commun_complexe.css"; |
@import "sites/atelier/fr/styles/atelier.css";--> |
</style> |
<link rel="stylesheet" type="text/css" media="print" href="sites/commun/fr/styles/impression.css" /> |
<link rel="shortcut icon" type="image/x-icon" href="sites/commun/generique/images/favicones/tela_botanica.ico" /> |
<link rel="icon" type="image/png" href="sites/commun/generique/images/favicones/tela_botanica.png" /> |
<!-- PAPYRUS_STYLES --> |
<!-- PAPYRUS_SCRIPTS --> |
</head> |
<body xml:lang="<!-- PAPYRUS_SITE_LANGUE -->" lang="<!-- PAPYRUS_SITE_LANGUE -->" > |
<div id="reducteur"> |
<div id="logo_tela"> |
<a href="/" title="Retour à l'accueil du site"><img src="/sites/<!-- PAPYRUS_SITE_CODE_ALPHA -->/generique/images/graphisme/Logo-rouge72.gif" alt="le logo de Tela Botanica" width="135" height="102" /></a> |
</div> |
<div id="acces_direct"> |
<a href="#nav_gauche">Aller aux menus</a> |
<a href="#contenu">Aller au texte</a> |
</div> |
<div id="bandeau"> |
<div id="bandeau_contenu"> |
<div id="titre_monde"> |
<h1><!-- PAPYRUS_SITE_NOM --></h1> |
</div> |
<div id="plan_contact"> |
<!-- PAPYRUS_MENU_UNIQUE_9 --> |
<!-- PAPYRUS_MENU_UNIQUE_105 --> |
<!-- PAPYRUS_MENU_UNIQUE_273 --> |
</div> |
</div> |
</div> |
</div> |
<div id="droite"> |
<div id="pos_recherche"> |
<!-- PAPYRUS_MOTEUR_RECHERCHE --> |
<p>Vous êtes ici : <!-- PAPYRUS_VOUS_ETES_ICI --></p> |
</div> |
<div id="onglets"> |
<!-- PAPYRUS_MENU_3_3 --> |
<!-- PAPYRUS_CONTENU_NAVIGATION --> |
|
</div> |
<div id="contenu"> |
<div id="entete"> |
<!-- PAPYRUS_CONTENU_TETE --> |
</div> |
<div id="texte"> |
<!-- start contenu --> |
<!-- PAPYRUS_CONTENU_CORPS --> |
<!-- end contenu --> |
</div> |
<div id="pied_texte"> |
<!-- PAPYRUS_CONTENU_PIED --> |
</div> |
</div> |
</div> |
<div id="nav_gauche"> |
<!-- PAPYRUS_SELECTEUR_SITES_XHTML --> |
<div id="menus"> |
<!-- PAPYRUS_MENU_1_2 --> |
</div> |
<div id="menu_contextuel"> |
<!-- PAPYRUS_IDENTIFICATION --> |
<!-- PAPYRUS_CONTENU_MENU --> |
</div> |
</div> |
<div id="pied_page"> |
<!-- PAPYRUS_MENU_COMMUN_1_1 --> |
<p>© Tela Botanica / 2000-2005 - Le réseau des Botanistes Francophones</p> |
</div> |
</body> |
</html> |
/trunk/sites/commun/generique/squelettes/arbre.html |
---|
New file |
0,0 → 1,81 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
<html xmlns="http://www.w3.org/1999/xhtml" > |
<head lang="fr" > |
<!-- PAPYRUS_META_HTTP_EQUIV --> |
<title><!-- PAPYRUS_TITRE_PAGE --></title> |
<!-- PAPYRUS_META_NAME --> |
<!-- PAPYRUS_META_NAME_DC --> |
<link rel="stylesheet" type="text/css" media="screen" href="sites/commun/fr/styles/commun_simple.css" /> |
<script type="text/javascript" src="/sites/commun/fr/scripts/commun.js"></script> |
<style type="text/css" media="screen"> |
<!-- @import "sites/commun/fr/styles/commun_complexe.css"; |
@import "sites/atelier/fr/styles/atelier.css";--> |
</style> |
<link rel="stylesheet" type="text/css" media="print" href="sites/commun/fr/styles/impression.css" /> |
<link rel="shortcut icon" type="image/x-icon" href="sites/commun/generique/images/favicones/tela_botanica.ico" /> |
<link rel="icon" type="image/png" href="sites/commun/generique/images/favicones/tela_botanica.png" /> |
<!-- PAPYRUS_STYLES --> |
<!-- PAPYRUS_SCRIPTS --> |
</head> |
<body xml:lang="fr" lang="fr" > |
<div id="reducteur"> |
<div id="logo_tela"> |
<a href="/" title="Retour à l'accueil du site"><img src="/sites/atelier/generique/images/graphisme/Logo-rouge72.gif" alt="le logo de Tela Botanica" width="135" height="102" /></a> |
</div> |
<div id="acces_direct"> |
<a href="#nav_gauche">Aller aux menus</a> |
<a href="#contenu">Aller au texte</a> |
</div> |
<div id="bandeau"> |
<div id="bandeau_contenu"> |
<div id="titre_monde"> |
<h1><!-- PAPYRUS_SITE_NOM --></h1> |
</div> |
<div id="plan_contact"> |
<!-- PAPYRUS_MENU_UNIQUE_9 --> |
<!-- PAPYRUS_MENU_UNIQUE_105 --> |
<!-- PAPYRUS_MENU_UNIQUE_273 --> |
</div> |
</div> |
</div> |
<div id="droite"> |
<div id="pos_recherche"> |
<!-- PAPYRUS_MOTEUR_RECHERCHE --> |
<p>Vous êtes ici : <!-- PAPYRUS_VOUS_ETES_ICI --></p> |
</div> |
<div id="onglets"> |
<!-- PAPYRUS_MENU_3_3 --> |
<!-- PAPYRUS_CONTENU_NAVIGATION --> |
|
</div> |
<div id="contenu"> |
<!-- start contenu --> |
<div id="entete"> |
<!-- PAPYRUS_CONTENU_TETE --> |
</div> |
<div id="texte"> |
<!-- PAPYRUS_CONTENU_CORPS --> |
</div> |
<div id="pied_texte"> |
<!-- PAPYRUS_CONTENU_PIED --> |
</div> |
<!-- end contenu --> |
</div> |
</div> |
<div id="nav_gauche"> |
<!-- PAPYRUS_SELECTEUR_SITES_XHTML --> |
<div id="menus"> |
<!-- PAPYRUS_MENU_1_2 --> |
</div> |
<div id="menu_contextuel"> |
<!-- PAPYRUS_IDENTIFICATION --> |
<!-- PAPYRUS_CONTENU_MENU --> |
</div> |
</div> |
</div> |
<div id="pied_page"> |
<!-- PAPYRUS_MENU_COMMUN_1_1 --> |
<p>© Tela Botanica / 2000-2005 - Le réseau des Botanistes Francophones</p> |
</div> |
</body> |
</html> |
/trunk/api/text/wiki_papyrus/Parse/Redirection.php |
---|
New file |
0,0 → 1,46 |
<?php |
// $Id: Redirection.php,v 1.1 2005-09-23 13:58:07 ddelon Exp $ |
/** |
* |
* This class implements a Text_Wiki_Parse to find source text marked as |
* an Interwiki link. See the regex for a detailed explanation of the |
* text matching procedure; e.g., "InterWikiName:PageName". |
* |
* @author Paul M. Jones <pmjones@ciaweb.net> |
* |
* @package Text_Wiki |
* |
*/ |
class Text_Wiki_Parse_Redirection extends Text_Wiki_Parse { |
var $regex = '/\{\{Redirection url="(.+?)"\}\}/'; |
/** |
* |
* Remplace l'action par une liste des pages contenant les mots clés choisis |
* Les options sont: |
* |
* 'mots' => les mots clés séparés par des virgules |
* |
* @access public |
* |
* @param array &$matches The array of matches from parse(). |
* |
* @return A delimited token to be used as a placeholder in |
* the source text, plus any text priot to the match. |
* |
*/ |
function process(&$matches) |
{ |
$options = array( |
'url' => $matches[1] |
); |
return $this->wiki->addToken($this->rule, $options); |
} |
} |
?> |
/trunk/api/text/wiki_papyrus/Papyrus.class.php |
---|
21,7 → 21,7 |
// | along with Foobar; if not, write to the Free Software | |
// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
// +------------------------------------------------------------------------------------------------------+ |
// CVS : $Id: Papyrus.class.php,v 1.6 2005-04-18 16:41:53 jpm Exp $ |
// CVS : $Id: Papyrus.class.php,v 1.7 2005-09-23 13:58:07 ddelon Exp $ |
/** |
* Classe configurant le formatage pour Papyrus. |
* |
36,7 → 36,7 |
//Autres auteurs : |
*@author Aucun |
*@copyright Tela-Botanica 2000-2004 |
*@version $Revision: 1.6 $ $Date: 2005-04-18 16:41:53 $ |
*@version $Revision: 1.7 $ $Date: 2005-09-23 13:58:07 $ |
// +------------------------------------------------------------------------------------------------------+ |
*/ |
78,6 → 78,7 |
'Nouveaute', // Action Nouveaute |
'Plan', // Action Plan |
'Syndication', // Action Syndication |
'Redirection' // Action Redirection |
); |
/** |
283,6 → 284,9 |
/* +--Fin du code ----------------------------------------------------------------------------------------+ |
* |
* $Log: not supported by cvs2svn $ |
* Revision 1.6 2005/04/18 16:41:53 jpm |
* Ajout des actions Plan et Syndication. |
* |
* Revision 1.5 2005/04/14 16:35:42 jpm |
* Ajout de nouvelles actions pour Papyrus XHTML. |
* |
/trunk/api/text/wiki_papyrus/Render/Xhtml/Redirection.php |
---|
New file |
0,0 → 1,26 |
<?php |
class Text_Wiki_Render_Xhtml_Redirection extends Text_Wiki_Render { |
/** |
* |
* Renders a token into text matching the requested format. |
* |
* @access public |
* |
* @param array $options The "options" portion of the token (second |
* element). |
* |
* @return string The text rendered from the token options. |
* |
*/ |
function token($options) |
{ |
// Initialisation des variables |
$sortie = ''; |
$url = $options['url']; |
header("Location: $url"); |
exit; |
} |
} |
?> |