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

Conflicts:
	db updates.sql

3 files changed, 25 insertions, 65 deletions

diff --git a/pages/admin.php b/pages/admin.php
index 0f54285..dddacaa 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -29,6 +29,7 @@ if ($_GET['applyall'] == 'true') {
 }

 else if ($_GET['recalcStats'] == 'true') {

 	echo "Recalculating all player stats...";

+	flush(); //This sends the above echo

 	

 	recalculateStatsForAllPlayers();

 	

diff --git a/pages/chat.php b/pages/chat.php
index 10e8f7f..094f86a 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -191,11 +191,17 @@ function getChatDone(data) {
 	//console.log('(END) lastID', lastID);

 }

 

+function prepChat(chat) {

+	chat = chat.join('|:|');

+	chat = chat.replace(/\&/g,'%26')

+	return chat;

+}

+

 function getChat(message) {

 	//console.log('LASTID:', lastID);

 	var dataString = 'getChatFromID='+lastID;

 	if (chatBuffer.length > 0) {

-		dataString += '&send=true&messages='+chatBuffer.join('|:|');

+		dataString += '&send=true&messages='+prepChat(chatBuffer);

 		chatBuffer.length = 0;

 	}

 	//$.getJSON('ajax_chat.php?getChatFromID='+lastID++message, );

@@ -206,7 +212,6 @@ function getChat(message) {
 		data: dataString, 

 		success: function(data) {getChatDone(data);}

 	});

-	

 }

 

 function sendChat() {

diff --git a/pages/memberlist.php b/pages/memberlist.php
index 038b023..c447f1c 100644
--- a/pages/memberlist.php
+++ b/pages/memberlist.php
@@ -17,88 +17,42 @@ include_once ('./includes/sqlEmbedded.php');
 include_once ('./includes/datas.php');

 

 

-

-//Order by prep

-$c = 'totalMovesThisWeek';

-if (isset($_GET['c'])) {

-	switch ($_GET['c']) {

-	case "totalMoves":

-		$c = 'totalMoves';

-		break;

-	case "totalMovesThisWeek":

-		$c = 'totalMovesThisWeek';

-		break;

-	case "totalMazes":

-		$c = 'totalMazes';

-		break;

-	case "totalWins":

-		$c = 'totalWins';

-		break;

-	case "totalTies":

-		$c = 'totalTies';

-		break;

-	case "dateJoined":

-		$c = 'dateJoined';

-		break;

-	case "dateLogin":

-		$c = 'dateLogin';

-		break;

-	}

-}

-$o = 'DESC';

-if (isset($_GET['o'])) {

-	switch ($_GET['o']) {

-	case "desc":

-		$o = 'DESC';

-		break;

-	case "asc":

-		$o = 'ASC';

-		break;

-	}

-}

-

 ?>

 <script>

-document.write('Begin:');

-

-

-

+	javascript:membersShowPage(1);

 </script>

 

 <?

 

 

-

 //Order by:

 	//$order = "ORDER BY $c $o";

 

-$data = getMembers($order, 1, 2);

+//$data = getMembers(1, 10);

 

 $json = json_encode($data);

-

+//onchange="savePref(&quot;speed&quot;, this.value)" 

 //style='border:1px solid red;width: 500px; position:absolute;'

-echo "

-<div class='wrapper'>

-	<div class='scoreContainer2' style='min-height:700px; width:700px'>

-		<div id='members' class='scoreContainer2' >

-			<script>

-

-			var json = $json;

-

-			//var JO = decryptJSON(json);

-			var JO = json;

 

-			var parsed = membersFormatPage(JO);

+?>

+<div class='wrapper'>

 

+	<form class='memberListForm'>

+		<select id="membersPerPage" onChange="membersPageDivide=this.options[this.selectedIndex].value;membersShowPage(1,false,true);">

+			<option value="10">10</option>

+			<option value="25">25</option>

+			<option value="50" selected="selected">50</option>

+			<option value="100">100</option>

+		</select>

+	</form>

 

-			document.write(parsed);

-			document.write('complete');

+	<div id='members'>

 

-			</script>

-		</div>

 	</div>

 </div>

-";

+<br />

+<br />

+<?

 

 //echo $json;

 //print_r($data);