Merge branch 'master' of git.raylu.net:pathery

Conflicts:
	db updates.sql

1 files changed, 10 insertions, 11 deletions

diff --git a/do.php b/do.php
index a43b4ee..3b3d8d6 100644
--- a/do.php
+++ b/do.php
@@ -57,12 +57,16 @@ if (isset($_GET['checkachieve']) && $_GET['checkachieve'] == 'true' && $_SESSION
 }

 

 if ($_GET['r'] == 'reqMemberPage') {

+	$order = $_GET['order'];

+	$orderBy = $_GET['orderBy'];

 

-	$order = 'ORDER BY dateJoined DESC';

 	$page = $_GET['reqPage'] + 0;

 	if (!is_int($page))

 		return;

-	$json = getMembers($order, $page, 4);

+	$pageDivide = $_GET['membersPageDivide'] + 0;

+	if (!is_int($pageDivide))

+		return;

+	$json = getMembers($page, $pageDivide, $order, $orderBy);

 	$json['page'] = $page;

 	$encoded = json_encode($json);

 	die($encoded);

@@ -253,6 +257,10 @@ if ($_GET['r'] == 'getpath') {
 	}

 	// --------- CONTINUE EXECUTION ---------

 	

+	//TODO: !! Close the session with session_write_close(); as soon as possible.

+	// This allows the session file to be opened by other requests.

+	

+	

 	// Now we don't have to worry about how long we're taking.

 	// All of this code will execute without the user waiting on the server.

 	

@@ -264,15 +272,6 @@ if ($_GET['r'] == 'getpath') {
 

 	////Challenge/Tutorial?

 

-	

-	////--------- RUSH THE PATH BACK TO THE USER

-	// ignore_user_abort(true);

-	// $encoded = json_encode($json);

-	// header("Connection: close");

-	// header("Content-Length: " . mb_strlen($encoded));

-	// echo $encoded;

-	// flush();

-	

 	////TODO: Clean this up a bit

 	// if ($_GET['isChallenge'] == 'true')

 	// {