incrize

diff --git a/addons/buy_together/controllers/customer/products.pre.php b/addons/buy_together/controllers/customer/products.pre.php
index b3d9bbc..e43fb18 100644
--- a/addons/buy_together/controllers/customer/products.pre.php
+++ b/addons/buy_together/controllers/customer/products.pre.php
@@ -1 +1,57 @@
 <?php
+/***************************************************************************
+ *                                                                          *
+ *   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *
+ *                                                                          *

incrize

diff --git a/app/payments/firstdata_connect.php b/app/payments/firstdata_connect.php
index 1ac3c0d..3c65d21 100644
--- a/app/payments/firstdata_connect.php
+++ b/app/payments/firstdata_connect.php
@@ -1,59 +1,109 @@
 <?php
 /***************************************************************************
-*                                                                          *
-*   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *
-*                                                                          *

incrize

diff --git a/app/Tygh/Mailer.php b/app/Tygh/Mailer.php
index 92f5a32..0c4bf77 100644
--- a/app/Tygh/Mailer.php
+++ b/app/Tygh/Mailer.php
@@ -19,6 +19,7 @@ class Mailer extends \PHPMailer
 {
     private static $_mailer;
     private static $default_settings;
+    private static $strict_smtp_servers = array('smtp.office365.com');
 

incrize

diff --git a/app/Tygh/Session.php b/app/Tygh/Session.php
index d5ac870..9b79a72 100644
--- a/app/Tygh/Session.php
+++ b/app/Tygh/Session.php
@@ -435,7 +435,7 @@ class Session
         ini_set('session.hash_bits_per_character', 4); // 4 bits for character, so we'll have 128/4 = 32 bytes hash length
 
         // Secure session cookie with HTTPONLY parameter
-        session_set_cookie_params(self::$ttl_storage, $cookie_path, $cookie_domain, false, true);
+        session_set_cookie_params(self::$ttl_storage, $cookie_path, $cookie_domain, true, true);

incrize

diff --git a/app/Tygh/Session.php b/app/Tygh/Session.php
index 5465cc3..7df4148 100644
--- a/app/Tygh/Session.php
+++ b/app/Tygh/Session.php
@@ -397,7 +397,7 @@ class Session
         ini_set('session.hash_bits_per_character', 4); // 4 bits for character, so we'll have 128/4 = 32 bytes hash length
 
         // Secure session cookie with HTTPONLY parameter
-        session_set_cookie_params(SESSIONS_STORAGE_ALIVE_TIME, $cookie_path, $cookie_domain, false, true);
+        session_set_cookie_params(SESSIONS_STORAGE_ALIVE_TIME, $cookie_path, $cookie_domain, defined('HTTPS'), true);

incrize

diff --git a/app/Tygh/Navigation/LastView/ACommon.php b/app/Tygh/Navigation/LastView/ACommon.php
index b63eaab..1629d23 100644
--- a/app/Tygh/Navigation/LastView/ACommon.php
+++ b/app/Tygh/Navigation/LastView/ACommon.php
@@ -216,17 +216,20 @@ abstract class ACommon
      * @param  int     $next_id     Next element id
      * @param  int     $prev_id     Previous element id
      * @param  int     $total_items Total items
+     * @param  array   $url_params  Additional url params (key => value)
      * @return boolean Always true

incrize

diff --git a/app/addons/seo/func.php b/app/addons/seo/func.php
index 7c77544..4d80439 100644
--- a/app/addons/seo/func.php
+++ b/app/addons/seo/func.php
@@ -550,7 +550,7 @@ function fn_seo_update_object($object_data, $object_id, $type, $lang_code)
 
         // Do nothing if SEO name was not changed
         $old_name = fn_seo_get_name($type, $object_id, '', $_company_id, $lang_code);
-        if ($object_data['seo_name'] == $old_name) {
+        if (!empty($old_name) && $object_data['seo_name'] == $old_name) {

incrize

diff --git a/app/schemas/exim/products.functions.php b/app/schemas/exim/products.functions.php
index 9085c4b..ad606e2 100644
--- a/app/schemas/exim/products.functions.php
+++ b/app/schemas/exim/products.functions.php
@@ -684,16 +684,14 @@ function fn_exim_set_product_options($product_id, $data, $lang_code, $features_d
                         }
                     }
                 }
-                if (empty($option_id)) {
 

incrize

diff --git a/app/schemas/exim/products.functions.php b/app/schemas/exim/products.functions.php
index ccc3ac0..177ea75 100644
--- a/app/schemas/exim/products.functions.php
+++ b/app/schemas/exim/products.functions.php
@@ -631,7 +631,20 @@ function fn_exim_set_product_options($product_id, $data, $lang_code, $features_d
                 }
 
                 if ($lang_code == $main_lang) {
-                    $option_id = db_get_field("SELECT o.option_id FROM ?:product_options_descriptions as d INNER JOIN ?:product_options as o ON o.option_id = d.option_id AND o.product_id = ?i WHERE d.option_name = ?s AND d.lang_code = ?s LIMIT 1", ($global_option) ? 0 : $product_id, $option['name'], $lang_code);
+                    $condition = "d.option_name = ?s AND d.lang_code = ?s";

incrize

diff --git a/app/functions/fn.cart.php b/app/functions/fn.cart.php
index 9345354..61f4410 100644
--- a/app/functions/fn.cart.php
+++ b/app/functions/fn.cart.php
@@ -6287,7 +6287,7 @@ function fn_add_product_options_files($product_data, &$cart, &$auth, $update = f
         foreach ($uploaded_data as $key => $file) {
             $file_info = fn_pathinfo($file['name']);
             $file['extension'] = empty($file_info['extension']) ? '' : $file_info['extension'];
-            $file['is_image'] = fn_get_image_extension($file['type']);
+            $file['is_image'] = isset($file['type']) ? fn_get_image_extension($file['type']) : false;