Merge branch 'request-uri' into dev

wp-content/plugins/biuro-contacts/includes/class-biuro-contacts-activator.php

@@ -71,7 +71,8 @@ class Biuro_Contacts_Activator {
                 updated datetime DEFAULT '0000-00-00 00:00:00',
                 confirm tinyint DEFAULT 0,
                 job_id int DEFAULT null,
-                referer varchar(255) DEFAULT null,
+                referer text DEFAULT null,
+                request text DEFAULT null,
                 PRIMARY KEY (id)
             ) $charset_collate;";
 
@@ -106,8 +107,9 @@ class Biuro_Contacts_Activator {
                 message longtext DEFAULT null,
                 updated datetime DEFAULT '0000-00-00 00:00:00',
                 confirm tinyint DEFAULT 0,
-                referer varchar(255) DEFAULT null,
+                referer text DEFAULT null,
                 lead_id int DEFAULT null,
+                request text DEFAULT null,
                 PRIMARY KEY (id)
             ) $charset_collate;";
 

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

@@ -387,7 +387,8 @@ class Biuro_Contacts_Public {
             if ($canSubmit):
 
                 $data['referer'] = ($_SESSION['referer'] !== null) ? $_SESSION['referer'] : null;
-                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s' ));
+                $data['request'] = ($_SESSION['request'] !== null) ? $_SESSION['request'] : null;
+                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s', '%s' ));
 
                 $_SESSION[$str . '--step'] = 2;
                 $_SESSION[$str . '--id'] = $insert_id;
@@ -450,8 +451,9 @@ class Biuro_Contacts_Public {
             unset($_SESSION['employees--step']);
 
             $data['referer'] = ($_SESSION['referer'] !== null) ? $_SESSION['referer'] : null;
+            $data['request'] = ($_SESSION['request'] !== null) ? $_SESSION['request'] : null;
 
-            static::update_row_in_db($data, $_SESSION['employees--id'], ['%s', '%d', '%s', '%d', '%s', '%s', '%s', ]);
+            static::update_row_in_db($data, $_SESSION['employees--id'], ['%s', '%d', '%s', '%d', '%s', '%s', '%s', '%s' ]);
 
             $_SESSION['employees--s'] = 2;
         endif;
@@ -540,15 +542,19 @@ class Biuro_Contacts_Public {
 
             if ($canSubmit):
                 $data['referer'] = ($_SESSION['referer'] !== null) ? $_SESSION['referer'] : null;
+                $data['lead_id'] = null;
+                $data['request'] = ($_SESSION['request'] !== null) ? $_SESSION['request'] : null;
 
-                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s' ), 'biuro_employers');
+                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s', '%d', '%s' ), 'biuro_employers');
 
-                static::sendEmail( static::emailContent($data['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $data['phone'], $data['email']), $data['name']);
+                if (!in_array(strstr($_SERVER['SERVER_NAME'], '.biuro', true), array('dev'))):
+                    static::sendEmail( static::emailContent($data['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $data['phone'], $data['email']), $data['name']);
 
-                $return = static::sendPost($data['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $data['phone'], $data['email']);
+                    $return = static::sendPost($data['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $data['phone'], $data['email']);
 
-                if ($return['LEAD_ID']):
-                    static::update_row_in_db(['lead_id' => $return['LEAD_ID']], $insert_id, ['%d'] , 'biuro_employers');
+                    if ($return['LEAD_ID']):
+                        static::update_row_in_db(['lead_id' => $return['LEAD_ID']], $insert_id, ['%d'] , 'biuro_employers');
+                    endif;
                 endif;
 
                 $_SESSION[$str . '--step'] = 2;
@@ -572,15 +578,19 @@ class Biuro_Contacts_Public {
             ];
 
             $data['referer'] = ($_SESSION['referer'] !== null) ? $_SESSION['referer'] : null;
+            $data['lead_id'] = null;
+            $data['request'] = ($_SESSION['request'] !== null) ? $_SESSION['request'] : null;
 
-            static::update_row_in_db($data, $_SESSION['employers--id'], ['%s', '%s', '%d', '%s', '%s'] , 'biuro_employers');
+            static::update_row_in_db($data, $_SESSION['employers--id'], ['%s', '%s', '%d', '%s', '%s', '%d', '%s' ] , 'biuro_employers');
 
             $employerData = static::fetchRow($_SESSION['employers--id'], 'biuro_employers');
 
-            static::sendEmail( static::emailContent($employerData['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $employerData['phone'], $employerData['email'], $data['company'], $data['message']), $employerData['name'] );
+            if (!in_array(strstr($_SERVER['SERVER_NAME'], '.biuro', true), array('dev'))):
+                static::sendEmail( static::emailContent($employerData['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $employerData['phone'], $employerData['email'], $data['company'], $data['message']), $employerData['name'] );
 
-            if ($employerData['lead_id']):
-                $return = static::curlPut($employerData['lead_id'], $employerData['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $employerData['phone'], $employerData['email'], $data['company'], $data['message']);
+                if ($employerData['lead_id']):
+                    $return = static::curlPut($employerData['lead_id'], $employerData['name'], static::BIURO_INSIGHTLY[get_current_blog_id()], $employerData['phone'], $employerData['email'], $data['company'], $data['message']);
+                endif;
             endif;
 
             $_SESSION['employers--s'] = 2;
@@ -858,8 +868,9 @@ class Biuro_Contacts_Public {
                 unset($_SESSION['position--step']);
 
                 $data['referer'] = ($_SESSION['referer'] !== null) ? $_SESSION['referer'] : null;
+                $data['request'] = ($_SESSION['request'] !== null) ? $_SESSION['request'] : null;
 
-                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%s', '%s' ));
+                $insert_id = static::insert_row_to_db($data, array( '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%s', '%s', '%s' ));
 
                 $_SESSION['employees--id'] = $insert_id;
                 $_SESSION['position--s'] = 2;

wp-content/themes/biuro/functions.php

@@ -531,6 +531,10 @@ function start_session() {
     if(!isset($_SESSION['referer']) && isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] !== null) {
         $_SESSION['referer'] = $_SERVER['HTTP_REFERER'];
     }
+
+    if(!isset($_SESSION['request']) && isset($_SERVER['REQUEST_URI'])) {
+        $_SESSION['request'] = $_SERVER['REQUEST_URI'];
+    }
 }
 
 function getBiuroDivisions ( $request ) {