Merge branch 'next-release' into 'f_modularization_wip_rebased'

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
index 95888b5f7a0e80d266844bc049ae9edfcd642dc1..6ef117ed13ee5c0a9c1b5417e7ef3a99a5326fee 100644 (file)
--- a/script.php
+++ b/script.php
@@ -81,13 +81,13 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }


@@ -146,13 +146,13 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }


@@ -422,13 +422,13 @@ elseif (isset($_GET['init_async'])) {
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];

-        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex'){
-            if (!preg_match($cfg['download_password_policy_regex'], $key)){
+        if ($cfg['download_password_requirement'] !== 'generated' && $cfg['download_password_policy'] === 'regex') {
+            if (!preg_match($cfg['download_password_policy_regex'], $key)) {

                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }
                 echo 'Error 14: The download password is not complying to the security standards.';
                 exit;
             }
         }

-    }elseif ($cfg['download_password_requirement'] !== 'optional'){
+    } elseif ($cfg['download_password_requirement'] !== 'optional') {

         echo 'Error 13: The parameter password is required.';
         exit;
     }
         echo 'Error 13: The parameter password is required.';
         exit;
     }