From 20c2586d42530eb6826f22b2313675dd41b2068c Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 2 Apr 2019 14:08:14 +0200
Subject: [PATCH] (cp ab46632) Revert "Include pwg_token in user list POST
 request (Fixes #748) (#866)"

This reverts commit 65ac2721791a040ea0da6833c11022fb2c06533c.
---
 admin/themes/default/template/user_list.tpl |  8 +-------
 admin/user_list_backend.php                 | 10 ++++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 4b255dc01..79abbe985 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -615,13 +615,7 @@ jQuery(document).on('click', '.close-user-details',  function(e) {
     processing: true,
     serverSide: true,
 		serverMethod: "POST",
-    ajax: {
-        url : "admin/user_list_backend.php",
-        type : "POST",
-        data : {
-            pwg_token : pwg_token
-        }
-    },
+    ajaxSource: "admin/user_list_backend.php",
 		pagingType: "simple",
     language: {
       processing: "{/literal}{'Loading...'|translate|escape:'javascript'}{literal}",
diff --git a/admin/user_list_backend.php b/admin/user_list_backend.php
index 87509a4bc..50673fae0 100644
--- a/admin/user_list_backend.php
+++ b/admin/user_list_backend.php
@@ -70,8 +70,7 @@ if ( isset( $_REQUEST['iDisplayStart'] ) && $_REQUEST['iDisplayLength'] != '-1'
   $sLimit = "LIMIT ".$_REQUEST['iDisplayStart'].", ".$_REQUEST['iDisplayLength'];
 }
 	
-$sOrder = "";
-
+	
 /*
  * Ordering
  */
@@ -105,7 +104,7 @@ if ( isset( $_REQUEST['iSortCol_0'] ) )
  * on very large tables, and MySQL's regex functionality is very limited
  */
 $sWhere = "";
-if ( isSet( $_REQUEST['sSearch']) && $_REQUEST['sSearch'] != "" )
+if ( $_REQUEST['sSearch'] != "" )
 {
   $sWhere = "WHERE (";
   for ( $i=0 ; $i<count($aColumns) ; $i++ )
@@ -162,13 +161,12 @@ $rResultTotal = pwg_query($sQuery);
 $aResultTotal = pwg_db_fetch_array($rResultTotal);
 $iTotal = $aResultTotal[0];
 	
-$sEcho = isSet($_REQUEST['sEcho']) ? intval($_REQUEST['sEcho']) : 0;
-
+	
 /*
  * Output
  */
 $output = array(
-  "sEcho" => $sEcho,
+  "sEcho" => intval($_REQUEST['sEcho']),
   "iTotalRecords" => $iTotal,
   "iTotalDisplayRecords" => $iFilteredTotal,
   "aaData" => array()