diff --git a/src/module_extraction/web_service/ws/Extraction.class.inc b/src/module_extraction/web_service/ws/Extraction.class.inc index d99e46d26b0ac792818c76c61c38193a5925049e..67c18dc9f207605b55e7b788d2e20340cc619a89 100755 --- a/src/module_extraction/web_service/ws/Extraction.class.inc +++ b/src/module_extraction/web_service/ws/Extraction.class.inc @@ -105,7 +105,7 @@ class Extraction extends ExtractionExtraction } } - // Libellés du champ "Conseil de Territoire". + // Libellés du champ "Conseil de Territoire". if (!empty($this->aFields['id_conseil'])) { $aSQLParams = array( diff --git a/src/module_extraction/web_service/ws/Extractions.class.inc b/src/module_extraction/web_service/ws/Extractions.class.inc index 5173ff581a64b3b7c615498bb8fdc178055d4d41..86ec09e6f62a0aaad1dd76aac384370172cda0c1 100755 --- a/src/module_extraction/web_service/ws/Extractions.class.inc +++ b/src/module_extraction/web_service/ws/Extractions.class.inc @@ -230,10 +230,6 @@ class Extractions extends ExtractionExtraction // $aReturn = $this->genericPut($this->aProperties['schema_extraction'], 'extraction', 'bo_id'); $this->aValues["bo_id"] = $this->aValues['my_vitis_id']; - // Méthode de transition. - if (!empty($this->aValues['tr_status_method'])) { - eval('$this->' . $this->aValues['tr_status_method'] . '();'); - } //On vérifie que le fichier existe et ne soit pas vide if (!empty($this->aValues['input_deposit_file'])) { @@ -241,11 +237,17 @@ class Extractions extends ExtractionExtraction $aXmlRacineAttribute['status'] = 1; $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], true, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']); $sDirPath = $this->aProperties["upload_dir"] . "/" . getUniqRandomId(); + //Récupération de sDirPath pour trDéposer + $this->sDirPath = $sDirPath; $sExtension = '*.' . end(explode(".", $this->aValues["input_deposit_name"])); //Si l'extension est autorisée - if (in_array($sExtension, explode("|", $this->aProperties['sig'])) or in_array($sExtension, explode("|", $this->aProperties['dao']))) { + if (in_array($sExtension, explode("|", $this->aProperties['sig'])) || in_array($sExtension, explode("|", $this->aProperties['dao']))) { + // Méthode de transition. + if (!empty($this->aValues['tr_status_method'])) { + eval('$this->' . $this->aValues['tr_status_method'] . '();'); + } while (is_dir($sDirPath)) { $sDirPath = $this->aProperties["upload_dir"] . "/" . getUniqRandomId(); @@ -258,7 +260,7 @@ class Extractions extends ExtractionExtraction fwrite($fp, $this->aValues["input_deposit_file"]); fclose($fp); //Demande GTF - $this->oBO->insertOrder('EM0160AYYTK48', 'sourceDir=' . end(explode("/", $sDirPath)) . '/' . $this->aValues["input_deposit_name"] . '|sourceMotif=*.shp'); + $this->oBO->insertOrder('EM0160AYYTK48', 'sourceDir=' . end(explode("/", $sDirPath)) . '/' . $this->aValues["control_file_name"] . '|sourceMotif=' . $sExtension); } else { //Si l'extension n'est pas bonne $error_message .= $this->aValues["input_deposit_name"] . " format is not authaurized (" . $sExtension . ")"; @@ -539,8 +541,8 @@ class Extractions extends ExtractionExtraction public function trDeposer() { $this->oBO = new WabBusinessObject($this->oConnection->oBd, array(), $this->aValues, $this->aProperties, 'extraction', $this->aValues['bo_id']); - // Check si la table existe si oui change l'état - $this->oBO->wabSetStatus($this->aProperties["schema_extraction"], "extraction", "bo_id", $this->aValues["bo_id"], "Fichier déposé"); + // Check si la table existe si oui change l'état + $this->oBO->wabSetStatus($this->aProperties["schema_extraction"], "extraction", "bo_id", $this->aValues["bo_id"], "Fichier déposé"); } diff --git a/src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc b/src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc index ff03a0740fddd474e82aa2dadb8999e13c8ba028..fef01a79071cca69302125072cd43ad789e10a85 100755 --- a/src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc +++ b/src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc @@ -14,8 +14,13 @@ $aMail["newUserBody"] = '<!-- 1 Column Text + Button : BEGIN --> <p style="width:100%; text-align: left;font-size: 18px;">Nous vous remercions d\'avoir créé votre compte sur <b>[HOSTNAME]</b>.</p> <p style="width:100%; text-align: left;font-size: 18px;"><b>Informations sur votre compte :</b></p> <p style="width:100%; text-align: left;font-size: 18px;">Identifiant : [USERNAME]</p> - <p style="width:100%; text-align: left;font-size: 18px;">Mail : [MAIL]</p> <p style="width:100%; text-align: left;font-size: 18px;">Organisme : [COMPANY] </p> + <p style="width:100%; text-align: left;font-size: 18px;">Mail : [MAIL]</p> + <p style="width:100%; text-align: left;font-size: 18px;">Téléphone : [PHONE] </p> + <p style="width:100%; text-align: left;font-size: 18px;">Ip publique fixe : [PUBLIC_IP] </p> + <p style="width:100%; text-align: left;font-size: 18px;">Nom du demandeur : [DEMANDEUR] </p> + <p style="width:100%; text-align: left;font-size: 18px;">Adresse mail du demandeur : [MAIL_DEMANDEUR] </p> + <p style="width:100%; text-align: left;font-size: 18px;">Objet de l\'étude : [STUDY_OBJECT] </p> <p style="width:100%; text-align: left;font-size: 18px;margin-top: 20px;">Cliquez sur le bouton ci-dessous pour finaliser votre inscription :</p> </td> </tr>