Changeset 59653 in spip-zone

Timestamp:

Mar 23, 2012, 10:54:34 AM (9 years ago)

Author:

guy.cesaro@…

Message:

tentative pour que l'ajout de documents via drag/drop fonctionne avec SPIP3

Location:

_plugins_/crayons

Files:

• action/crayons_upload.php (modified) (1 diff)
• paquet.xml (modified) (1 diff)
• plugin.xml (modified) (1 diff)

_plugins_/crayons/action/crayons_upload.php

@@ -26 +26 @@
         if ($file = $_FILES['upss']
         AND $file['error'] == 0) {
-                include_spip('inc/ajouter_documents');
-
+        
                 $source = $file['tmp_name'];  # /tmp/php/phpxxx
-                $nom_envoye = $file['name'];  # mon-image.jpg
-
-                $id = ajouter_un_document($source, $nom_envoye, $type, $id, 'document', $id_document=0, &$documents_actifs, $titrer=true);
+                $nom_envoye = $file['name'];  # mon-image.jpg   
+                
+                include_spip('plugins/installer'); // spip_version_compare dans SPIP 3.x 
+                include_spip('inc/plugin'); // spip_version_compare dans SPIP 2.x 
+                if (function_exists(spip_version_compare)) { // gerer son absence dans les branche precedente a SPIP 2.x
+                        if (spip_version_compare($GLOBALS['spip_version_branche'], '3.0.0alpha', '>=')) 
+                                        define('_SPIP3', true);                 
+                } 
+                if (defined('_SPIP3')) {
+                        include_spip('action/ajouter_documents');
+                        
+                        $ajouter_un_document = charger_fonction('ajouter_un_document','action');
+                        $id = $ajouter_un_document("new", $file, $type, $id, 'document');
+                        
+                } else {
+                        include_spip('inc/ajouter_documents');
+                        
+                        $id = ajouter_un_document($source, $nom_envoye, $type, $id, 'document', $id_document=0, &$documents_actifs, $titrer=true);
+                }
         }
 
         if (!$id) {
-                $erreur = "errur !";
+                $erreur = "erreur !";
         }
 

_plugins_/crayons/paquet.xml

@@ -2 +2 @@
         prefix="crayons"
         categorie="edition"
-        version="1.13.3"
+        version="1.13.4"
         etat="stable"
         compatibilite="[1.9.0;3.0.0]"

_plugins_/crayons/plugin.xml

@@ -17 +17 @@
         </licence>
         <version>
-        1.13.3
+        1.13.4
         </version>
         <etat>