Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add function isajaxrequest() #1400

Merged
merged 18 commits into from
Apr 4, 2017
Merged

add function isajaxrequest() #1400

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
68c660e
Update Taxonomy.php
gigago Oct 21, 2016
f7a12fa
Update TwigExtension.php
gigago Oct 21, 2016
e1c1273
Update TwigExtension.php
gigago Oct 23, 2016
9c1830d
Update TwigExtension.php
gigago Dec 13, 2016
102973d
Update TwigExtension.php
gigago Dec 13, 2016
7a59a84
Merge remote-tracking branch 'origin/develop' into develop
Dec 16, 2016
5a41348
Merge remote-tracking branch 'origin/master' into develop
Dec 17, 2016
50fc775
Revert "Merge remote-tracking branch 'origin/develop' into develop"
Dec 17, 2016
e2704d9
Revert "Revert "Merge remote-tracking branch 'origin/develop' into de…
Dec 17, 2016
07bc773
Attempt to resolve conflicts
Dec 17, 2016
445fd13
param comment corrected
Dec 17, 2016
b1f4a2c
Update TwigExtension.php
gigago Dec 17, 2016
5c089bf
Update TwigExtension.php
gigago Dec 17, 2016
8e0430a
Update TwigExtension.php
gigago Dec 17, 2016
f16ae0d
Update TwigExtension.php
gigago Dec 17, 2016
9324ef3
add isajaxrequest
Apr 3, 2017
251d7a6
remove ishuman
Apr 3, 2017
d7e1e43
remove Browser class
Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions system/src/Grav/Common/Twig/TwigExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public function getFunctions()
new \Twig_SimpleFunction('get_cookie', [$this, 'getCookie']),
new \Twig_SimpleFunction('redirect_me', [$this, 'redirectFunc']),
new \Twig_SimpleFunction('range', [$this, 'rangeFunc']),
new \Twig_SimpleFunction('isajaxrequest', [$this, 'isAjaxFunc']),
];
}

Expand Down Expand Up @@ -848,4 +849,17 @@ public function rangeFunc($start = 0, $end = 100, $step = 1)
{
return range($start, $end, $step);
}

/**
* Check if HTTP_X_REQUESTED_WITH has been set to xmlhttprequest,
* in which case we may unsafely assume ajax. Non critical use only.
*
* @return true if HTTP_X_REQUESTED_WITH exists and has been set to xmlhttprequest
*/
public function isAjaxFunc()
{
return (
!empty($_SERVER['HTTP_X_REQUESTED_WITH'])
&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
}