Use X-Requested-With header for XHR detection

Author: jtojnar

controllers/Index.php

@@ -2,6 +2,8 @@
 
 namespace controllers;
 
+use Base;
+
 /**
  * Controller for root
  *
@@ -14,21 +16,14 @@ class Index extends BaseController {
      * home site
      * html
      *
+     * @param Base $f3 fatfree base instance
+     *
      * @return void
      */
-    public function home() {
-        // parse params
-        $options = [];
-        if (\F3::get('homepage') != '') {
-            $options = ['type' => \F3::get('homepage')];
-        }
-
-        // use ajax given params?
-        if (count($_GET) > 0) {
-            $options = $_GET;
-        }
+    public function home(Base $f3) {
+        $options = $_GET;
 
-        if (!isset($options['ajax'])) {
+        if (!$f3->ajax()) {
             // show as full html page
             $this->view->publicMode = \F3::get('public') == 1;
             $this->view->authEnabled = \F3::get('auth')->enabled() === true;
@@ -81,7 +76,7 @@ public function home() {
         }
 
         // ajax call = only send entries and statistics not full template
-        if (isset($options['ajax'])) {
+        if ($f3->ajax()) {
             $this->view->jsonSuccess([
                 'lastUpdate' => \helpers\ViewHelper::date_iso8601($itemsDao->lastUpdate()),
                 'hasMore' => $items['hasMore'],

controllers/Sources.php

@@ -161,13 +161,11 @@ public function write(Base $f3, array $params) {
         $tags = htmlspecialchars($data['tags']);
         $spout = $data['spout'];
         $filter = $data['filter'];
-        $isAjax = isset($data['ajax']);
 
         unset($data['title']);
         unset($data['spout']);
         unset($data['filter']);
         unset($data['tags']);
-        unset($data['ajax']);
 
         // check if source already exists
         $id = $params['id'];
@@ -219,7 +217,7 @@ public function write(Base $f3, array $params) {
         ];
 
         // only for selfoss ui (update stats in navigation)
-        if ($isAjax) {
+        if ($f3->ajax()) {
             // get new tag list with updated count values
             $tagController = new \controllers\Tags();
             $return['tags'] = $tagController->tagsListAsString();

public/js/selfoss-base.js

@@ -22,7 +22,6 @@ var selfoss = {
         source: '',
         sourcesNav: false,
         extraIds: [],
-        ajax: true
     },
 
     /**

public/js/selfoss-events-entries.js

@@ -199,7 +199,7 @@ selfoss.events.entries = function(e) {
             url: $('base').attr('href') + 'source/' + selfoss.filter.source + '/update',
             type: 'POST',
             dataType: 'text',
-            data: { ajax: true },
+            data: {},
             success: function(response) {
                 // hide nav on smartphone
                 if(selfoss.isSmartphone()) {

public/js/selfoss-events-entriestoolbar.js

@@ -89,7 +89,7 @@ selfoss.events.entriesToolbar = function(parent) {
 
             $.ajax({
                 url: $('base').attr('href') + (starr ? 'starr/' : 'unstarr/') + id,
-                data: { ajax: true },
+                data: {},
                 type: 'POST',
                 error: function(jqXHR, textStatus, errorThrown) {
                     // rollback ui changes
@@ -167,7 +167,7 @@ selfoss.events.entriesToolbar = function(parent) {
 
             $.ajax({
                 url: $('base').attr('href') + (unread ? 'mark/' : 'unmark/') + id,
-                data: { ajax: true },
+                data: {},
                 type: 'POST',
                 error: function(jqXHR, textStatus, errorThrown) {
                     // rollback ui changes

public/js/selfoss-events-sources.js

@@ -56,7 +56,6 @@ selfoss.events.sources = function() {
 
         // get values and params
         var values = selfoss.getValues(parent);
-        values['ajax'] = true;
 
         $.ajax({
             url: url,
@@ -121,7 +120,7 @@ selfoss.events.sources = function() {
         // delete on server
         $.ajax({
             url: $('base').attr('href')+'source/delete/'+id,
-            data: { ajax: true },
+            data: {},
             type: 'POST',
             success: function() {
                 parent.fadeOut('fast', function() {