diff --git a/vas/rest/ws/vitis/Versions.class.inc b/vas/rest/ws/vitis/Versions.class.inc
index 62b9cfcc9ef13f02c3b310d0543c4d4228ee40e3..3a20a659f09122d360298d4fcc72dc131f54231b 100755
--- a/vas/rest/ws/vitis/Versions.class.inc
+++ b/vas/rest/ws/vitis/Versions.class.inc
@@ -1,204 +1,202 @@
-<?php
-
-require_once 'Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
-
-/**
- * \file versions.class.inc
- * \class Versions
- *
- * \author Yoann Perollet <yoann.perollet@veremes.com>.
- *
- * \brief This file contains the Versions php class
- *
- * This class defines the rest api for versions
- *
- */
-class Versions extends Vitis {
- /**
- * @SWG\Definition(
- * definition="/versions",
- * allOf={
- * @SWG\Schema(ref="#/definitions/versions")
- * }
- * )
- * @SWG\Tag(
- * name="Versions",
- * description="Operations about versions"
- * )
- */
-
- /**
- * construct
- * @param type $aPath url of the request
- * @param type $aValues parameters of the request
- * @param type $versions ptroperties
- */
- function __construct($aPath, $aValues, $properties) {
- $this->aValues = $aValues;
- $this->aPath = $aPath;
- $this->aProperties = $properties;
- if (!empty($this->aValues['token'])) {
- $this->oConnection = new Connection($this->aValues, $this->aProperties);
- }
- }
-
- /**
- * @SWG\Get(path="/versions",
- * tags={"Versions"},
- * summary="Get versions",
- * description="Request to get versions",
- * operationId="GET",
- * produces={"application/xml", "application/json", "application/x-vm-json"},
- * @SWG\Parameter(
- * name="token",
- * in="query",
- * description="user token",
- * required=false,
- * type="string"
- * ),
- * @SWG\Response(
- * response=200,
- * description="Poprerties Response",
- * @SWG\Schema(ref="#/definitions/versions")
- * )
- * )
- */
-
- /**
- *
- * @return versions
- */
- function GET() {
- if ($this->oConnection->oError == null) {
- $this->getVersion();
- if (!empty($this->aValues['token']) && in_array("vitis_admin", $this->oConnection->aPrivileges)) {
-
- //$this->aFields = $this->aVersions;
- $this->aFields['php_version'] = phpversion();
-
- //*** PDO
- $bPdo = false;
- if (extension_loaded('pdo'))
- $bPdo = true;
- else
- $bVeremap = false;
- $this->aFields['pdo_extension_loaded'] = $bPdo;
-
- //*** PDO Postgresql
- $bPdoPgsql = false;
- if (extension_loaded('pdo_pgsql'))
- $bPdoPgsql = true;
- else
- $bVeremap = false;
- $this->aFields['pdo_pgsql_extension_loaded'] = $bPdoPgsql;
-
- //*** Curl
- $bCurl = false;
- if (extension_loaded('curl'))
- $bCurl = true;
- else
- $bVeremap = false;
- $this->aFields['curl_extension_loaded'] = $bCurl;
-
- //*** Xsl
- $bXsl = false;
- if (extension_loaded('xsl'))
- $bXsl = true;
- $this->aFields['xsl_extension_loaded'] = $bXsl;
-
- //*** Ldap
- $bLdap = false;
- if (extension_loaded('ldap'))
- $bLdap = true;
- $this->aFields['ldap_extension_loaded'] = $bLdap;
-
- // OS.
- $this->aFields['os_version'] = php_uname();
-
- // Info disque.
- $this->aFields['disk_free_space'] = round(disk_free_space("/") / 1073741824) . ' Go';
- $this->aFields['disk_total_space'] = round(disk_total_space("/") / 1073741824) . ' Go';
-
- //
- $this->aFields['server_software'] = $_SERVER['SERVER_SOFTWARE'];
- $this->aFields['server_addr'] = $_SERVER['SERVER_ADDR'];
- $this->aFields['server_name'] = $_SERVER['SERVER_NAME'];
- $this->aFields['server_port'] = $_SERVER['SERVER_PORT'];
-
- //** Postgresql et Postgis
- $bPostgresql = false;
- $bPostgis = false;
- if (!$this->oConnection->oBd->erreurRencontree) {
- $bPostgresql = true;
- $sSql = "SHOW server_version";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- $oPgVersion = $this->oConnection->oBd->objetSuivant($oPDOresult);
- $sPostgresql = $oPgVersion->server_version;
- $this->aFields['postgresql_version'] = $sPostgresql;
- $this->oConnection->oBd->fermeResultat();
-
- $aVersion = explode(".", $sPostgresql);
- $bExtension = false;
- if ($aVersion[0] >= 9) {
- if ($aVersion[1] >= 1) {
- $bExtension = true;
- }
- }
- if ($bExtension == true) {
- $sSql = "SELECT default_version FROM pg_catalog.pg_available_extensions where name = 'postgis';";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $bPostgis = true;
- $sPostgis = $aPostgis['default_version'];
- } else {
- $bPostgis = false;
- }
- } else {
- $sSql = "SELECT datname FROM pg_catalog.pg_database where datname = 'template_postgis_20';";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $bPostgis = true;
- $sPostgis = '2.0';
- } else {
- $bPostgis = false;
- }
- }
- $this->aFields['postgis_version'] = $sPostgis;
- $this->oConnection->oBd->fermeResultat();
- $sSql = 'SELECT distinct module_id from [sSchemaFramework].vm_mode';
- $aParams['sSchemaFramework'] = array('value' => $this->aProperties['schema_framework'], 'type' => 'schema_name');
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, $aParams);
- while ($aLigne = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $aModules[] = $aLigne['module_id'];
- }
- $iRecordset = $this->oConnection->oBd->fermeResultat();
- }
- $this->aFields['postgresql'] = $bPostgresql;
- $this->aFields['postgis'] = $bPostgis;
-
- // Recherche de mise à jour
- //
- if (!empty($this->aValues['app'])) {
- $sUrl = "http://update.veremes.net/vai/" . $this->aValues['app'] . ".json";
- $json = file_get_contents($sUrl);
- $data = json_decode($json, TRUE);
- $this->aFields['appVersion'] = $data['version'];
- }
- }
- $aXmlRacineAttribute['status'] = 1;
- $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
- } else {
- http_response_code(403);
- $aXmlRacineAttribute['status'] = 0;
- $this->aFields['errorMessage'] = "ERROR : invalid token";
- $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
- }
-
- return $sMessage;
- }
-
-}
-
+<?php
+
+require_once 'Vitis.class.inc';
+require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+
+/**
+ * \file versions.class.inc
+ * \class Versions
+ *
+ * \author Yoann Perollet <yoann.perollet@veremes.com>.
+ *
+ * \brief This file contains the Versions php class
+ *
+ * This class defines the rest api for versions
+ *
+ */
+class Versions extends Vitis {
+ /**
+ * @SWG\Definition(
+ * definition="/versions",
+ * allOf={
+ * @SWG\Schema(ref="#/definitions/versions")
+ * }
+ * )
+ * @SWG\Tag(
+ * name="Versions",
+ * description="Operations about versions"
+ * )
+ */
+
+ /**
+ * construct
+ * @param type $aPath url of the request
+ * @param type $aValues parameters of the request
+ * @param type $versions ptroperties
+ */
+ function __construct($aPath, $aValues, $properties) {
+ $this->aValues = $aValues;
+ $this->aPath = $aPath;
+ $this->aProperties = $properties;
+ if (!empty($this->aValues['token'])) {
+ $this->oConnection = new Connection($this->aValues, $this->aProperties);
+ }
+ }
+
+ /**
+ * @SWG\Get(path="/versions",
+ * tags={"Versions"},
+ * summary="Get versions",
+ * description="Request to get versions",
+ * operationId="GET",
+ * produces={"application/xml", "application/json", "application/x-vm-json"},
+ * @SWG\Parameter(
+ * name="token",
+ * in="query",
+ * description="user token",
+ * required=false,
+ * type="string"
+ * ),
+ * @SWG\Response(
+ * response=200,
+ * description="Poprerties Response",
+ * @SWG\Schema(ref="#/definitions/versions")
+ * )
+ * )
+ */
+
+ /**
+ *
+ * @return versions
+ */
+ function GET() {
+ if ($this->oConnection->oError == null) {
+ $this->getVersion();
+ if (!empty($this->aValues['token']) && in_array("vitis_admin", $this->oConnection->aPrivileges)) {
+
+ //$this->aFields = $this->aVersions;
+ $this->aFields['php_version'] = phpversion();
+
+ //*** PDO
+ $bPdo = false;
+ if (extension_loaded('pdo'))
+ $bPdo = true;
+ else
+ $bVeremap = false;
+ $this->aFields['pdo_extension_loaded'] = $bPdo;
+
+ //*** PDO Postgresql
+ $bPdoPgsql = false;
+ if (extension_loaded('pdo_pgsql'))
+ $bPdoPgsql = true;
+ else
+ $bVeremap = false;
+ $this->aFields['pdo_pgsql_extension_loaded'] = $bPdoPgsql;
+
+ //*** Curl
+ $bCurl = false;
+ if (extension_loaded('curl'))
+ $bCurl = true;
+ else
+ $bVeremap = false;
+ $this->aFields['curl_extension_loaded'] = $bCurl;
+
+ //*** Xsl
+ $bXsl = false;
+ if (extension_loaded('xsl'))
+ $bXsl = true;
+ $this->aFields['xsl_extension_loaded'] = $bXsl;
+
+ //*** Ldap
+ $bLdap = false;
+ if (extension_loaded('ldap'))
+ $bLdap = true;
+ $this->aFields['ldap_extension_loaded'] = $bLdap;
+
+ // OS.
+ $this->aFields['os_version'] = php_uname();
+
+ // Info disque.
+ $this->aFields['disk_free_space'] = round(disk_free_space("/") / 1073741824) . ' Go';
+ $this->aFields['disk_total_space'] = round(disk_total_space("/") / 1073741824) . ' Go';
+
+ //
+ $this->aFields['server_software'] = $_SERVER['SERVER_SOFTWARE'];
+ $this->aFields['server_addr'] = $_SERVER['SERVER_ADDR'];
+ $this->aFields['server_name'] = $_SERVER['SERVER_NAME'];
+ $this->aFields['server_port'] = $_SERVER['SERVER_PORT'];
+
+ //** Postgresql et Postgis
+ $bPostgresql = false;
+ $bPostgis = false;
+ if (!$this->oConnection->oBd->erreurRencontree) {
+ $bPostgresql = true;
+ $sSql = "SHOW server_version";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ $oPgVersion = $this->oConnection->oBd->objetSuivant($oPDOresult);
+ $sPostgresql = $oPgVersion->server_version;
+ $this->aFields['postgresql_version'] = $sPostgresql;
+ $this->oConnection->oBd->fermeResultat();
+
+ $aVersion = explode(".", $sPostgresql);
+ $bExtension = false;
+ if ($aVersion[0] . $aVersion[1] >= 91) {
+ $bExtension = true;
+ }
+ if ($bExtension == true) {
+ $sSql = "SELECT default_version FROM pg_catalog.pg_available_extensions where name = 'postgis';";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $bPostgis = true;
+ $sPostgis = $aPostgis['default_version'];
+ } else {
+ $bPostgis = false;
+ }
+ } else {
+ $sSql = "SELECT datname FROM pg_catalog.pg_database where datname = 'template_postgis_20';";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $bPostgis = true;
+ $sPostgis = '2.0';
+ } else {
+ $bPostgis = false;
+ }
+ }
+ $this->aFields['postgis_version'] = $sPostgis;
+ $this->oConnection->oBd->fermeResultat();
+ $sSql = 'SELECT distinct module_id from [sSchemaFramework].vm_mode';
+ $aParams['sSchemaFramework'] = array('value' => $this->aProperties['schema_framework'], 'type' => 'schema_name');
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, $aParams);
+ while ($aLigne = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $aModules[] = $aLigne['module_id'];
+ }
+ $iRecordset = $this->oConnection->oBd->fermeResultat();
+ }
+ $this->aFields['postgresql'] = $bPostgresql;
+ $this->aFields['postgis'] = $bPostgis;
+
+ // Recherche de mise à jour
+ //
+ if (!empty($this->aValues['app'])) {
+ $sUrl = "http://update.veremes.net/vai/" . $this->aValues['app'] . ".json";
+ $json = file_get_contents($sUrl);
+ $data = json_decode($json, TRUE);
+ $this->aFields['appVersion'] = $data['version'];
+ }
+ }
+ $aXmlRacineAttribute['status'] = 1;
+ $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
+ } else {
+ http_response_code(403);
+ $aXmlRacineAttribute['status'] = 0;
+ $this->aFields['errorMessage'] = "ERROR : invalid token";
+ $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
+ }
+
+ return $sMessage;
+ }
+
+}
+
?>
\ No newline at end of file