From 9a9d0c9d476fe1871047c3d679fa13739cdc4bdf Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 8 Mar 2022 11:46:56 +0000 Subject: [PATCH] wip #4211 @1.5 --- inc/commons/class.common.core.php | 5 ----- inc/ws/Controlleur/class.ws.url.php | 28 ---------------------------- inc/ws/DAO/class.ws.dao.book.php | 12 +----------- inc/ws/DAO/class.ws.dao.book3.php | 8 +------- inc/ws/Metier/class.ws.book.php | 5 ----- 5 files changed, 2 insertions(+), 56 deletions(-) diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index 12ed7f190..1c804520b 100644 --- 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); $db->books->version('integer', 0, false, 2); $db->books->composition_update('integer', 0, false); - $db->books->dir_references('varchar', 256, false); - $db->books->dir_hosting('varchar', 256, false); - $db->books->dir_macbook_phonegap_ios('varchar', 256, false); - $db->books->dir_phonegap_android('varchar', 256, false); - $db->books->dir_external('varchar', 256, false); $db->books->lucene_time('integer', 0, false); $db->books->demo_counter('integer', 0, false); $db->books->exportdatas('text', 0, false); diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 4a86c805d..ddc5f9c61 100644 --- 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 = '' . __("Dossier d'installation") . '' . $s . ' ' . form::field('dir', 60, 128, $dir) . ''; - $res .= '' . __("A l'issue de l'installation, vous serez dirigé vers le serveur sur lequel la publication a été installée") . ''; - 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 fff2d5991..b3d4fba22 100644 --- 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 549f5f2fd..334166fc3 100644 --- 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 3749e6d98..a98f8130d 100644 --- 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; protected $composition_update; protected $version; - protected $dir_references; - protected $dir_hosting; - protected $dir_macbook_phonegap_ios; - protected $dir_phonegap_android; - protected $dir_external; protected $demo_counter; protected $exportdatas; -- 2.39.5