wip #4211 @1.5

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 12ed7f190cf194904d85ce3183b25ccd054d1858..1c804520b79fdb14d1dbf3f16dfb7ff2327528dd 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -373,11 +373,6 @@ class commonCore extends cubeCore
         $db->books->compilehtml5date('integer', 0, false);\r
         $db->books->version('integer', 0, false, 2);\r
         $db->books->composition_update('integer', 0, false);\r
-        $db->books->dir_references('varchar', 256, false);\r
-        $db->books->dir_hosting('varchar', 256, false);\r
-        $db->books->dir_macbook_phonegap_ios('varchar', 256, false);\r
-        $db->books->dir_phonegap_android('varchar', 256, false);\r
-        $db->books->dir_external('varchar', 256, false);\r
         $db->books->lucene_time('integer', 0, false);\r
         $db->books->demo_counter('integer', 0, false);\r
         $db->books->exportdatas('text', 0, false);\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 4a86c805d3e6c64abf0fe5a8201eabffc1ad030d..ddc5f9c619b4af95b62495d2c1720ee1bc31e4a1 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1361,34 +1361,6 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
         return $res;
     }
 
-    public static function formInstall($book, $server)
-    {
-        if ($server == 'references') {
-            $s = __('Espace des références');
-            $dir = $book->dir_references;
-        } elseif ($server == 'hosting') {
-            $s = __("Serveur d'hébergement");
-            $dir = $book->dir_hosting;
-        } elseif ($server == 'macbook_phonegap_ios') {
-            $s = __("Projet Phonegap iOS");
-            $dir = $book->dir_macbook_phonegap_ios;
-        } elseif ($server == 'phonegap_android') {
-            $s = __("Projet Phonegap Android");
-            $dir = $book->dir_phonegap_android;
-        } elseif ($server == 'external') {
-            $s = __('Serveur FTP externe') . ' : ftp://';
-            $dir = $book->dir_external;
-        }
-
-        if ($dir == '') {
-            $dir = cubeText::str2URL($book->parametres->title);
-        }
-
-        $res = '<tr><td>' . __("Dossier d'installation") . '</td><td><em>' . $s . '</em> ' . form::field('dir', 60, 128, $dir) . '</td></tr>';
-        $res .= '<tr><td colspan="2">' . __("A l'issue de l'installation, vous serez dirigé vers le serveur sur lequel la publication a été installée") . '</td></tr>';
-        return $res;
-    }
-
     public static function testLinksCSV($args)
     {
         global $core;

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index fff2d5991531be077df5c07ff6285a482a0b695a..b3d4fba22fcfcb9937581b6d0f37b3f4b37eaff8 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -58,13 +58,8 @@ class wsDAOBook extends commonDAO
             }
             $book->version = 2;
             $book->composition_update = self::_toTimestamp($r->composition_updated_at);
-            $book->dir_references = $r->install_references_settings;
-            $book->dir_hosting = $r->install_hosting_settings;
-//            $book->dir_macbook_phonegap_ios = $r->dir_macbook_phonegap_ios;
-//            $book->dir_phonegap_android = $r->dir_phonegap_android;
-            $book->dir_external = $r->install_ftp_settings;
 //            $book->demo_counter = $r->demo_counter;
-//            $book->exportdatas = $r->exportdatas;
+           $book->exportdatas = $r->exportdatas;
         } else {
             $book = new wsBook();
             $book->book_id = $r->book_id;
@@ -100,11 +95,6 @@ class wsDAOBook extends commonDAO
             }
             $book->version = $r->version;
             $book->composition_update = $r->composition_update;
-            $book->dir_references = $r->dir_references;
-            $book->dir_hosting = $r->dir_hosting;
-            $book->dir_macbook_phonegap_ios = $r->dir_macbook_phonegap_ios;
-            $book->dir_phonegap_android = $r->dir_phonegap_android;
-            $book->dir_external = $r->dir_external;
             $book->demo_counter = $r->demo_counter;
             $book->exportdatas = $r->exportdatas;
         }

diff --git a/inc/ws/DAO/class.ws.dao.book3.php b/inc/ws/DAO/class.ws.dao.book3.php
index 549f5f2fd74b69ccd68e6c1eff1ffcc224bc7998..334166fc3245e872c3f95bfd39835ed0fd583a0e 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book3.php
+++ b/inc/ws/DAO/class.ws.dao.book3.php
@@ -62,13 +62,7 @@ class wsDAOBook3 extends wsDAOBook
         }
         $book->version = 2;
         $book->composition_update = self::_toTimestamp($r->composition_updated_at);
-        $book->dir_references = $r->install_references_settings;
-        $book->dir_hosting = $r->install_hosting_settings;
-//            $book->dir_macbook_phonegap_ios = $r->dir_macbook_phonegap_ios;
-//            $book->dir_phonegap_android = $r->dir_phonegap_android;
-        $book->dir_external = $r->install_ftp_settings;
-//            $book->demo_counter = $r->demo_counter;
-//            $book->exportdatas = $r->exportdatas;
+        $book->exportdatas = $r->export_data;
 
         return $book;
     }

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 3749e6d987eb13d55c004a08fce51c48d2c122c5..a98f8130d6442c62e3f17d9edfce4628944b887f 100644 (file)
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -34,11 +34,6 @@ class wsBook extends cubeMetier
     protected $compilehtml5date;\r
     protected $composition_update;\r
     protected $version;\r
-    protected $dir_references;\r
-    protected $dir_hosting;\r
-    protected $dir_macbook_phonegap_ios;\r
-    protected $dir_phonegap_android;\r
-    protected $dir_external;\r
     protected $demo_counter;\r
     protected $exportdatas;\r
 \r