Переглянути джерело

Various fixes for php scripts

boutils 10 роки тому
батько
коміт
1c7e469d8d
3 змінених файлів з 26 додано та 17 видалено
  1. 15 6
      ajax/datastores.php
  2. 1 0
      ajax/oracle.php
  3. 10 11
      js/app.js

+ 15 - 6
ajax/datastores.php

@@ -2,6 +2,9 @@
 
 ini_set("SMTP", "mail.manchenumerique.fr");
 ini_set("sendmail_from", "ftth@manchenumerique.fr");
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
 
 function connect(){
 
@@ -33,24 +36,30 @@ function executeQuery($requete) {
 
 connect();
 
-if($_POST['query']) {
+if(isset($_POST['query'])) {
   $resultat = executeQuery($_POST['query']);
 }
 
-if($_POST['mail']) {
+if(isset($_POST['mail'])) {
     // Pour envoyer un mail HTML, l'en-tête Content-type doit être défini
      $headers  = 'MIME-Version: 1.0' . "\r\n";
      $headers .= 'Content-type: text/html; charset=utf-8' . "\r\n";
 
-     $email = $_POST['siteEmail'] || 'ftth@manchenumerique.fr';
+     $email = 'ftth@manchenumerique.fr';
+
+     if(isset($_POST['siteEmail'])) {
+      $email = $_POST['siteEmail'];
+     }
 
      // En-têtes additionnels
      $headers .= 'From: Manche Numérique <'.$email.'>' . "\r\n";
 
      // Envoi
-     $to=$_POST['mail']['to'];
-     mail($to, $_POST['mail']['sujet'], $_POST['mail']['message'], $headers);
+     $to = $_POST['mail']['to'];
+     $resultat = mail($to, $_POST['mail']['sujet'], $_POST['mail']['message'], $headers);
 }
 
-echo json_encode($resultat);
+if(isset($resultat)){
+  echo json_encode($resultat);
+}
 ?>

+ 1 - 0
ajax/oracle.php

@@ -17,6 +17,7 @@
 
   // Execute query
   function executeQuery($conn, $query) {
+    $res = [];
 
     $stid = oci_parse($conn, $query);
 

+ 10 - 11
js/app.js

@@ -970,15 +970,14 @@ app.controller('mainController', function($scope, $detection, $http, $mdSidenav,
       // $scope.result.eligibilite.ce_logement_est         = 'residence_principale';
       // $scope.result.eligibilite.info_et_libertes        = true;
       // $scope.result.eligibilite.accord                  = 'avec_souscription';
-      // $scope.result.eligibilite.souscription_engagement = true;
-
-      // $scope.result.eligibilite.geo_code            = JSON.stringify($scope.geoCode);
-      // $scope.result.eligibilite.code_postal         = address.Postal;
-      // $scope.result.eligibilite.complement_addresse = address.Match_addr;
-      // $scope.result.eligibilite.nom_voie            = address.Address;
-      // $scope.result.eligibilite.numero_voie         = address.StreetNumber;
-      // $scope.result.eligibilite.type_voie           = address.StreetType;
-      // $scope.result.eligibilite.ville               = address.City;
+
+      $scope.result.eligibilite.geo_code            = JSON.stringify($scope.geoCode);
+      $scope.result.eligibilite.code_postal         = address.Postal;
+      $scope.result.eligibilite.complement_addresse = address.Match_addr;
+      $scope.result.eligibilite.nom_voie            = address.Address;
+      $scope.result.eligibilite.numero_voie         = address.StreetNumber;
+      $scope.result.eligibilite.type_voie           = address.StreetType;
+      $scope.result.eligibilite.ville               = address.City;
     });
   };
 
@@ -1097,9 +1096,9 @@ app.controller('mainController', function($scope, $detection, $http, $mdSidenav,
 
     var dateTime = (new Date ((new Date((new Date(new Date())).toISOString() )).getTime() - ((new Date()).getTimezoneOffset()*60000))).toISOString().slice(0, 19).replace('T', ' ');
 
-    var query = "INSERT INTO `eligibilite`.`demandes` (`date`," + keys.substring(0, keys.length -2) + ") VALUES (" + dateTime + ", " + values.substring(0, values.length -2) + ");";
+    var query = "INSERT INTO `eligibilite`.`demandes` (`date`," + keys.substring(0, keys.length -2) + ") VALUES ('" + dateTime + "', " + values.substring(0, values.length -2) + ");";
 
-    //console.log('query', query);
+    console.log('query', query);
 
     $.ajax({
       method : "POST",