[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36325] trunk

[<nk...@us...>]

Revision: 36325
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36325&view=rev
Author:   nkoth
Date:     2011-08-18 19:15:57 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
[ENH] regarding custom search, if I am on page 3 and if I go off and come back, I should be brought back to page 3 since the search parameters are same as before

Modified Paths:
--------------
    trunk/customsearch_ajax.php
    trunk/lib/wiki-plugins/wikiplugin_customsearch.php

Modified: trunk/customsearch_ajax.php
===================================================================
--- trunk/customsearch_ajax.php	2011-08-18 18:35:12 UTC (rev 36324)
+++ trunk/customsearch_ajax.php	2011-08-18 19:15:57 UTC (rev 36325)
@@ -55,6 +55,9 @@
 	if (!empty($_REQUEST["sort_mode"])) {
 		$_SESSION["customsearch_$id"]["sort_mode"] = $_REQUEST["sort_mode"];
 	}
+	if (!empty($_REQUEST["offset"])) {
+		$_SESSION["customsearch_$id"]["offset"] = $_REQUEST["offset"];
+	}
 	foreach($adddata as $fieldid => $d) {
 		$config = $d['config'];
 		$name = $d['name'];

Modified: trunk/lib/wiki-plugins/wikiplugin_customsearch.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2011-08-18 18:35:12 UTC (rev 36324)
+++ trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2011-08-18 19:15:57 UTC (rev 36325)
@@ -102,6 +102,11 @@
 		unset($_SESSION["customsearch_$id"]);
 	} 
 	$_SESSION[$sessionprint] = $fingerprint;
+
+	// important that offset from session is set after fingerprint check otherwise blank page might show
+	if (!$offset && !empty($_SESSION["customsearch_$id"]["offset"])) {
+		$offset = $_SESSION["customsearch_$id"]["offset"];
+	}
 	
 	$groups = array();
 	$textrangegroups = array();
@@ -116,7 +121,7 @@
 		customsearch_{$id}_searchdata = new Object();
 		customsearch_{$id}_basedata = '" . json_encode((string) $data) . "';
 		$('#customsearch_$id').click(function() {
-			// reset offset on reclick of submit button
+			// reset offset on reclick of form since new search should always start from 0 offset 
 			customsearch_offset_$id = 0;
 		});
 		$('#customsearch_$id').submit(function() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.