Misc code cleanups and comment.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/includes/formbooking.php b/includes/formbooking.php
index 373e18bfbbe1fa1520ee9ba8a25489ae255bbd19..f1a5fe90f778f688c32d1841a7cc1552568d91b5 100644 (file)
--- a/includes/formbooking.php
+++ b/includes/formbooking.php
@@ -52,6 +52,7 @@ if (!$input_failure && !empty($form_nb_place) && !empty($form_class_name)) {
     $rows = $connection->get_result_array();
     $connection->close_prepared_query();
     foreach ($rows as $row) {
+        echo "(Simulation de paiement d'une re&#769;servation) <br>"
         echo "Vous avez re&#769;serve&#769; et paye&#769; " . $form_nb_place . " place(s) sur le vol " .$form_flight_id .
              " au de&#769;part de " . $row['VilleD'].  " a&#768; " . $row['DateD'] . " arrivant a&#768; " . $row['VilleA'] . " a&#768; " . $row['DateA'] .
              " pour un montant de " . $form_place_price * $form_nb_place . "&euro;. <br>";

diff --git a/includes/formlogin.php b/includes/formlogin.php
index ed17f8069d80b075a3fb1b876ccba14071b1f87f..b07ad4eb3c0303ed17c6fcbe812da28732fa4429 100644 (file)
--- a/includes/formlogin.php
+++ b/includes/formlogin.php
@@ -4,6 +4,7 @@ $form_password = filter_input(INPUT_POST, "password", FILTER_SANITIZE_STRING);
 
 if (!$form_email) {
     echo "The email is not valid. <br>";
+    redirect("index.php?page=login", 3);
 } elseif (isset($form_email) && isset($form_password)) {
     if (chk_account($form_email)) {
         if (chk_password($form_email, $form_password)) {
@@ -24,7 +25,7 @@ if (!$form_email) {
         redirect("index.php?page=register", 3);
     }
 } else {
-    // didn't authenticate, go back to login form
-    echo "Fail to authenticate. <br>";
+    // didn't authenticate for unknown reason, go back to login form
+    echo "Fail to authenticate for unknown reason. <br>";
     redirect("index.php?page=login", 3);
 }

diff --git a/includes/formregister.php b/includes/formregister.php
index 6cb92236fa569bfa61d91993776b3bec8d8ca33d..4abaa5001fd1a712dcef5c3f782199814afc2dee 100644 (file)
--- a/includes/formregister.php
+++ b/includes/formregister.php
@@ -9,31 +9,28 @@ $form_email = filter_input(INPUT_POST, "email", FILTER_VALIDATE_EMAIL);
 $form_password = filter_input(INPUT_POST, "password", FILTER_SANITIZE_STRING);
 $form_confirmpassword = filter_input(INPUT_POST, "confirmpassword", FILTER_SANITIZE_STRING);
 
-$error_numstreet = false;
-$error_postalcode = false;
-$error_email = false;
-$error_password = false;
+$input_failure = false;
 
 if (!$form_numstreet) {
     echo "The street number is not valid. <br>" ;
-    $error_numstreet = true;
+    $input_failure = true;
 }
 if (!$form_postalcode) {
     echo "The postal code is not valid. <br>";
-    $error_postalcode = true;
+    $input_failure = true;
 }
 if (!$form_email) {
     echo "The email is not valid. <br>";
-    $error_email = true;
+    $input_failure = true;
 }
 if (strcmp($form_password, $form_confirmpassword) !== 0) {
     echo "Password do not match. <br>";
-    $error_password = true;
+    $input_failure = true;
 }
 
 if (!empty($form_name) && !empty($form_firstname) && !empty($form_numstreet) && !empty($form_street) &&
     !empty($form_postalcode) && !empty($form_city) && !empty($form_email) && !empty($form_password) &&
-    !$error_numstreet && !$error_postalcode && !$error_email && !$error_password) {
+    !$input_failure) {
     if (!chk_account($form_email)) {
         global $connection;
         $hashed_password = password_hash($form_password, PASSWORD_DEFAULT);

diff --git a/includes/register.php b/includes/register.php
index 8db3bc0d13c1e45a3f305374383b4a9e241b7223..5c1a107da077405164e415112a9ed26299d15211 100644 (file)
--- a/includes/register.php
+++ b/includes/register.php
@@ -22,3 +22,5 @@
  <input type="password" minlength="8" size="15" name="confirmpassword" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).*" title="Doit contenir 8 caracte&#768;res minimum dont une majuscule, une minuscule et un chiffre" required/>
  <input type="submit" value="Valider">
 </form>
+
+<p> * : Champs obligatoire. </p>

diff --git a/lib/db.php b/lib/db.php
index cd9b0825331a60c40b9c9a6d23590c487ffa8cd6..bcbf5aebc2709265decce8a7d53ac86099f190f5 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -31,6 +31,9 @@ class CustomDB
         return $this->connection;
     }
 
+    /**
+     * [__destruct description]
+     */
     /* public function __destruct()
     {
         $this->close();
@@ -106,6 +109,10 @@ class CustomDB
         return $rt_val;
     }
 
+    /**
+     * [get_pquery_result description]
+     * @return [type] [description]
+     */
     public function get_pquery_result()
     {
         $rt_val = $this->current_result = $this->current_stmt->get_result();
@@ -115,6 +122,10 @@ class CustomDB
         return $rt_val;
     }
 
+    /**
+     * [get_result_array description]
+     * @return [type] [description]
+     */
     public function get_result_array()
     {
         $row = $this->current_result->fetch_array();

diff --git a/lib/utils.php b/lib/utils.php
index 47c8bda2e0d0c1784fb129f09fb9709de4c99e1d..9955458cffd1c7b8420082dec60dd75c1ceb7496 100644 (file)
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * [is_post_request description]
+ * @return boolean [description]
+ */
 function is_post_request()
 {
     if (filter_input(INPUT_SERVER, 'REQUEST_METHOD') === 'POST') {
@@ -9,6 +13,10 @@ function is_post_request()
     }
 }
 
+/**
+ * [is_get_request description]
+ * @return boolean [description]
+ */
 function is_get_request()
 {
     if (filter_input(INPUT_SERVER, 'REQUEST_METHOD') === 'GET') {
@@ -18,6 +26,11 @@ function is_get_request()
     }
 }
 
+/**
+ * [chk_account description]
+ * @param  [type] $email [description]
+ * @return [type]        [description]
+ */
 function chk_account($email)
 {
     global $connection;
@@ -35,6 +48,12 @@ function chk_account($email)
     }
 }
 
+/**
+ * [chk_password description]
+ * @param  [type] $email    [description]
+ * @param  [type] $password [description]
+ * @return [type]           [description]
+ */
 function chk_password($email, $password)
 {
     global $connection;
@@ -52,6 +71,11 @@ function chk_password($email, $password)
     }
 }
 
+/**
+ * [get_client_id description]
+ * @param  [type] $email [description]
+ * @return [type]        [description]
+ */
 function get_client_id($email)
 {
     global $connection;
@@ -65,6 +89,12 @@ function get_client_id($email)
     return $row[0][0];
 }
 
+/**
+ * [nb_booked description]
+ * @param  [type] $client_id [description]
+ * @param  [type] $flight_id [description]
+ * @return [type]            [description]
+ */
 function nb_booked($client_id, $flight_id)
 {
     global $connection;
@@ -78,6 +108,10 @@ function nb_booked($client_id, $flight_id)
     return $row[0][0];
 }
 
+/**
+ * [chk_logged_in description]
+ * @return [type] [description]
+ */
 function chk_logged_in()
 {
     if (isset($_SESSION['email']) && isset($_SESSION['IP_address'])) {
@@ -87,6 +121,12 @@ function chk_logged_in()
     }
 }
 
+/**
+ * [redirect description]
+ * @param  [type] $url   [description]
+ * @param  [type] $delay [description]
+ * @return [type]        [description]
+ */
 function redirect($url, $delay)
 {
     header("refresh:$delay; url=$url");