Merge branch 'release-1.4.5'

.gitignore

@@ -5,3 +5,4 @@ wordpress/
 node_modules/
 logs/nginx/*.log
 yarn.lock
+wp-content/uploads/additional/

README.md

@@ -20,9 +20,9 @@
 
 ## Production
 - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
-- build new image `docker build -t biuro/web:1.4.4 .` (update version number)
+- build new image `docker build -t biuro/web:1.4.5 .` (update version number)
 - login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
-- push image to docker repository - `docker push biuro/web:1.4.4`
+- push image to docker repository - `docker push biuro/web:1.4.5`
 
 ## Production
 - update biuro/web image version in .env file (staging or www)

package.json

 {
   "name": "biuro",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "Biuro WP theme",
   "scripts": {
     "dev": "gulp --require @babel/register --gulpfile tasks",

wp-content/plugins/biuro-contacts/public/class-biuro-contacts-public.php

@@ -360,7 +360,7 @@ class Biuro_Contacts_Public {
                 // Get the type of the uploaded file. This is returned as "type/extension"
                 $arr_file_type = wp_check_filetype( basename( $file['name'] ) );
                 $uploaded_file_type = $arr_file_type['type'];
-                if( ! in_array( $uploaded_file_type, $allowed_file_types ) ) {
+                if( $file['name'] && !in_array( $uploaded_file_type, $allowed_file_types ) ) {
                     wp_redirect( $referer );
                     exit;
                 }
@@ -394,7 +394,7 @@ class Biuro_Contacts_Public {
             $_SESSION['employees--s'] = 2;
         endif;
 
-        $hash = ($_SESSION['employees--name-status'] != 'error' && $_SESSION['employees--phone-status'] != 'error' &&  $_SESSION['employees--agree-status'] == 'error') ? '?#agree' : '?#action';
+        $hash = ($_SESSION['employees--name-status'] != 'error' && $_SESSION['employees--phone-status'] != 'error' &&  $_SESSION['employees--agree-status'] == 'error') ? '#agree' : '#action';
 
         if ($_POST['s'] == "1"):
             wp_redirect( $referer . $hash );
@@ -516,7 +516,7 @@ class Biuro_Contacts_Public {
         endif;
 
 
-        $hash = ($_SESSION['employers--name-status'] != 'error' && $_SESSION['employers--phone-status'] != 'error' &&  $_SESSION['employers--agree-status'] == 'error') ? '?#agree' : '?#action';
+        $hash = ($_SESSION['employers--name-status'] != 'error' && $_SESSION['employers--phone-status'] != 'error' &&  $_SESSION['employers--agree-status'] == 'error') ? '#agree' : '#action';
 
         if ($_POST['s'] == "1"):
             wp_redirect( $referer . $hash );
@@ -699,7 +699,7 @@ class Biuro_Contacts_Public {
             $_SESSION['position--step'] = 2;
             $_SESSION['position--s'] = 1;
 
-            $hash = '?#agree';
+            $hash = '#agree';
 
         elseif ($_POST['s'] == "2"):
 
@@ -731,7 +731,7 @@ class Biuro_Contacts_Public {
                 $_SESSION[$str . '--' . $key . '-message'] = $validation['message'];
             }
 
-            $hash = ($_SESSION['position--name-status'] != 'error' && $_SESSION['position--phone-status'] != 'error' && $_SESSION['position--agree-status'] == 'error') ? '?#agree' : '?#action';
+            $hash = ($_SESSION['position--name-status'] != 'error' && $_SESSION['position--phone-status'] != 'error' && $_SESSION['position--agree-status'] == 'error') ? '#agree' : '#action';
 
             if ($canSubmit):
 
@@ -743,7 +743,7 @@ class Biuro_Contacts_Public {
                     // Get the type of the uploaded file. This is returned as "type/extension"
                     $arr_file_type = wp_check_filetype( basename( $file['name'] ) );
                     $uploaded_file_type = $arr_file_type['type'];
-                    if( ! in_array( $uploaded_file_type, $allowed_file_types ) ) {
+                    if( $file['name'] && !in_array( $uploaded_file_type, $allowed_file_types ) ) {
                         wp_redirect( $referer );
                         exit;
                     }

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employers--step-2.php

@@ -29,7 +29,7 @@ if ( ! defined( 'WPINC' ) ) die;
     <div class="c-form--row">
         <label class="c-form--label" for="form-message"><?php _e('Message', 'biuro-contacts'); ?></label>
         <div class="c-form--textarea-wrap">
-            <textarea name="message" id="form-message" cols="30" rows="3" class="c-form--textarea"></textarea>
+            <textarea name="message" id="form-message" cols="30" rows="10" class="c-form--textarea"></textarea>
         </div>
     </div><!-- .c-form--row -->