Changeset c4e2312

Timestamp:

Nov 26, 2019, 12:31:23 AM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

79b2416, d311f11

Parents:

594f591 (diff), ee33d0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

lazersib <blacklight@…> (26/11/19 00:31:23)

git-committer:

GitHub <noreply@…> (26/11/19 00:31:23)

Message:

Merge pull request #4 from magnatiwe/fix_cart_modal

Fix cart modal

Location:

web

Files:

• core.php (modified) (1 diff)
• css/comm.js (modified) (2 diffs)
• skins/default/basic.css (modified) (1 diff)
• vitrina.php (modified) (1 diff)

web/core.php

@@ -192 +192 @@
         if(isset($_REQUEST[$varname]))  return $_REQUEST[$varname];
         return $def;
+}
+
+/// Проверяет был ли получен запрос через ajax
+/// @return boolean
+function isAjaxRequest()
+{
+        return isset($_SERVER['HTTP_X_REQUESTED_WITH'])
+                && !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+                && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest';
 }
 

web/css/comm.js

@@ -379 +379 @@
     httpRequest.onreadystatechange = function() { popupReqWin(httpRequest,popup); };
     httpRequest.open('GET', url, true);
+        httpRequest.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     httpRequest.send(null);
     return false;
@@ -405 +406 @@
                 //popup.innerHTML="Обработка...";
         }
-        else popup.innerHTML="state "+httpRequest.readyState;
 }
 

web/skins/default/basic.css

@@ -193 +193 @@
 div.notify
 {
-    width: 97%;
     BORDER: #999900 1px solid;
     FONT-SIZE: 14px;

web/vitrina.php

@@ -194 +194 @@
                 }
             } else {
-                if (getenv("HTTP_REFERER")) {
-                    redirect(getenv("HTTP_REFERER"));
-                }
-                $tmpl->msg("Товар добавлен в корзину!", "info", "<a class='urllink' href='/vitrina.php?mode=basket'>Ваша корзина</a>");
+                    if(isAjaxRequest()) {
+                            $tmpl->msg("Товар добавлен в корзину!", "info", "<a class='urllink' href='/vitrina.php?mode=basket'>Ваша корзина</a>");
+                    } else {
+                            if (getenv("HTTP_REFERER")) {
+                                    redirect(getenv("HTTP_REFERER"));
+                            }
+                    }
             }
         } else {