Skip to content
Snippets Groups Projects
Commit 140b246e authored by Armand Bahi's avatar Armand Bahi
Browse files

Correction upload d'images

parent 101f0f01
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/module_vmap/web_service/ws/Map.class.inc
+ 5
− 5
View file @ 140b246e
......@@ -65,7 +65,7 @@ class Map extends Vmap {
*/
function GET() {
require $this->sRessourcesFile;
$this->aFields = $this->getFields($this->aProperties['schema_vmap'], 'v_map', 'map_id');
$this->aFields = $this->getFields($this->aProperties['schema_vmap'], 'v_map', 'map_id', 'vmap_admin_map_vmap_admin_map');
$this->getGroups();
}
......
src/module_vmap/web_service/ws/Maps.class.inc
+ 19
− 63
View file @ 140b246e
......@@ -195,45 +195,18 @@ class Maps extends Vmap {
function POST() {
require $this->sRessourcesFile;
// Vignette à uploader ?
if (!empty($_FILES['thumbnail'])) {
// la colonne thumbnail vaudra le nom du fichier
$this->aValues["thumbnail"] = $_FILES['thumbnail']["name"];
}
// Fichiers à uploader
$aUploadFiles = array(
'thumbnail' => []
);
// Redimmensionnement de l'image.
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
// Renomme l'image en jpg
$aPointsArray = explode('.', $this->aValues["thumbnail"]);
$aPointsArray[count($aPointsArray) - 1] = 'jpg';
$this->aValues["thumbnail"] = join('.', $aPointsArray);
$aUploadFiles['thumbnail']['width'] = $this->aValues['thumbnail_width'];
$aUploadFiles['thumbnail']['height'] = $this->aValues['thumbnail_height'];
}
// Création de la carte.
$aReturn = $this->genericPost($this->aProperties['schema_vmap'], 'map', $this->aProperties['schema_vmap'] . '.seq_common', 'map_id');
// Vignette à uploader ?
if (!empty($_FILES['thumbnail'])) {
$sImageDir = $this->aProperties['ws_data_dir'] . '/vitis/vmap_admin_map_vmap_admin_map/documents/' . $this->aValues["my_vitis_id"] . '/thumbnail/' . $_FILES['thumbnail']["name"];
// Crée les répertoires si ils n'existent pas
$sDirPath = $this->createElementFilesFolder('vmap_admin_map_vmap_admin_map', $this->aValues["my_vitis_id"]);
$sDirColumnPath = $sDirPath . '/thumbnail';
if (!is_dir($sDirColumnPath)) {
mkdir($sDirColumnPath, 0777, true);
}
$sErrorMessage = uploadFile("thumbnail", "", $sImageDir, $_FILES['thumbnail']['size'] + 1);
if ($sErrorMessage != "") {
writeToErrorLog($sErrorMessage);
} else {
// Redimmensionnement de l'image.
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
$this->pictureResampler($sImageDir, $this->aValues['thumbnail_width'], $this->aValues['thumbnail_height']);
}
}
}
$aReturn = $this->genericPost($this->aProperties['schema_vmap'], 'map', $this->aProperties['schema_vmap'] . '.seq_common', 'map_id', $aUploadFiles, 'vmap_admin_map_vmap_admin_map');
// Si création OK -> maj des groupes rattachés à la carte.
if ($aReturn['sStatus'] == 1) {
......@@ -352,35 +325,18 @@ class Maps extends Vmap {
*/
function PUT() {
require $this->sRessourcesFile;
// Vignette à uploader ?
if (!empty($this->aValues["thumbnail_file"])) {
$sImageDir = $this->aProperties['ws_data_dir'] . '/vitis/vmap_admin_map_vmap_admin_map/documents/' . $this->aValues["my_vitis_id"] . '/thumbnail/' . $this->aValues["thumbnail_name"];
// Crée les répertoires si ils n'existent pas
$sDirPath = $this->createElementFilesFolder('vmap_admin_map_vmap_admin_map', $this->aValues["my_vitis_id"]);
$sDirColumnPath = $sDirPath . '/thumbnail';
if (!is_dir($sDirColumnPath)) {
mkdir($sDirColumnPath, 0777, true);
}
// la colonne thumbnail vaudra le nom du fichier
$this->aValues["thumbnail"] = $this->aValues["thumbnail_name"];
$fp = fopen($sImageDir, "w");
fwrite($fp, $this->aValues["thumbnail_file"]);
fclose($fp);
// Redimmensionnement de l'image.
// Fichiers à uploader
$aUploadFiles = array(
'thumbnail' => []
);
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
$this->pictureResampler($sImageDir, $this->aValues['thumbnail_width'], $this->aValues['thumbnail_height']);
// Renomme l'image en jpg
$aPointsArray = explode('.', $this->aValues["thumbnail"]);
$aPointsArray[count($aPointsArray) - 1] = 'jpg';
$this->aValues["thumbnail"] = join('.', $aPointsArray);
}
$aUploadFiles['thumbnail']['width'] = $this->aValues['thumbnail_width'];
$aUploadFiles['thumbnail']['height'] = $this->aValues['thumbnail_height'];
}
// Mise à jour.
$aReturn = $this->genericPut($this->aProperties['schema_vmap'], 'map', 'map_id');
$aReturn = $this->genericPut($this->aProperties['schema_vmap'], 'map', 'map_id', $aUploadFiles, 'vmap_admin_map_vmap_admin_map');
// Si mise à jour OK -> maj des groupes rattachés à la carte.
if ($aReturn['sStatus'] == 1) {
$aXmlRacineAttribute['status'] = 1;
......
src/module_vmap/web_service/ws/Services.class.inc
+ 21
− 66
View file @ 140b246e
......@@ -230,45 +230,17 @@ class Services extends Vmap {
*/
function POST() {
// Vignette à uploader ?
if (!empty($_FILES['thumbnail'])) {
// la colonne thumbnail vaudra le nom du fichier
$this->aValues["thumbnail"] = $_FILES['thumbnail']["name"];
}
// Redimmensionnement de l'image.
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
// Renomme l'image en jpg
$aPointsArray = explode('.', $this->aValues["thumbnail"]);
$aPointsArray[count($aPointsArray) - 1] = 'jpg';
$this->aValues["thumbnail"] = join('.', $aPointsArray);
}
$aReturn = $this->genericPost($this->aProperties['schema_vmap'], 'service', $this->aProperties['schema_vmap'] . '.seq_common', 'service_id');
// Vignette à uploader ?
if (!empty($_FILES['thumbnail'])) {
$sImageDir = $this->aProperties['ws_data_dir'] . '/vitis/vmap_admin_map_vmap_services/documents/' . $this->aValues["my_vitis_id"] . '/thumbnail/' . $_FILES['thumbnail']["name"];
// Crée les répertoires si ils n'existent pas
$sDirPath = $this->createElementFilesFolder('vmap_admin_map_vmap_services', $this->aValues["my_vitis_id"]);
$sDirColumnPath = $sDirPath . '/thumbnail';
if (!is_dir($sDirColumnPath)) {
mkdir($sDirColumnPath, 0777, true);
}
$sErrorMessage = uploadFile("thumbnail", "", $sImageDir, $_FILES['thumbnail']['size'] + 1);
if ($sErrorMessage != "") {
writeToErrorLog($sErrorMessage);
} else {
// Redimmensionnement de l'image.
// Fichiers à uploader
$aUploadFiles = array(
'thumbnail' => []
);
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
$this->pictureResampler($sImageDir, $this->aValues['thumbnail_width'], $this->aValues['thumbnail_height']);
}
}
$aUploadFiles['thumbnail']['width'] = $this->aValues['thumbnail_width'];
$aUploadFiles['thumbnail']['height'] = $this->aValues['thumbnail_height'];
}
// Envoi Post
$aReturn = $this->genericPost($this->aProperties['schema_vmap'], 'service', $this->aProperties['schema_vmap'] . '.seq_common', 'service_id', $aUploadFiles, 'vmap_admin_map_vmap_services');
return $aReturn['sMessage'];
}
......@@ -356,35 +328,18 @@ class Services extends Vmap {
* @return array containing the status and the message
*/
function PUT() {
// Vignette à uploader ?
if (!empty($this->aValues["thumbnail_file"])) {
$sImageDir = $this->aProperties['ws_data_dir'] . '/vitis/vmap_admin_map_vmap_services/documents/' . $this->aValues["my_vitis_id"] . '/thumbnail/' . $this->aValues["thumbnail_name"];
// Crée les répertoires si ils n'existent pas
$sDirPath = $this->createElementFilesFolder('vmap_admin_map_vmap_services', $this->aValues["my_vitis_id"]);
$sDirColumnPath = $sDirPath . '/thumbnail';
if (!is_dir($sDirColumnPath)) {
mkdir($sDirColumnPath, 0777, true);
}
// la colonne thumbnail vaudra le nom du fichier
$this->aValues["thumbnail"] = $this->aValues["thumbnail_name"];
$fp = fopen($sImageDir, "w");
fwrite($fp, $this->aValues["thumbnail_file"]);
fclose($fp);
// Redimmensionnement de l'image.
// Fichiers à uploader
$aUploadFiles = array(
'thumbnail' => []
);
if (!empty($this->aValues['thumbnail_width']) && !empty($this->aValues['thumbnail_height'])) {
$this->pictureResampler($sImageDir, $this->aValues['thumbnail_width'], $this->aValues['thumbnail_height']);
// Renomme l'image en jpg
$aPointsArray = explode('.', $this->aValues["thumbnail"]);
$aPointsArray[count($aPointsArray) - 1] = 'jpg';
$this->aValues["thumbnail"] = join('.', $aPointsArray);
}
$aUploadFiles['thumbnail']['width'] = $this->aValues['thumbnail_width'];
$aUploadFiles['thumbnail']['height'] = $this->aValues['thumbnail_height'];
}
$aReturn = $this->genericPut($this->aProperties['schema_vmap'], 'service', 'service_id');
// Envoi Put
$aReturn = $this->genericPut($this->aProperties['schema_vmap'], 'service', 'service_id', $aUploadFiles, 'vmap_admin_map_vmap_services');
return $aReturn['sMessage'];
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment