WebSVN – Applications.papyrus – Path Comparison – /

Ignore whitespace Rev 555 → Rev 556

 /trunk/client/integrateur_wikini/bibliotheque/iw_integrateur.fonct.php
 ,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: iw_integrateur.fonct.php,v 1.1 2005-10-17 13:41:34 ddelon Exp $
+// CVS : $Id: iw_integrateur.fonct.php,v 1.2 2005-10-20 10:28:25 ddelon Exp $
 /**
 * Fonctions de l'integrateur de page Wikini
 *
 ,7 → 33,7
 //Autres auteurs :
 *@author        Aucun
 *@copyright     Tela-Botanica 2000-2004
-*@version       $Revision: 1.1 $ $Date: 2005-10-17 13:41:34 $
+*@version       $Revision: 1.2 $ $Date: 2005-10-20 10:28:25 $
 *
 // +------------------------------------------------------------------------------------------------------+
 // |                                            ENTETE du PROGRAMME                                       |
 ,6 → 85,8
 ob_start();
 include_once IW_CHEMIN_WIKINI_COURANT.'wakka.php';
+include_once(IW_CHEMIN_WIKINI_COURANT."/formatters/tableaux.php");
+include_once(IW_CHEMIN_WIKINI_COURANT."/actions/attach.class.php");
 ob_end_clean();
 $_SERVER['PHP_SELF']=$server;
 ,8 → 96,6
 Class Wiki_Papyrus extends Wiki {
-        //TODO : a gauche !
         function Header() {
                 return;

 /trunk/client/integrateur_wikini/bibliotheque/wikini/ACeditor.buttonsBar.php
 New file
 ,0 → 1,43
+<?php
+$ACbuttonsBar = "
+  <div id=\"toolbar\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'**','**');\" src=\"ACEdImages/bold.gif\" title=\"Passe le texte sélectionné en gras  ( Ctrl-Maj-b )\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'//','//');\" src=\"ACEdImages/italic.gif\" title=\"Passe le texte sélectionné en italique ( Ctrl-Maj-t )\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'__','__');\" src=\"ACEdImages/underline.gif\" title=\"Souligne le texte sélectionné ( Ctrl-Maj-u )\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'@@','@@');\" src=\"ACEdImages/strike.gif\" title=\"Barre le texte sélectionné\">
+    <img class=\"buttons\"  src=\"ACEdImages/separator.gif\" >
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'======','======\\n');\" src=\"ACEdImages/t1.gif\" title=\" En-tête énorme\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'=====','=====\\n');\" src=\"ACEdImages/t2.gif\" title=\"  En-tête très gros\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'====','====\\n');\" src=\"ACEdImages/t3.gif\" title=\"  En-tête gros\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'===','===\\n');\" src=\"ACEdImages/t4.gif\" title=\"  En-tête normal\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'==','==');\" src=\"ACEdImages/t5.gif\" title=\"  Petit en-tête\">
+    <img class=\"buttons\"  src=\"ACEdImages/separator.gif\" >
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelectionWithLink(thisForm.body);\" src=\"ACEdImages/link.gif\" title=\"Ajoute un lien au texte sélectionné\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'\\t-&nbsp;','');\" src=\"ACEdImages/listepuce.gif\" title=\"Liste\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'\\t1)&nbsp;','');\" src=\"ACEdImages/listenum.gif\" title=\"Liste numérique\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'\\ta)&nbsp;','');\" src=\"ACEdImages/listealpha.gif\" title=\"Liste alphabéthique\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelectionBis(thisForm.body,'\\n---','');\" src=\"ACEdImages/crlf.gif\" title=\"Insère un retour chariot\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelectionBis(thisForm.body,'\\n------','');\" src=\"ACEdImages/hr.gif\" title=\"Insère une ligne horizontale\">
+    <img class=\"buttons\"  src=\"ACEdImages/separator.gif\" >
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'%%','%%');\" src=\"ACEdImages/code.gif\" title=\"Code\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelection(thisForm.body,'%%(php)','%%');\" src=\"ACEdImages/php.gif\" title=\"Code PHP\">
+  </div>
+  <div id=\"toolbar\">
+    <img class=\"buttons\" onmouseover=\"mouseover(this);\" onmouseout=\"mouseout(this);\" onmousedown=\"mousedown(this);\" onmouseup=\"mouseup(this);\" onclick=\"wrapSelectionWithImage(thisForm.body);\" src=\"ACEdImages/image.gif\"    title=\"insère un tag image \">
+    <span class=\"texteChampsImage\">
+    &nbsp;&nbsp;Fichier&nbsp;<input type=\"text\" name=\"filename\" class=\"ACsearchbox\" size=\"10\">&nbsp;&nbsp;Description&nbsp;<input type=\"text\" name=\"description\" class=\"ACsearchbox\" size=\"10\">
+    &nbsp;&nbsp;Alignement&nbsp;<select id=\"alignment\" class=\"ACsearchbox\">
+      <option value=\"left\">Gauche</option>
+      <option value=\"center\">Centré</option>
+      <option value=\"right\">Droite</option>
+    </select>
+    </span>
+  </div>";
+?>

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACeditor.js
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACeditor.js
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/hr.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/hr.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/link.old.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/link.old.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/code.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/code.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/bold.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/bold.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/image.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/image.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t1.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t1.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/underline.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/underline.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t2.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t2.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t3.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t3.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/crlf.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/crlf.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listealpha.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listealpha.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t4.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t4.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/php.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/php.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t5.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/t5.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/link.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/link.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listepuce.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listepuce.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listenum.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/listenum.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/separator.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/separator.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/strike.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/strike.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/italic.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/client/integrateur_wikini/bibliotheque/wikini/ACEdImages/italic.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/client/integrateur_wikini/bibliotheque/wikini/wakka.php
 ,7 → 380,19
         // FORMS
         function FormOpen($method = "", $tag = "", $formMethod = "post") {
+        /* Debut de la modif ACeditor */
+        // ACEditor: id=\"ACEditor\" name=\"ACEditor\" ci-dessous le if a été ajouté (initialement, seule la ligne du else existait)
+        // si l'url se termine par edit (expression régulière edit$), on est en mode édition et dans ce cas on donne les id et name au formulaire
+        // Sinon surtout pas car ça marche plus dans la mesure ou plusieurs formulaires auraient ces ID et name et dans ce cas
+        // il semble que le dernier soit considéré, c'est à dire pas le bon :o(
+                if (ereg('edit$', $this->href($method, $tag))) {
+                        $result = "<form id=\"ACEditor\" name=\"ACEditor\" action=\"".$this->href($method, $tag)."\" method=\"".$formMethod."\">\n";
+                } else {
                 $result = "<form action=\"".$this->href($method, $tag)."\" method=\"".$formMethod."\">\n";
+                }
+/* fin de la modif ACeditor */
                 if (!$this->config["rewrite_mode"]) $result .= "<input type=\"hidden\" name=\"wiki\" value=\"".$this->MiniHref($method, $tag)."\" />\n";
                 return $result;
         }
 ,11 → 524,12
                 if ($ids = $this->LoadAll("select min(id) as id from ".$this->config["table_prefix"]."pages where comment_on != '' group by tag order by id desc"))
                 {
                         // load complete comments
-                        $num=0;
                         foreach ($ids as $id)
                         {
                                 $comment = $this->LoadSingle("select * from ".$this->config["table_prefix"]."pages where id = '".$id["id"]."' limit 1");
-                                if (!isset($comments[$comment["comment_on"]]) && $num < $limit)
+                                $num=0;
+                                if (!isset($comments[$comment["comment_on"]])) $comments[$comment["comment_on"]]='';
+                                if (!$comments[$comment["comment_on"]] && $num < $limit)
                                 {
                                         $comments[$comment["comment_on"]] = $comment;
                                         $num++;
 ,6 → 735,7
         "default_write_acl"     => "*",
         "default_read_acl"      => "*",
         "default_comment_acl"   => "*",
+        "menu_page"             => "PageMenu",
         "preview_before_save"   => "0");
 // load config

 /trunk/client/integrateur_wikini/bibliotheque/wikini/wakka.css
 ,3 → 52,19
 .trail_table { line-height: 30px;}
 .trail_button { color: #993333; }
+.page_table {margin: 0px; padding: 0px ; border: none; height: 100%;width: 100%;}
+.menu_column {background-color: #FFFFCC; vertical-align: top; width: 150px; border: 1px solid #000000;padding:5px;}
+.body_column {vertical-align: top; border: none;padding:5px;}
+.attach_margin05em { margin: 0.5em;}             /* marge de 0.5 em autour de l'image*/
+.attach_margin1em { margin: 1em;}                /* marge de 1em autour de l'image*/
+.attach_left {float: left;}                      /* bloc flotant à gauche */
+.attach_right {float: right;}                    /* bloc flotant à droite */
+.attach_noborder {border-width: 0px;}            /* pas de bordure */
+.attach_vmiddle {vertical-align: text-bottom;}   /* aligenement vertical au milieu */
+.tableFM {border: thin solid Black; width: 100%;  }
+.tableFM THEAD { background-color: Silver; font-weight: bold; text-align: center;   }
+.tableFM TFOOT { background-color: Silver; font-weight: bold; text-align: left;   }
+.tableFM TBODY TR { text-align: center;  }
+.tableFMCol1 { background-color: Aqua; }
+.tableFMCol2 { background-color: Yellow; }

/trunk/client/integrateur_wikini/bibliotheque/wikini/formatters/coloration_delphi.php
1,6 → 1,6
<?php
/*
* $Id: coloration_delphi.php,v 1.1 2005-09-09 09:37:17 ddelon Exp $
* $Id: coloration_delphi.php,v 1.2 2005-10-20 10:28:25 ddelon Exp $
*
* Souligneur syntaxique Delphi
*

 /trunk/client/integrateur_wikini/bibliotheque/wikini/formatters/wakka.php
 ,6 → 34,7
 if (!function_exists("wakka2callback"))
 {
+        include("formatters/tableaux.php");     //EF => tableaux
         function wakka2callback($things)
         {
                 $thing = $things[1];
 ,6 → 54,11
                         return "&lt;";
                 else if ($thing == ">")
                         return "&gt;";
+                //EF=> tableaux
+                else if (preg_match("/^\[\|(.*)\|\]/s", $thing))
+                {
+                        return parsetable($thing);
+                }       //end tableaux
                 // bold
                 else if ($thing == "**")
                 {
 ,7 → 188,7
                 // forced links
                 // \S : any character that is not a whitespace character
                 // \s : any whitespace character
-                else if (preg_match("/^\[\[(\S*)(\s+(.+))?\]\]$/", $thing, $matches))
+                else if (preg_match("/^\[\[(\S*)\s+(.+)?\]\]$/", $thing, $matches))
                 {
                         list (, $url, $text) = $matches;
                         if ($url)
 ,6 → 320,7
 $text = chop($text)."\n";
 $text = preg_replace_callback(
         "/(\%\%.*?\%\%|".
+        "^\[\|.*?\|\]|".        //EF => tableaux
         "\"\".*?\"\"|".
         "\[\[.*?\]\]|".
         "\b[a-z]+:\/\/\S+|".

 /trunk/client/integrateur_wikini/bibliotheque/wikini/formatters/tableaux.php
 New file
 ,0 → 1,87
+<?php
+        function parsetable($thing)
+        {
+                $tableattr = 'border="1"';
+//              echo "parsetable debut : \$thing = $thing<br>";
+                // recuperation des attributs
+                preg_match("/^\[\|(.*)$/m",$thing,$match);
+//              echo "parsetable : \$match = ";var_dump($match);echo "<br>";
+                if ($match[1]){
+                        $tableattr = $match[1];
+                }
+                $table = "<table $tableattr >\n";
+                //suppression de [|xxxx et de |]
+                $thing = preg_replace("/^\[\|(.*)$/m","",$thing);
+                $thing = trim(preg_replace("/\|\]/m","",$thing));
+//              echo "parsetable suppression [| |]: \$thing = $thing<br>";
+                //recuperation de chaque ligne
+                $rows = preg_split("/$/m",$thing,-1,PREG_SPLIT_NO_EMPTY);
+//              echo "parsetable preg_split:";var_dump($rows);echo "<br>";
+                //analyse de chaque ligne
+                foreach ($rows as $row){
+                        $table .= parsetablerow($row);
+                }
+                $table.= "</table>";
+                return $table;
+        }
+        //parse la definition d'une ligne
+        function parsetablerow($row)
+        {
+                $rowattr = "";
+                $row = trim($row);
+//              echo "parsetablerow debut : \$row = $row<br>";
+                //detection des attributs de ligne => si la ligne ne commence pas par | alors attribut
+                if (!preg_match("/^\|/",$row,$match)){
+                        preg_match("/^!([^\|]*)!\|/",$row,$match);
+                        $rowattr = $match[1];
+//                      echo "\$rowattr = $rowattr<br>";
+                        $row = trim(preg_replace("/^!([^\|]*)!/","",$row));
+                }
+                $result .= "   <tr $rowattr>\n";
+                $row = trim(preg_replace("/^\|/","",trim($row)));
+                $row = trim(preg_replace("/\|$/","",trim($row)));
+//              echo "parsetablerow sans attribut : \$row = $row<br>";
+                //recuperation de chaque cellule
+                $cells = explode("|",$row);     //nb : seule les indices impaire sont significatif
+//              echo "parsetablerow preg_split \$cells:";var_dump($cells);echo "<br>";
+                $i=0;
+                foreach ($cells as $cell){
+//                      if ($i % 2){
+//                              echo "\$cell = $cell<br>";
+                                $result .= parsetablecell($cell);
+//                      }
+                        $i++;
+                }
+                $result .= "   </tr>\n";
+                return $result;
+        }
+        //parse la definition d'une cellule
+        function parsetablecell($cell)
+        {
+                global $wiki;
+                $cellattr = "";
+                if (preg_match("/^!(.*)!/",$cell,$match)){
+                        $cellattr = $match[1];
+                }
+                $cell = preg_replace("/^!(.*)!/","",$cell);
+                //si espace au debut => align=right
+                //si espace a la fin => align=left
+                //si espace debut et fin => align=center
+                if (preg_match("/^\s(.*)/",$cell)){
+                        $align="right";
+                }
+                if (preg_match("/^(.*)\s$/",$cell)){
+                        $align="left";
+                }
+                if (preg_match("/^\s(.*)\s$/",$cell)){
+                        $align="center";
+                }
+                if ($align) $cellattr .= " align=\"$align\"";
+//              echo "\$this->classname = ".get_class($wiki)."<br>";
+                return "      <td $cellattr>".$wiki->Format($cell)."</td>\n";
+        }
+?>

/trunk/client/integrateur_wikini/bibliotheque/wikini/formatters/hightlighter.class.inc
1,6 → 1,6
<?php
/*
* $Id: hightlighter.class.inc,v 1.1 2005-09-09 09:37:17 ddelon Exp $
* $Id: hightlighter.class.inc,v 1.2 2005-10-20 10:28:25 ddelon Exp $
*
* Souligneur générique pour colorier la syntaxe de langage de programmation
*

 /trunk/client/integrateur_wikini/bibliotheque/wikini/actions/attachfm.php
 New file
 ,0 → 1,38
+<?php
+/*
+attachfm.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+*/
+$url = $this->href('filemanager',$this->GetPageTag());
+echo '<a href="'.$url.'"><span class="attachfm"><span>Gestion des fichiers attachés</span></span></a>';
+?>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/actions/header.php
 ,7 → 44,7
 <meta name="keywords" content="<?php echo $this->GetConfigValue("meta_keywords") ?>" />
 <meta name="description" content="<?php echo  $this->GetConfigValue("meta_description") ?>" />
 <link rel="stylesheet" type="text/css" media="screen" href="wakka.basic.css" />
-<style type="text/css" media="all"> @import "<?php echo (!isset($_COOKIE["sitestyle"]))?'wakka':$_COOKIE["sitestyle"] ?>.css";</style>
+<style type="text/css" media="all"> @import "<?php echo (!$_COOKIE["sitestyle"])?'wakka':$_COOKIE["sitestyle"] ?>.css";</style>
 <script type="text/javascript">
 function fKeyDown()     {
         if (event.keyCode == 9) {
 ,22 → 51,49
                 event.returnValue= false;
                 document.selection.createRange().text = String.fromCharCode(9) } }
 </script>
+<!-- The ACeditor contribution -->
+<style type="text/css">
+.buttons { background: #ccc; border: 1px solid #ccc; margin: 1; float:left; }
+.raise{ border-top: 1px solid buttonhighlight; border-left: 1px solid buttonhighlight; border-bottom: 1px solid buttonshadow; border-right: 1px solid buttonshadow; background: #ccc; margin:1;    float:left; }
+.press { border-top: 1px solid buttonshadow; border-left: 1px solid buttonshadow; border-bottom: 1px solid buttonhighlight; border-right: 1px solid buttonhighlight; background: #ccc; margin:1; float:left; }
+/* ci dessous les petits champs */
+.ACsearchbox { background: #FFFFF8; border: 0px; border-bottom: 1px solid #CCCCAA; padding: 0px; margin: 0px; font-size: 10px; }
+.texteChampsImage {font-size: 10px; }
+#toolbar { margin: 0; width: 450px; padding: 0; height:20px; background: #ccc; border-top: 1px solid buttonhighlight; border-left: 1px solid buttonhighlight; border-bottom: 1px solid buttonshadow; border-right: 1px solid buttonshadow; text-align:left; }
+</style>
+<script type="text/javascript" src="ACeditor.js"></script>
+<!-- End on The ACEditor Contrib -->
 </head>
 <body <?php echo (!$user || ($user["doubleclickedit"] == 'Y')) && ($this->GetMethod() == "show") ? "ondblclick=\"document.location='".$this->href("edit")."';\" " : "" ?>
-<?php echo $message ? "onLoad=\"alert('".$message."');\" " : "" ?> >
+<?php /* ACeditor*/ echo "onLoad=\"thisForm=document.ACEditor;\""?> >
 <div style="display: none;"><a href="<?php echo $this->href() ?>/resetstyle" accesskey="7"></a></div>
+<?
+$menu_page=$this->config["menu_page"];
+if (isset($menu_page) and ($menu_page!=""))
+    {
+    // Ajout Menu de Navigation
+    echo '<table class="page_table">';
+    echo '<tr><td class="menu_column">';
+    $wikiMenu = $this->clone();
+    $wikiMenu->tag=$menu_page;
+    $wikiMenu->SetPage($wikiMenu->LoadPage($wikiMenu->tag));
+    echo $wikiMenu->Format($wikiMenu->page["body"], "wakka");
+    echo '</td>';
+    echo '<td class="body_column">';
+    }
+?>
 <h1 class="wiki_name"><?php echo $this->config["wakka_name"] ?></h1>
 <h1 class="page_name">
-<a href="<?php echo $this->config["base_url"] ?>RechercheTexte&amp;phrase=<?php echo htmlentities($this->GetPageTag()); ?>">
-<?php echo htmlentities($this->GetPageTag()); ?>
+<a href="<?php echo $this->config["base_url"] ?>RechercheTexte&amp;phrase=<?php echo urlencode($this->GetPageTag()); ?>">
+<?php echo $this->GetPageTag(); ?>
 </a>
 </h1>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/actions/attach.php
 New file
 ,0 → 1,121
+<?php
+/*
+attach.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/******************************************************************************
+*                       DOCUMENTATION
+*******************************************************************************
+        RESUME
+L'action {{attach}} permet de lier un fichier à une page, d'uploader ce fichier
+et de downloader ce fichier. Si le fichier est une image, elle est affichée
+dans la page. Lorsque le fichier est sur le serveur, il est possible de faire
+une mise à jour de celui-ci.
+        PARAMETRES DE L'ACTION
+L'action {{attach}} prend les paramètres suivants :
+ - file ou attachfile: nom du fichier tel qu'il sera sur le serveur. Les
+   espaces sont remplacé par des "_". (OBLIGATOIRE)
+ - desc ou attachdesc: description du fichier. C'est le texte qui sera affiché
+   comme lien vers le fichier ou dans l'attribut alt de la balise <img>. Ce
+   paramètre est obligatoire pour les images pour être conforme au XHTML.
+ - delete ou attachdelete: Si ce paramètre est non vide alors le fichier sera
+   effacé sur le serveur.
+ - link ou attachlink: URL de lien pour une image sensible. le lien peut être
+   un nom de page WikiNi, un lien interwiki ou une adresse http
+ - class: indique le nom de la ou les classes de style à utiliser pour afficher
+   l'image. les noms des classes sont séparés par un espace.
+        EXEMPLES
+ - Attacher un fichier archive:
+                {{attach file="archive.zip"}}
+ - Attacher un fichier archive avec une description
+                {{attach file="archive.zip" desc="Code source de l'application"}}
+ - Supprimer un fichier:
+                {{attach file="archive.zip" delete="y"}}
+ - Afficher une image:
+                {{attach file="image.png" desc="voici une image"}}
+ - Afficher une image sensible:
+                {{attach file="image.png" desc="voici une image" link="PagePrincipale"}}
+                {{attach file="image.png" desc="voici une image" link="WikiNi:PagePrincipale"}}
+                {{attach file="image.png" desc="voici une image" link="http://www.wikini.net"}}
+ - Afficher une image collé sur le bord droit et sans contour:
+                {{attach file="image.png" desc="voici une image" class="right noborder"}}
+        INSTALLATION
+) Copiez le fichier attach.php dans le répertoire des actions (/actions)
+) Copiez le fichier attach.class.php dans le répertoire des actions (/actions)
+) Copiez le fichier attachfm.php dans le repertoire des actions (/actions)
+) Copiez le fichier filamanager.php dans le répertoire des handlers (/handlers/page)
+) Copiez le fichier upload.php dans le répertoire des handlers (/handlers/page)
+) Copiez le fichier download.php dans le répertoire des handlers (/handlers/page)
+) Créez le répertoire racine des uploads sur le site du wiki. Si le SAFE_MODE
+        de PHP est activé, vous devez créer vous même ce répertoire et autoriser
+        l'écriture dans ce répertoire pour l'utilisateur et le groupe.
+) Ouvrez le fichier wakka.config.php et ajoutez la configuration de l'action.
+        Tous les paramètres de configuration ont une valeur par défaut.
+        Le configuration par défaut est:
+        $wakkaConfig["attach_config"] = array(
+                        "upload_path" => 'files',                               //repertoire racine des uploads
+                        "ext_images" => 'gif|jpeg|png|jpg',     //extension des fichiers images
+                        "ext_script" => 'php|php3|asp|asx|vb|vbs|js',   //extension des script(non utilisé)
+                        "update_symbole" => '*',                                //symbole pour faire un update du fichier
+                        "max_file_size" => 1024*100,                    //taille maximum du fichier en octer (100Ko par défaut)
+                        "fmDelete_symbole" => 'Supr',                   //symbole a afficher pour le lien "supprimer" dans le gestionnaire de fichier
+                        "fmRestore_symbole" => 'Rest',          //symbole a afficher pour le lien "restaurer" dans le gestionnaire de fichier
+                        "fmTrash_symbole" => 'Poubelle')                //symbole a afficher pour le lien "Poubelle" dans le gestionnaire de fichier
+) Ajoutez les classes de style au fichier wakka.css. Exemple de style :
+.attach_margin05em { margin: 0.5em;}
+.attach_margin1em { margin: 1em;}
+.attach_left {float: left;}
+.attach_right {float: right;}
+.attach_noborder {border-width: 0px;}
+.attach_vmiddle {vertical-align: text-bottom;}
+)Pour configurer l'aspect du gestionnnaire de fichier utiliser les classes de style .tableFM
+tableFMCol1 et tableFMCol2
+Exemple :
+.tableFM {border: thin solid Black; width: 100%;  }
+.tableFM THEAD { background-color: Silver; font-weight: bold; text-align: center;   }
+.tableFM TFOOT { background-color: Silver; font-weight: bold; text-align: left;   }
+.tableFM TBODY TR { text-align: center;  }
+.tableFMCol1 { background-color: Aqua; }
+.tableFMCol2 { background-color: Yellow; }
+*******************************************************************************/
+if (!class_exists('attach')){
+        include($this->GetConfigValue('action_path').'/attach.class.php');
+}
+$att = new attach($this);
+$att->doAttach();
+unset($att);
+?>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/actions/attach.class.php
 New file
 ,0 → 1,625
+<?php
+/*
+attach.class.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+# Classe de gestion de l'action {{attach}}
+# voir actions/attach.php ppour la documentation
+# copyrigth Eric Feldstein 2003-2004
+class attach {
+        var $wiki = '';                                 //objet wiki courant
+   var $attachConfig = array(); //configuration de l'action
+   var $file = '';                                      //nom du fichier
+   var $desc = '';                                      //description du fichier
+   var $link = '';                                      //url de lien (image sensible)
+   var $isPicture = 0;                          //indique si c'est une image
+   var $classes = '';                           //classe pour afficher une image
+   var $attachErr = '';                         //message d'erreur
+   var $pageId = 0;                                     //identifiant de la page
+   var $isSafeMode = false;             //indicateur du safe mode de PHP
+   /**
+   * Constructeur. Met les valeurs par defaut aux paramètres de configuration
+   */
+        function attach(&$wiki){
+        $this->wiki = $wiki;
+                $this->attachConfig = $this->wiki->GetConfigValue("attach_config");
+                if (empty($this->attachConfig["ext_images"])) $this->attachConfig["ext_images"] = "gif|jpeg|png|jpg";
+                if (empty($this->attachConfig["ext_script"])) $this->attachConfig["ext_script"] = "php|php3|asp|asx|vb|vbs|js";
+                if (empty($this->attachConfig['upload_path'])) $this->attachConfig['upload_path'] = 'files';
+                if (empty($this->attachConfig['update_symbole'])) $this->attachConfig['update_symbole'] = '*';
+                if (empty($this->attachConfig['max_file_size'])) $this->attachConfig['max_file_size'] = 1024*100;       //100ko max
+                if (empty($this->attachConfig['fmDelete_symbole'])) $this->attachConfig['fmDelete_symbole'] = 'Supr';
+                if (empty($this->attachConfig['fmRestore_symbole'])) $this->attachConfig['fmRestore_symbole'] = 'Rest';
+                if (empty($this->attachConfig['fmTrash_symbole'])) $this->attachConfig['fmTrash_symbole'] = 'Poubelle';
+                $this->isSafeMode = ini_get("safe_mode");
+        }
+/******************************************************************************
+*       FONCTIONS UTILES
+*******************************************************************************/
+        /**
+        * Création d'une suite de répertoires récursivement
+        */
+        function mkdir_recursif ($dir) {
+                if (strlen($dir) == 0) return 0;
+                if (is_dir($dir)) return 1;
+                elseif (dirname($dir) == $dir) return 1;
+                return ($this->mkdir_recursif(dirname($dir)) and mkdir($dir,0755));
+        }
+        /**
+        * Renvois le chemin du script
+        */
+        function GetScriptPath () {
+                if (preg_match("/.(php)$/i",$_SERVER["PHP_SELF"])){
+                        $a = explode('/',$_SERVER["PHP_SELF"]);
+                        $a[count($a)-1] = '';
+                        $path = implode('/',$a);
+                }else{
+                        $path = $_SERVER["PHP_SELF"];
+                }
+                return !empty($_SERVER["HTTP_HOST"])? 'http://'.$_SERVER["HTTP_HOST"].$path : 'http://'.$_SERVER["SERVER_NAME"].$path ;
+        }
+        /**
+        * Calcul le repertoire d'upload en fonction du safe_mode
+        */
+        function GetUploadPath(){
+                if ($this->isSafeMode) {
+                        $path = $this->attachConfig['upload_path'];
+                }else{
+         $path = $this->attachConfig['upload_path'].'/'.$this->wiki->GetPageTag();
+                        if (! is_dir($path)) $this->mkdir_recursif($path);
+                }
+                return $path;
+        }
+        /**
+        * Calcule le nom complet du fichier attaché en fonction du safe_mode, du nom et de la date de
+        * revision la page courante.
+        * Le nom du fichier "mon fichier.ext" attache à la page "LaPageWiki"sera :
+        *  mon_fichier_datepage_update.ext
+        *     update : date de derniere mise a jour du fichier
+        *     datepage : date de revision de la page à laquelle le fichier a ete lié/mis a jour
+        *  Si le fichier n'est pas une image un '_' est ajoute : mon_fichier_datepage_update.ext_
+        *  Selon la valeur de safe_mode :
+        *  safe_mode = on :     LaPageWiki_mon_fichier_datepage_update.ext_
+        *  safe_mode = off:     LaPageWiki/mon_fichier_datepage_update.ext_ avec "LaPageWiki" un sous-repertoire du répertoire upload
+        */
+        function GetFullFilename($newName = false){
+                $pagedate = $this->convertDate($this->wiki->page['time']);
+                //decompose le nom du fichier en nom+extension
+                if (preg_match('`^(.*)\.(.*)$`', str_replace(' ','_',$this->file), $match)){
+                        list(,$file['name'],$file['ext'])=$match;
+                        if(!$this->isPicture()) $file['ext'] .= '_';
+                }else{
+                        return false;
+                }
+                //recuperation du chemin d'upload
+                $path = $this->GetUploadPath($this->isSafeMode);
+                //generation du nom ou recherche de fichier ?
+                if ($newName){
+                        $full_file_name = $file['name'].'_'.$pagedate.'_'.$this->getDate().'.'.$file['ext'];
+                        if($this->isSafeMode){
+                                $full_file_name = $path.'/'.$this->wiki->GetPageTag().'_'.$full_file_name;
+                        }else{
+                                $full_file_name = $path.'/'.$full_file_name;
+                        }
+                }else{
+                        //recherche du fichier
+                        if($this->isSafeMode){
+                                //TODO Recherche dans le cas ou safe_mode=on
+                                $searchPattern = '`^'.$this->wiki->GetPageTag().'_'.$file['name'].'_\d{14}_\d{14}\.'.$file['ext'].'$`';
+                        }else{
+                                $searchPattern = '`^'.$file['name'].'_\d{14}_\d{14}\.'.$file['ext'].'$`';
+                        }
+                        $files = $this->searchFiles($searchPattern,$path);
+                        $unedate = 0;
+                        foreach ($files as $file){
+                                //recherche du fichier qui une datepage <= a la date de la page
+                                if($file['datepage']<=$pagedate){
+                                        //puis qui a une dateupload la plus grande
+                                        if ($file['dateupload']>$unedate){
+                                                $theFile = $file;
+                                                $unedate = $file['dateupload'];
+                                        }
+                                }
+                        }
+                        if (is_array($theFile)){
+                                $full_file_name = $path.'/'.$theFile['realname'];
+                        }
+                }
+                return $full_file_name;
+        }
+        /**
+        * Test si le fichier est une image
+        */
+        function isPicture(){
+                return preg_match("/.(".$this->attachConfig["ext_images"].")$/i",$this->file)==1;
+        }
+        /**
+        * Renvoie la date courante au format utilise par les fichiers
+        */
+        function getDate(){
+                return date('YmdHis');
+        }
+        /**
+        * convertie une date yyyy-mm-dd hh:mm:ss au format yyyymmddhhmmss
+        */
+        function convertDate($date){
+                $date = str_replace(' ','', $date);
+                $date = str_replace(':','', $date);
+                return str_replace('-','', $date);
+        }
+        /**
+        * Parse une date au format yyyymmddhhmmss et renvoie un tableau assiatif
+        */
+        function parseDate($sDate){
+                $pattern = '`^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$`';
+                $res = '';
+                if (preg_match($pattern, $sDate, $m)){
+                        //list(,$res['year'],$res['month'],$res['day'],$res['hour'],$res['min'],$res['sec'])=$m;
+                        $res = $m[1].'-'.$m[2].'-'.$m[3].' '.$m[4].':'.$m[5].':'.$m[6];
+                }
+                return ($res?$res:false);
+        }
+        /**
+        * Decode un nom long de fichier
+        */
+        function decodeLongFilename($filename){
+                $afile = array();
+                $afile['realname'] = basename($filename);
+                $afile['size'] = filesize($filename);
+                $afile['path'] = dirname($filename);
+                if(preg_match('`^(.*)_(\d{14})_(\d{14})\.(.*)(trash\d{14})?$`', $afile['realname'], $m)){
+                        $afile['name'] = $m[1];
+                        //suppression du nom de la page si safe_mode=on
+                        if ($this->isSafeMode){
+                                $afile['name'] = preg_replace('`^('.$this->wiki->tag.')_(.*)$`i', '$2', $afile['name']);
+                        }
+                        $afile['datepage'] = $m[2];
+                        $afile['dateupload'] = $m[3];
+                        $afile['trashdate'] = preg_replace('`(.*)trash(\d{14})`', '$2', $m[4]);
+                        //suppression de trashxxxxxxxxxxxxxx eventuel
+                        $afile['ext'] = preg_replace('`^(.*)(trash\d{14})$`', '$1', $m[4]);
+                        $afile['ext'] = rtrim($afile['ext'],'_');
+                        //$afile['ext'] = rtrim($m[4],'_');
+                }
+                return $afile;
+        }
+        /**
+        * Renvois un tableau des fichiers correspondant au pattern. Chaque element du tableau est un
+        * tableau associatif contenant les informations sur le fichier
+        */
+        function searchFiles($filepattern,$start_dir){
+                $files_matched = array();
+                $start_dir = rtrim($start_dir,'\/');
+                $fh = opendir($start_dir);
+                while (($file = readdir($fh)) !== false) {
+                        if (strcmp($file, '.')==0 || strcmp($file, '..')==0 || is_dir($file)) continue;
+                        if (preg_match($filepattern, $file)){
+                                $files_matched[] = $this->decodeLongFilename($start_dir.'/'.$file);
+                        }
+                }
+                return $files_matched;
+        }
+/******************************************************************************
+*       FONCTIONS D'ATTACHEMENTS
+*******************************************************************************/
+        /**
+        * Test les paramètres passé à l'action
+        */
+        function CheckParams(){
+                //recuperation des parametres necessaire
+                $this->file = $this->wiki->GetParameter("attachfile");
+                if (empty($this->file)) $this->file = $this->wiki->GetParameter("file");
+                $this->desc = $this->wiki->GetParameter("attachdesc");
+                if (empty($this->desc)) $this->desc = $this->wiki->GetParameter("desc");
+                $this->link = $this->wiki->GetParameter("attachlink");//url de lien - uniquement si c'est une image
+                if (empty($this->link)) $this->link = $this->wiki->GetParameter("link");
+                //test de validité des parametres
+                if (empty($this->file)){
+                        $this->attachErr = $this->wiki->Format("//action attach : paramètre **file** manquant//---");
+                }
+                if ($this->isPicture() && empty($this->desc)){
+                        $this->attachErr .= $this->wiki->Format("//action attach : paramètre **desc** obligatoire pour une image//---");
+                }
+                if ($this->wiki->GetParameter("class")) {
+                $array_classes = explode(" ", $this->wiki->GetParameter("class"));
+                foreach ($array_classes as $c) { $this->classes = $this->classes . "attach_" . $c . " "; }
+                $this->classes = trim($this->classes);
+                }
+        }
+        /**
+        * Affiche le fichier lié comme une image
+        */
+        function showAsImage($fullFilename){
+                //c'est une image : balise <IMG..../>
+                $img =  "<img src=\"".$this->GetScriptPath().$fullFilename."\" ".
+                                        "alt=\"".$this->desc.($this->link?"\nLien vers: $this->link":"")."\" />";
+                //test si c'est une image sensible
+                if(!empty($this->link)){
+                        //c'est une image sensible
+                        //test si le lien est un lien interwiki
+                        if (preg_match("/^([A-Z][A-Z,a-z]+)[:]([A-Z,a-z,0-9]*)$/s", $this->link, $matches))
+                        {  //modifie $link pour être un lien vers un autre wiki
+                                $this->link = $this->wiki->GetInterWikiUrl($matches[1], $matches[2]);
+                        }
+                        //calcule du lien
+                        $output = $this->wiki->Format('[['.$this->link." $this->file]]");
+                        $output = eregi_replace(">$this->file<",">$img<",$output);//insertion du tag <img...> dans le lien
+                }else{
+                        //ce n'est pas une image sensible
+                        $output = $img;
+                }
+                $output = ($this->classes?"<span class=\"$this->classes\">$output</span>":$output);
+                echo $output;
+                $this->showUpdateLink();
+        }
+        /**
+        * Affiche le fichier lié comme un lien
+        */
+        function showAsLink($fullFilename){
+                $url = $this->wiki->href("download",$this->wiki->GetPageTag(),"file=$this->file");
+                echo '<a href="'.$url.'">'.($this->desc?$this->desc:$this->file)."</a>";
+                $this->showUpdateLink();
+        }
+        /**
+        * Affiche le lien de mise à jour
+        */
+        function showUpdateLink(){
+                echo    " <a href=\"".
+                                $this->wiki->href("upload",$this->wiki->GetPageTag(),"file=$this->file").
+                                "\" title='Mise à jour'>".$this->attachConfig['update_symbole']."</a>";
+        }
+        /**
+        * Affiche un liens comme un fichier inexistant
+        */
+        function showFileNotExits(){
+                echo $this->file."<a href=\"".$this->wiki->href("upload",$this->wiki->GetPageTag(),"file=$this->file")."\">?</a>";
+        }
+        /**
+        * Affiche l'attachement
+        */
+        function doAttach(){
+                $this->CheckParams();
+                if ($this->attachErr) {
+                        echo $this->attachErr;
+                        return;
+                }
+                $fullFilename = $this->GetFullFilename();
+                //test d'existance du fichier
+                if((!file_exists($fullFilename))||($fullFilename=='')){
+                        $this->showFileNotExits();
+                        return;
+                }
+      //le fichier existe : affichage en fonction du type
+      if($this->isPicture()){
+        $this->showAsImage($fullFilename);
+      }else{
+        $this->showAsLink($fullFilename);
+      }
+        }
+/******************************************************************************
+*       FONTIONS D'UPLOAD DE FICHIERS
+*******************************************************************************/
+        /**
+        * Traitement des uploads
+        */
+        function doUpload(){
+                $HasAccessWrite=$this->wiki->HasAccess("write");
+                if ($HasAccessWrite){
+         switch ($_SERVER["REQUEST_METHOD"]) {
+                case 'GET' : $this->showUploadForm(); break;
+                case 'POST': $this->performUpload(); break;
+                default : echo $this->wiki->Format("//Methode de requete invalide//---");
+                        }
+                }else{
+                        echo $this->wiki->Format("//Vous n'avez pas l'accès en écriture à cette page//---");
+                        echo $this->wiki->Format("Retour à la page ".$this->wiki->GetPageTag());
+                }
+        }
+        /**
+        * Formulaire d'upload
+        */
+        function showUploadForm(){
+                echo $this->wiki->Format("====Formulaire d'envois de fichier====\n---");
+                $this->file = $_GET['file'];
+                echo    $this->wiki->Format("**Envois du fichier $this->file :**\n")
+                                ."<form enctype=\"multipart/form-data\" name=\"frmUpload\" method=\"POST\" action=\"".$_SERVER["PHP_SELF"]."\">\n"
+                                ."      <input type=\"hidden\" name=\"wiki\" value=\"".$this->wiki->GetPageTag()."/upload\" />\n"
+                                ."      <input TYPE=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"".$this->attachConfig['max_file_size']."\" />\n"
+                                ."      <input type=\"hidden\" name=\"file\" value=\"$this->file\" />\n"
+                                ."      <input type=\"file\" name=\"upFile\" size=\"50\" /><br />\n"
+                                ."      <input type=\"submit\" value=\"Envoyer\" />\n"
+                                ."</form>\n";
+        }
+        /**
+        * Execute l'upload
+        */
+        function performUpload(){
+                $this->file = $_POST['file'];
+                $destFile = $this->GetFullFilename(true);       //nom du fichier destination
+                //test de la taille du fichier recu
+                if($_FILES['upFile']['error']==0){
+                        $size = filesize($_FILES['upFile']['tmp_name']);
+                        if ($size > $this->attachConfig['max_file_size']){
+                                $_FILES['upFile']['error']=2;
+                        }
+                }
+                switch ($_FILES['upFile']['error']){
+                        case 0:
+                                $srcFile = $_FILES['upFile']['tmp_name'];
+                                if (move_uploaded_file($srcFile,$destFile)){
+                                        chmod($destFile,0644);
+                                        header("Location: ".$this->wiki->href("",$this->wiki->GetPageTag(),""));
+                                }else{
+                                        echo $this->wiki->Format("//Erreur lors du déplacement du fichier temporaire//---");
+                                }
+                                break;
+                        case 1:
+                                echo $this->wiki->Format("//Le fichier téléchargé excède la taille de upload_max_filesize, configuré dans le php.ini.//---");
+                                break;
+                        case 2:
+                                echo $this->wiki->Format("//Le fichier téléchargé excède la taille de MAX_FILE_SIZE, qui a été spécifiée dans le formulaire HTML.//---");
+                                break;
+                        case 3:
+                                echo $this->wiki->Format("//Le fichier n'a été que partiellement téléchargé.//---");
+                                break;
+                        case 4:
+                                echo $this->wiki->Format("//Aucun fichier n'a été téléchargé.//---");
+                                break;
+                }
+                echo $this->wiki->Format("Retour à la page ".$this->wiki->GetPageTag());
+        }
+/******************************************************************************
+*       FUNCTIONS DE DOWNLOAD DE FICHIERS
+*******************************************************************************/
+        function doDownload(){
+                $this->file = $_GET['file'];
+                $fullFilename = $this->GetUploadPath().'/'.$this->file;
+                if(!file_exists($fullFilename)){
+                        $fullFilename = $this->GetFullFilename();
+                        $dlFilename = $this->file;
+                        $size = filesize($fullFilename);
+                }else{
+                        $file = $this->decodeLongFilename($fullFilename);
+                        $size = $file['size'];
+                        $dlFilename =$file['name'].'.'.$file['ext'];
+                }
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Content-type: application/force-download");
+        header('Pragma: public');
+        header("Pragma: no-cache");// HTTP/1.0
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
+        header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+        header('Content-Transfer-Encoding: none');
+        header('Content-Type: application/octet-stream; name="' . $dlFilename . '"'); //This should work for the rest
+        header('Content-Type: application/octetstream; name="' . $dlFilename . '"'); //This should work for IE & Opera
+        header('Content-Type: application/download; name="' . $dlFilename . '"'); //This should work for IE & Opera
+        header('Content-Disposition: attachment; filename="'.$dlFilename.'"');
+        header("Content-Description: File Transfer");
+        header("Content-length: $size".'bytes');
+                readfile($fullFilename);
+        }
+/******************************************************************************
+*       FONTIONS DU FILEMANAGER
+*******************************************************************************/
+        function doFileManager(){
+                $do = $_GET['do']?$_GET['do']:'';
+                switch ($do){
+                        case 'restore' :
+                                $this->fmRestore();
+                                $this->fmShow(true);
+                                break;
+                        case 'erase' :
+                                $this->fmErase();
+                                $this->fmShow(true);
+                                break;
+                        case 'del' :
+                                $this->fmDelete();
+                                $this->fmShow();
+                                break;
+                        case 'trash' :
+                                $this->fmShow(true); break;
+                        case 'emptytrash' :
+                                $this->fmEmptyTrash();  //pas de break car apres un emptytrash => retour au gestionnaire
+                        default :
+                                $this->fmShow();
+                }
+        }
+        /**
+        * Affiche la liste des fichiers
+        */
+        function fmShow($trash=false){
+                $fmTitlePage = $this->wiki->Format("====Gestion des fichiers attachés à  la page ".$this->wiki->tag."====\n---");
+                if($trash){
+                        //Avertissement
+                        $fmTitlePage .= '<div class="prev_alert">Les fichiers effacés sur cette page le sont définitivement</div>';
+                        //Pied du tableau
+                        $url = $this->wiki->Link($this->wiki->tag,'filemanager','Gestion des fichiers');
+        $fmFootTable =  '       <tfoot>'."\n".
+                                                '               <tr>'."\n".
+                                                '                       <td colspan="6">'.$url.'</td>'."\n";
+                        $url = $this->wiki->Link($this->wiki->tag,'filemanager&do=emptytrash','Vider la poubelle');
+        $fmFootTable.=  '                       <td>'.$url.'</td>'."\n".
+                                                '               </tr>'."\n".
+                                                '       </tfoot>'."\n";
+                }else{
+                        //pied du tableau
+         $url = '<a href="'.$this->wiki->href('filemanager',$this->wiki->GetPageTag(),'do=trash').'" title="Poubelle">'.$this->attachConfig['fmTrash_symbole']."</a>";
+        $fmFootTable =  '       <tfoot>'."\n".
+                                                '               <tr>'."\n".
+                                                '                       <td colspan="6">'.$url.'</td>'."\n".
+                                                '               </tr>'."\n".
+                                                '       </tfoot>'."\n";
+                }
+                //entete du tableau
+                $fmHeadTable = '        <thead>'."\n".
+                                                        '               <tr>'."\n".
+                                                        '                       <td>&nbsp;</td>'."\n".
+                                                        '                       <td>Nom du fichier</td>'."\n".
+                                                        '                       <td>Nom réel du fichier</td>'."\n".
+                                                        '                       <td>Taille</td>'."\n".
+                                                        '                       <td>Révision de la page</td>'."\n".
+                                                        '                       <td>Révison du fichier</td>'."\n";
+                if($trash){
+         $fmHeadTable.= '                       <td>Suppression</td>'."\n";
+                }
+                $fmHeadTable.= '                </tr>'."\n".
+                                                        '       </thead>'."\n";
+                //corps du tableau
+                $files = $this->fmGetFiles($trash);
+                $files = $this->sortByNameRevFile($files);
+                $fmBodyTable =  '       <tbody>'."\n";
+                $i = 0;
+                foreach ($files as $file){
+                        $i++;
+                        $color= ($i%2?"tableFMCol1":"tableFMCol2");
+                        //lien de suppression
+                        if ($trash){
+                                $url = $this->wiki->href('filemanager',$this->wiki->GetPageTag(),'do=erase&file='.$file['realname']);
+                        }else{
+                                $url = $this->wiki->href('filemanager',$this->wiki->GetPageTag(),'do=del&file='.$file['realname']);
+                        }
+                        $dellink = '<a href="'.$url.'" title="Supprimer">'.$this->attachConfig['fmDelete_symbole']."</a>";
+                        //lien de restauration
+                        $restlink = '';
+                        if ($trash){
+                                $url = $this->wiki->href('filemanager',$this->wiki->GetPageTag(),'do=restore&file='.$file['realname']);
+                                $restlink = '<a href="'.$url.'" title="Restaurer">'.$this->attachConfig['fmRestore_symbole']."</a>";
+                        }
+                        //lien pour downloader le fichier
+                        $url = $this->wiki->href("download",$this->wiki->GetPageTag(),"file=".$file['realname']);
+                        $dlLink = '<a href="'.$url.'">'.$file['name'].'.'.$file['ext']."</a>";
+                        $fmBodyTable .=         '               <tr class="'.$color.'">'."\n".
+                                                                        '                       <td>'.$dellink.' '.$restlink.'</td>'."\n".
+                                                                        '                       <td>'.$dlLink.'</td>'."\n".
+                                                                        '                       <td>'.$file['realname'].'</td>'."\n".
+                                                                        '                       <td>'.$file['size'].'</td>'."\n".
+                                                                        '                       <td>'.$this->parseDate($file['datepage']).'</td>'."\n".
+                                                                        '                       <td>'.$this->parseDate($file['dateupload']).'</td>'."\n";
+                        if($trash){
+                $fmBodyTable.= '                        <td>'.$this->parseDate($file['trashdate']).'</td>'."\n";
+                        }
+                        $fmBodyTable .=         '               </tr>'."\n";
+                }
+                $fmBodyTable .= '       </tbody>'."\n";
+                //pied de la page
+                $fmFooterPage = "---\n-----\n[[".$this->wiki->tag." Retour à la page ".$this->wiki->tag."]]\n";
+                //affichage
+                echo $fmTitlePage."\n";
+                echo '<table class="tableFM" border="0" cellspacing="0">'."\n".$fmHeadTable.$fmFootTable.$fmBodyTable.'</table>'."\n";
+                echo $this->wiki->Format($fmFooterPage);
+        }
+        /**
+        * Renvoie la liste des fichiers
+        */
+        function fmGetFiles($trash=false){
+                $path = $this->GetUploadPath();
+                if($this->isSafeMode){
+                        $filePattern = '^'.$this->wiki->GetPageTag().'_.*_\d{14}_\d{14}\..*';
+                }else{
+                        $filePattern = '^.*_\d{14}_\d{14}\..*';
+                }
+                if($trash){
+                        $filePattern .= 'trash\d{14}';
+                }else{
+                        $filePattern .= '[^(trash\d{14})]';
+                }
+                return $this->searchFiles('`'.$filePattern.'$`', $path);
+        }
+        /**
+        * Vide la poubelle
+        */
+        function fmEmptyTrash(){
+                $files = $this->fmGetFiles(true);
+                foreach ($files as $file){
+                        $filename = $file['path'].'/'.$file['realname'];
+                        if(file_exists($filename)){
+                                unlink($filename);
+                        }
+                }
+        }
+        /**
+        * Effacement d'un fichier dans la poubelle
+        */
+        function fmErase(){
+                $path = $this->GetUploadPath();
+                $filename = $path.'/'.($_GET['file']?$_GET['file']:'');
+                if (file_exists($filename)){
+                        unlink($filename);
+                }
+        }
+        /**
+        * Met le fichier a la poubelle
+        */
+        function fmDelete(){
+                $path = $this->GetUploadPath();
+                $filename = $path.'/'.($_GET['file']?$_GET['file']:'');
+                if (file_exists($filename)){
+                        $trash = $filename.'trash'.$this->getDate();
+                        rename($filename, $trash);
+                }
+        }
+        /**
+        * Restauration d'un fichier mis a la poubelle
+        */
+        function fmRestore(){
+                $path = $this->GetUploadPath();
+                $filename = $path.'/'.($_GET['file']?$_GET['file']:'');
+                if (file_exists($filename)){
+                        $restFile = preg_replace('`^(.*\..*)trash\d{14}$`', '$1', $filename);
+                        rename($filename, $restFile);
+                }
+        }
+        /**
+        * Tri tu tableau liste des fichiers par nom puis par date de revision(upload) du fichier, ordre croissant
+        */
+        function sortByNameRevFile($files){
+                if (!function_exists('ByNameByRevFile')){
+                        function ByNameByRevFile($f1,$f2){
+                                $f1Name = $f1['name'].'.'.$f1['ext'];
+                                $f2Name = $f2['name'].'.'.$f2['ext'];
+                                $res = strcasecmp($f1Name, $f2Name);
+                                if($res==0){
+                                        //si meme nom => compare la revision du fichier
+                                        $res = strcasecmp($f1['dateupload'], $f2['dateupload']);
+                                }
+                                return $res;
+                        }
+                }
+                usort($files,'ByNameByRevFile');
+                return $files;
+        }
+}
+?>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/handlers/page/filemanager.php
 New file
 ,0 → 1,58
+<?php
+/*
+filemanager.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+# Execute le gestion des fichiers lier par l'action {{attach}}
+# Necessite le fichier actions/attach.php pour fonctionner
+# voir actions/attach.php ppour la documentation
+# copyrigth Eric Feldstein 2003-2004
+//vérification de sécurité
+if (!WIKINI_VERSION) {
+     die ("acc&egrave;s direct interdit");
+}
+echo $this->Header();
+?>
+<div class="page">
+<?php
+if($this->UserIsOwner()){
+        if (!class_exists('attach')){
+                include($this->GetConfigValue('action_path').'/attach.class.php');
+        }
+        $att = new attach($this);
+        $att->doFilemanager();
+        unset($att);
+}else{
+        echo $this->Format("//Seul le propriétaire de cette page peut accéder au gestionnaire des fichiers attaché//");
+}
+?>
+</div>
+<?php echo $this->Footer(); ?>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/handlers/page/upload.php
 New file
 ,0 → 1,55
+<?php
+/*
+upload.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+# Execute l'upload des fichiers lier par l'action {{attach}}
+# Necessite le fichier actions/attach.php pour fonctionner
+# voir actions/attach.php ppour la documentation
+# copyrigth Eric Feldstein 2003-2004
+//vérification de sécurité
+if (!WIKINI_VERSION) {
+     die ("acc&egrave;s direct interdit");
+}
+echo $this->Header();
+?>
+<div class="page">
+<?php
+if (!class_exists('attach')){
+        include($this->GetConfigValue('action_path').'/attach.class.php');
+}
+$att = new attach($this);
+$att->doUpload();
+unset($att);
+?>
+</div>
+<?php echo $this->Footer(); ?>

 /trunk/client/integrateur_wikini/bibliotheque/wikini/handlers/page/edit.php
 ,14 → 88,10
         }
         // fetch fields
-        if (!isset($_POST["previous"])) $previous = $this->page["id"];
-        else $previous = $_POST["previous"];
-        if (!isset($_POST["body"])) $body = $this->page["body"];
-        else $body = $_POST["body"];
+        if (!$previous = $_POST["previous"]) $previous = $this->page["id"];
+        if (!$body = $_POST["body"]) $body = $this->page["body"];
         // preview?
-        if (!isset($_POST["submit"])) $_POST["submit"] = "";
         if ($_POST["submit"] == "Aperçu")
         {
                 $output .=
 ,22 → 109,20
         else
         {
                 // display form
-                if (isset($error))
+                if ($error)
                 {
-                        if (!isset($output)) $output = '';
                         $output .= "<div class=\"error\">$error</div>\n";
                 }
                 // append a comment?
-                if (isset($_REQUEST["appendcomment"]))
+                if ($_REQUEST["appendcomment"])
                 {
                         $body = trim($body)."\n\n----\n\n--".$this->UserName()." (".strftime("%c").")";
                 }
-                if (!isset($output)) $output = '';
+                require_once("ACeditor.buttonsBar.php");
                 $output .=
                         $this->FormOpen("edit").
-                        "<input type=\"hidden\" name=\"previous\" value=\"".$previous."\" />\n".
+                        "<input type=\"hidden\" name=\"previous\" value=\"".$previous."\" />\n".$ACbuttonsBar.
                         "<textarea onkeydown=\"fKeyDown()\" name=\"body\" cols=\"60\" rows=\"40\" wrap=\"soft\" class=\"edit\">\n".
                         htmlspecialchars($body).
                         "\n</textarea><br />\n".

 /trunk/client/integrateur_wikini/bibliotheque/wikini/handlers/page/download.php
 New file
 ,0 → 1,48
+<?php
+/*
+download.php
+Code original de ce fichier : Eric FELDSTEIN
+Copyright (c) 2002, Hendrik Mans <hendrik@mans.de>
+Copyright 2002, 2003 David DELON
+Copyright 2002, 2003 Charles NEPOTE
+Copyright  2003,2004  Eric FELDSTEIN
+Copyright  2003  Jean-Pascal MILCENT
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+# Execute le download des fichiers lier par l'action {{attach}}
+# Necessite le fichier actions/attach.php pour fonctionner
+# voir actions/attach.php ppour la documentation
+# copyrigth Eric Feldstein 2003-2004
+//vérification de sécurité
+if (!WIKINI_VERSION) {
+     die ("acc&egrave;s direct interdit");
+}
+if (!class_exists('attach')){
+        include($this->GetConfigValue('action_path').'/attach.class.php');
+}
+$att = new attach($this);
+$att->doDownload();
+unset($att);
+?>

 /trunk/client/projet/langues/pro_langue_fr.inc.php
 ,7 → 10,7
 *   | Auteur : Alexandre Granier <alexandre@tela-botanica.org>                  |
 *   +-----------------------------------------------------------------------+
-*   $Id: pro_langue_fr.inc.php,v 1.6 2005-10-17 13:41:35 ddelon Exp $
+*   $Id: pro_langue_fr.inc.php,v 1.7 2005-10-20 10:28:25 ddelon Exp $
 */
 ,26 → 221,10
 define ('PROJET_NE_PAS_RECEVOIR_MESSAGES', 'Ne plus recevoir de messages') ;
 define ('PROJET_MESSAGES_DE', 'Messages de ') ;
 define ('PROJET_FILE_DE_DISCUSSION', 'fil de discussion') ;
-define ("BAZ_EST_INSCRIT_COMME", "est inscrit comme") ;
-define ("BAZ_PAS_INSCRIT", "n'est pas inscrit &agrave; ce projet") ;
 define ('PROJET_VOUS_N_ETES_PAS_INSCRIT', 'Vous n\'êtes pas inscrit à ce projet') ;
 define ('PROJET_VOUS_ETES_PARTICIPANT', 'Vous êtes participant à ce projet') ;
 define ('PROJET_SE_DESINSCRIRE', 'Se désinscrire du projet') ;
-define ("BAZ_JE_SOUHAITE", "Je souhaite m'inscrire &agrave; ce projet ou modifier mon inscription") ;
-define ("BAZ_INSCRIT_CONTRIBUTEUR", "Je m'inscris comme contributeur au projet") ;
-define ("BAZ_INSCRIT_OBSERVATEUR", "Je m'inscris comme observateur au projet") ;
-define ("BAZ_LAIUS_CONTRIBUTEUR", "Les acteurs d'un projet collaborent activement &agrave; sa r&eacute;alisation en relation avec le chef du projet et l'ensemble des autres membres du projet. Ils ont droit &agrave; citation comme co-auteur des travaux r&eacute;alis&eacute;s.") ;
-define ("BAZ_LAIUS_OBSERVATEUR", "Si vous manquez de disponibilit&eacute; ou que vos comp&eacute;tences ne vous permettent pas de travailler activement au projet, vous pouvez cependant suivre son &eacute;volution et apporter vos critiques constructives en vous inscrivant comme observateur. Vous ne pourrez pas, normalement, pr&eacute;tendre &agrave; &ecirc;tre cit&eacute; comme co-auteur du projet") ;
-define ("BAZ_INSCRIT_SUPPRIMER", "Je supprime mon inscription") ;
-define ("BAZ_LAIUS_DESINSCRIPTION", "Vous ne souhaitez plus, momentan&eacute;ment ou d&eacute;finitivement, participer &agrave; ce projet. Vous pourrez vous r&eacute;inscrire ult&eacute;rieurement.") ;
-define ("BAZ_VALIDER", "Valider modification") ;
-define ("BAZ_RETOUR_LISTE", "Retourner &agrave; la liste des projets") ;
-define ("BAZ_MAIL_DEMANDE_INSCRIPTION_SUJET", "I-Jumelage : une personne souhaite s'inscrire à un projet ") ;
-define ("BAZ_MAIL_DEMANDE_INSCRIPTION_CORPS_1", "La personne avec le mail suivant :\n") ;
-define ("BAZ_MAIL_DEMANDE_INSCRIPTION_CORPS_2", "\nsouhaite s'inscrire au projet : \n") ;
-define ("BAZ_MAIL_DEMANDE_INSCRIPTION_CORPS_3", "\nEn tant que coordinateur, vous devez modérer cette inscription.") ;
-define ("BAZ_DEMANDE_INSCRIPTION_PRISE_EN_COMPTE", "Votre demande d'inscription a &eacute;t;&eacute; transmise aux coordinateurs du projet") ;
 // ======================= Labels pour l'envoie d'email ==================================
 define ("PROJET_MAIL_TITRE", "Titre") ;

 /trunk/client/projet/configuration/projet.config.inc.php
 ,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: projet.config.inc.php,v 1.1 2005-09-27 12:50:28 ddelon Exp $
+// CVS : $Id: projet.config.inc.php,v 1.2 2005-10-20 10:28:25 ddelon Exp $
 /**
 * Application projet, fichier de configuration
 *
 ,7 → 31,7
 //Autres auteurs :
 *@author        Aucun
 *@copyright     Tela-Botanica 2000-2004
-*@version       $Revision: 1.1 $
+*@version       $Revision: 1.2 $
 // +------------------------------------------------------------------------------------------------------+
 */
 ,6 → 112,9
 define ("PROJET_VARIABLE_ID_REPERTOIRE", "id_repertoire") ;
 define ("PROJET_VARIABLE_ID_DOCUMENT", "id_document") ;
 /**
 //==================================== CONSTANTES ==================================
 * Constantes pour les listes de discussion
 ,10 → 124,23
 define ('PROJET_CHEMIN_LISTES', '') ;
 define ('PROJET_DOMAINE_LISTE', '') ;
+/**
+//==================================== CONSTANTES ==================================
+* Constantes pour des options
+//==================================================================================
+*/
+define ('PROJET_UTILISE_TYPE', false) ;
+define ('PROJET_UTILISE_HIERARCHIE', false) ;
 /* +--Fin du code ----------------------------------------------------------------------------------------+
 *
 * $Log: not supported by cvs2svn $
+* Revision 1.1  2005/09/27 12:50:28  ddelon
+* Projet configuration
 *
+*
 * +-- Fin du code ----------------------------------------------------------------------------------------+
 */

 /trunk/client/projet/classes/projetControleur.class.php
 ,7 → 20,7
 // | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                            |
 // +------------------------------------------------------------------------------------------------------+
-// CVS : $Id: projetControleur.class.php,v 1.14 2005-10-17 16:20:38 alexandre_tb Exp $
+// CVS : $Id: projetControleur.class.php,v 1.15 2005-10-20 10:28:25 ddelon Exp $
 /**
 * Application projet
 ,7 → 33,7
 //Autres auteurs :
 *@author        Aucun
 *@copyright     Tela-Botanica 2000-2004
-*@version       $Revision: 1.14 $
+*@version       $Revision: 1.15 $
 // +------------------------------------------------------------------------------------------------------+
 */
 ,7 → 81,6
 define ("PROJET_ACTION_MODIFIER_V", 15) ;
 define ('PROJET_ACTION_NOUVELLE_LISTE', 16) ;
 define ('PROJET_ACTION_NOUVELLE_LISTE_V', 17) ;
-//define ('PROJET_ACTION_VOIR_PARTICIPANT', 18) ;
 define ('PROJET_ACTION_S_INSCRIRE', 21) ;
 define ('PROJET_ACTION_CREER_WIKI', 22) ;
 define ('PROJET_ACTION_SUPPRIMER_WIKI', 23) ;
 ,7 → 1464,7
     /**
-     * Fonction affichant les particpants à un projet
+     * Fonction affichant les participants à un projet
      *
      * @return string
      * @access public
 ,7 → 1472,6
     function voirParticipants( )
     {
         include_once PROJET_CHEMIN_CLASSES.'HTML_listeParticipants.class.php' ;
         $projet = new projet ($this->_db, $this->_id_projet) ;
         $titre = '<h1>'.$projet->getTitre().'</h1>'."\n" ;
         $titre .= '<h2>'.PROJET_LISTE_PARTICIPANT.'</h2>'."\n" ;

 /trunk/client/projet/actions/forums.php
 ,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: forums.php,v 1.5 2005-10-17 16:19:51 alexandre_tb Exp $
+// CVS : $Id: forums.php,v 1.6 2005-10-20 10:28:25 ddelon Exp $
 /**
 * Application projet
 *
 ,7 → 31,7
 //Autres auteurs :
 *@author        Aucun
 *@copyright     Tela-Botanica 2000-2005
-*@version       $Revision: 1.5 $
+*@version       $Revision: 1.6 $
 // +------------------------------------------------------------------------------------------------------+
 */
 ,6 → 51,7
 $liste_ext_res = '' ;
 $sortie_liste = '' ;
+$inscription_laius ='' ;
 if ($projet->avoirListe()) {
     foreach ($projet->_listes_associes as $info_liste) {
         ob_start() ;
 ,7 → 184,7
                     $info->listname = $info_liste->getNom();
                     $info->listdomain = $info_liste->getDomaine() ;
                     echo '[ '.$info->makelink('action=show_threads&amp;actionargs[]='.$liste->actionargs[0], 'par fil de discussion').' ]' ;
-                    print'<h2>'.PROJET_MESSAGE_DU_MOIS.$GLOBALS['mois'][((int)substr($liste->actionargs[0],4,2) / 1)-1] .', ' .
+               //     print'<h2>'.PROJET_MESSAGE_DU_MOIS.$GLOBALS['mois'][((int)substr($liste->actionargs[0],4,2) / 1)-1] .', ' .
                                                                 substr($liste->actionargs[0],0,4). '</h2>'."\n" ;
                     if (!$info->show_month($liste->actionargs[0])) {
                         echo 'Pas de message dans cette liste' ;

 /trunk/papyrus/pap_rendu.inc.php
 ,7 → 32,7
 // pris connaissance de la licence CeCILL, et que vous en avez accepté les
 // termes.
 // ----
-// CVS : $Id: pap_rendu.inc.php,v 1.21 2005-10-17 13:41:34 ddelon Exp $
+// CVS : $Id: pap_rendu.inc.php,v 1.22 2005-10-20 10:28:25 ddelon Exp $
 /**
 * Rendu : programme traitant l'url demandée et retournant la page compressé au navigateur.
 *
 ,7 → 48,7
 *@author        Alexandre GRANIER <alexandre@tela-botanica.org>
 *@author        Laurent COUDOUNEAU <laurent.coudouneau@ema.fr>
 *@copyright     Tela-Botanica 2000-2004
-*@version       $Revision: 1.21 $ $Date: 2005-10-17 13:41:34 $
+*@version       $Revision: 1.22 $ $Date: 2005-10-20 10:28:25 $
 // +------------------------------------------------------------------------------------------------------+
 */
 ,6 → 297,8
 // +------------------------------------------------------------------------------------------------------+
 // Gestion des inclusions des fichiers d'applettes
+// PERF : on inclus des applettes meme s'il elle ne sont pas utilisées, les initialisations peuvent etre
+// longue et c'est source de bug ...
 for ($i = 0; $i < count($_GEN_commun['info_applette']); $i++) {
     // Nous vérifions que le chemin vers l'applette existe.
 ,6 → 506,9
 /* +--Fin du code ---------------------------------------------------------------------------------------+
 *
 * $Log: not supported by cvs2svn $
+* Revision 1.21  2005/10/17 13:41:34  ddelon
+* Projet Wikini
+*
 * Revision 1.20  2005/10/17 10:52:00  jp_milcent
 * Mise en majuscule du jeu de caractère, conformément à la recommandation.
 *

Subversion Repositories Applications.papyrus

Compare Revisions

Ignore whitespace Rev 555 → Rev 556