15 files changed, 60 insertions, 57 deletions

diff --git a/do.php b/do.php
index a39b689..ebdfda9 100644
--- a/do.php
+++ b/do.php
@@ -31,7 +31,7 @@ if (isset($_GET['act']) && $_GET['act'] == "getmap") {
 	}

 }

 

-// !! Depreciate?

+// TODO: Depreciate?

 if (isset($_GET['checkachieve']) && $_GET['checkachieve'] == 'true' && $_SESSION['accepted'] == 1) {

 	$json['notification'] = true;

 	$userID = $_SESSION['userID'];

@@ -82,7 +82,7 @@ if ($_GET['r'] == 'getsol') {
 

 	$userID = $_SESSION['userID'];

 

-///// !! FIX FIX FIX FIX FIX FIX //////

+///// TODO: FIX FIX FIX FIX FIX FIX //////

 	if ($_SESSION['accepted'] == 1) {

 		$json = getSolution($userID, $mapID);

 		if ($tmp['moves'] > $_SESSION[$mapID.'sol']) {

@@ -137,11 +137,11 @@ if ($_GET['r'] == 'getpath') {
 	$json['path'][] = routePath($mygrid);

 	$json['path'][] = routePath($mygrid, false, true);

 	

-	// !! Tmp

+	// TODO: Tmp

 	//$moves = $json['moves'];

 	$moves = $json['path1']['moves'];

 

-	// !! Tmp 

+	// TODO: Tmp 

 	$json['blocked'] = ($json['path1']['blocked']);

 

 	$json['mapid'] = $mapID;

@@ -276,7 +276,7 @@ if ($_GET['r'] == 'getpath') {
 

 

 function isCurrentMap($mapID) {

-	// !! Broke

+	// TODO: Broke

 	include_once('./includes/db.inc.php');

 	$sql = "SELECT maps.ID

 	FROM `mapOfTheDay`

diff --git a/globe.php b/globe.php
index 2764b4f..05d2e39 100644
--- a/globe.php
+++ b/globe.php
@@ -7,7 +7,7 @@ if (!session_id())
 //Database login:

 //include_once 'db.inc.php';

 

-//!! CONFIRM THIS DOMAIN BEFORE TRANSFER

+//TODO: CONFIRM THIS DOMAIN BEFORE TRANSFER

 //$mydomain = "http://www.mazetd.4xg.net/";

 $mydomain = "http://www.pathery.com/";

 

@@ -113,7 +113,7 @@ Function DoLogin($Username, $Password, $RememberMe = False, $EN = False) {
 

 

 Function CheckAuth($page) {

-   //!!

+   //TODO:

    if ($_SESSION['Accepted'] == 1) {

       return true;

    } else {

@@ -123,7 +123,7 @@ Function CheckAuth($page) {
    }

 }

 

-//!! Contains domain !!

+//TODO: Contains domain !!

 Function DoRedirect($message = "Thanks", $to = "http://www.pathery.com/", $duration = "3") {

    $to=(is_null($to)?'http://www.pathery.com/':$to);

    

diff --git a/includes/datas.php b/includes/datas.php
index 0041da2..d64776c 100644
--- a/includes/datas.php
+++ b/includes/datas.php
@@ -182,7 +182,7 @@ function getNotified($userID) {
 
 //Returns true when an achievement is applied.
 // Usage example: applyCareerAchievement($userID);
-// !! DEPRECIATED
+// TODO: DEPRECIATED
 function applyCareerPathAchievements($userID) {
 	$sql = "SELECT 
 	SUM(solutions.moves) as totalMoves
@@ -236,7 +236,7 @@ function applyCareerPathAchievements($userID) {
 }
 
 //Almost a duplicate of applyCareerPathAchievements
-// !! DEPRECIATED
+// TODO: DEPRECIATED
 function applyCareerMazesAchievements($userID) {
 	$sql = "SELECT 
 	COUNT(*) as totalSolutions
diff --git a/includes/mapoftheday.php b/includes/mapoftheday.php
index c5b9834..a695ed1 100644
--- a/includes/mapoftheday.php
+++ b/includes/mapoftheday.php
@@ -1 +1 @@
-<?PHP

include_once('maps.php');
include_once('db.inc.php');


function mapOfTheDay($type = 1) {
	ignore_user_abort(true);
	
	if ($type <= 8)
		$expire = 2;
	if ($type <= 4)
		$expire = 1;
	
	$sql = "
SELECT 
	maps.ID, 
	maps.code
FROM `mapOfTheDay`, `maps`
WHERE `mapType` = $type AND
	DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < $expire AND
	mapID = maps.ID
	";
	$result = mysql_query($sql);
	//No map for today?
	if (mysql_num_rows($result) == 0) {
		// If you want to modify the maps created! This is the line
		//GenerateMap($rows, $cols, $rockchance, $numBlocks = -1, $cp = -1, $tp = -1) {
		switch ($type) {
			case 1:		//Easy
			$map = GenerateMap(13, 7, 12, rand(7,10), rand(0, 1), 0);
			break;
			
			case 2:		//Normal
			$map = GenerateMap(15, 9, 7, rand(11,13), rand(1,3) + rand(0,1), 0);
			break;
			
			case 3:		//Hard
			$map = GenerateMap(19, 9, rand(7, 9), rand(14,16), rand(2,5), rand(1,2));
			break;
			
			case 4:		//Full random map
			$map = getRandomSpecialMap();
			break;
			
			case 5:
			// TEST MAP...
			$ultraComplex[] = "soooooooooooooooooooooooooooor";
			$ultraComplex[] = "ro??????????????????????????of";
			$ultraComplex[] = "so??????????????????????????or";
			$ultraComplex[] = "ro??????????????????????????of";
			$ultraComplex[] = "so??????????????????????????or";
			$ultraComplex[] = "ro??????????????????????????of";
			$ultraComplex[] = "so??????????????????????????or";
			$ultraComplex[] = "ro??????????????????????????of";
			$ultraComplex[] = "so??????????????????????????or";
			$ultraComplex[] = "ro??????????????????????????of";
			$ultraComplex[] = "so??????????????????????????or";
			$ultraComplex[] = "roooooooooooooooooooooooooooof";

			$ultraComplex = insertPoint($ultraComplex, 'abcde');
			$ultraComplex = insertPoint($ultraComplex, 'tumngh');
			$ultraComplex = insertPoint($ultraComplex, 'ppppppppppp');

			$myparams['checkpoints'] = 5;
			$myparams['teleports'] = 3;
			$myparams['rockchance'] = 9;
			$myparams['walls'] = 38;
			$myparams['name'] = 'Ultra Complex';
			$map = GenerateShapedMap($ultraComplex, $myparams);

			break;
			
			default:
			$map = GenerateMap(rand(13, 18), rand(10, 14), rand(6, 9));
			break;
		}

		//Double check... $sql is already set
		$result = mysql_query($sql);
		//Are you SURE there's no map?
		if (mysql_num_rows($result) != 0)
			return mapOfTheDay($type);
	
		$code = GenerateMapCode($map);
		$sql = "INSERT INTO `maps` (`code`)
		VALUES ('$code')";
		
		$result = mysql_query($sql);
		if (!$result) 
			die("Error on inserting map");
		$mapID = mysql_insert_id();
		$r['code'] = $code;
		$r['map'] = $map;
		$r['id'] = $mapID;
		
		$sql = "INSERT INTO `mapOfTheDay` (`mapID`, `mapType`, `mapDate`)
		VALUES ('$mapID', '$type', CURDATE()) ";
		$result = mysql_query($sql);
		if (!$result) 
			die("Error on insert into mapOfTheDay");
		
		// ---------- Track statistics for 'yesterdays' map.
		trackMOTDstats($type);
		
		return $r;
	}
	$r['code'] = mysql_result($result, 0, 'code');
	$r['map'] = GenerateMapByCode($r['code']);
   $r['id'] = mysql_result($result, 0, 'ID');
	return $r;
}

//Select from yesterday
function getYesterdaysMap() {
	$sql = "
	select `ID`, `code` from `maps`
	WHERE ( 
		DAY(dateCreated) = DAY(NOW()) - 1 
		AND 
		MONTH(dateCreated) = MONTH(NOW()) 
		AND
		YEAR(dateCreated) = YEAR(NOW())
	)
	";
	$result = mysql_query($sql);
	//No map for today?
	if (mysql_num_rows($result) == 0) {
		return -1;
	}
	$r['code'] = mysql_result($result, 0, 'code');
   $r['id'] = mysql_result($result, 0, 'ID');
	return $r;
}


function getRandomSpecialMap() {

	//This can be used to add additional weight to certain maps that we like.
	$random = weight(0, 1, 2, 3, 4, 5, 6, 7, 8);
	
	$shape = array();
	$params = array();

	switch ($random) {

		//=====================================
		case 0:
		//Thirty
		$map = GenerateMap(
			18, 14, 20						,  		//width, height, rocks
			weight(30)						,			//Walls
			weight(1)						,			//Checkpoints
			weight(1)						,			//Teleports
			'Thirty'
		);	
		break;
		//=====================================
		case 1:
		//Simple
		$map = GenerateMap(
			18, 9, 7							,  		//width, height, rocks
			weight(15,16,17)				,			//Walls
			weight(0)						,			//Checkpoints
			weight(0)						,			//Teleports
			'Finite'
		);	
		break;
		//=====================================
		case 2:
		//ABC's
		$map = GenerateMap(
			19, 11, 12						,  		//width, height, rocks
			weight(20,21,22,22,23)		,			//Walls
			weight(3)						,			//Checkpoints
			weight(0)						,			//Teleports
			"ABC's "
		);	
		break;
		//=====================================
		case 3:
		//Tele Madness
		$map = GenerateMap(
			17, 12, 10					,  		//width, height, rocks
			weight(17,18)				,			//Walls
			weight(1)					,			//Checkpoints
			weight(5)					,			//Teleports
			'Teleport Madness'
		);
		break;
		//=====================================
		case 4:	//Thursday
		//Rocky Maze
		$map = GenerateMap(
			19, 15, 5					,  		//width, height, rocks
			weight(16,17,18)			,			//Walls
			weight(1,2,2,2,3,3)		,			//Checkpoints
			weight(0)					,			//Teleports
			'Rocky Maze'
		);		
		break;
		//=====================================
		case 5:	//Friday
		//Side to Side
		$map = GenerateMap(
			26, 6, 12				,  		//width, height, rocks
			weight(17,18,19)		,			//Walls
			weight(2,2,2,3,3)		,			//Checkpoints
			weight(3,3,3,4)		,			//Teleports
			'Side to Side'
		);	
		break;
		
		//=====================================
		case 6:
		//Ultimate's Random map:
		//Create shape
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		$shape[] = "??????????????????";
		//Insert points
		$shape = insertPoint($shape, "sfabcr", $target = '?');
		$shape = insertPoint($shape, weight("tu", "d", "tu", "", ""), $target = '?');
		//Set params
		$params['rockchance'] = 10;
		$params['walls'] = weight(21, 20, 22, 20, 21);
		$params['name'] = 'Ultimate Random';
		//Put it all together.
		$map = GenerateShapedMap($shape, $params);

		break;
		//=====================================
		
		//=====================================
		case 7:
		//Dual map
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "s???????????????????f";
		$dualmapa[] = "oqqqqqqqqqqqqqqqqqqqo";
		$dualmapb[] = "s???????????????????f";
		$dualmapb[] = "s???????????????????f";
		$dualmapb[] = "s???????????????????f";
		$dualmapb[] = "s???????????????????f";
		$dualmapb[] = "s???????????????????f";
		$dualmapb[] = "s???????????????????f";

		$dualmapa = insertPoint($dualmapa, 'abc');
		$dualmapb = insertPoint($dualmapb, 'abc');
		$dualmap = array_merge($dualmapa, $dualmapb);
		$dualmap = insertPoint($dualmap, 'tu');

		$myparams['checkpoints'] = 3;
		$myparams['teleports'] = 1;
		$myparams['rockchance'] = 9;
		$myparams['walls'] = weight(20, 20, 21, 21, 22, 23);
		$myparams['name'] = 'Seeing Double';
		$map = GenerateShapedMap($dualmap, $myparams);
		break;
		//=====================================
		
		//=====================================
		case 8:
		//Centralized
		$myshape[] = "ooooooooooooooooooo";
		$myshape[] = "o?????????????????o";
		$myshape[] = "o?????????????????o";
		$myshape[] = "o?????????????????o";
		$myshape[] = "o???????fos???????o";
		$myshape[] = "o?????????????????o";
		$myshape[] = "o?????????????????o";
		$myshape[] = "o?????????????????o";
		$myshape[] = "ooooooooooooooooooo";

		$myshape = insertPoint($myshape, "abc", $target = '?');
		$myshape = insertPoint($myshape, weight("tu", "d", "tud", ""), $target = '?');
		$myparams['rockchance'] = 7;
		$myparams['walls'] = weight(17, 18, 19, 18, 17);
		$myparams['name'] = 'Centralized';
		$map = GenerateShapedMap($myshape, $myparams);
		break;
		//=====================================
		
		
	}
	return $map;
}



?>
\ No newline at end of file
+<?php

include_once('maps.php');
include_once('db.inc.php');

function mapOfTheDay($type = 1) {
	ignore_user_abort(true);

	if ($type <= 8)
		$expire = 2;
	if ($type <= 4)
		$expire = 1;

	$sql = "
SELECT 
	maps.ID, 
	maps.code
FROM `mapOfTheDay`, `maps`
WHERE `mapType` = $type AND
	DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < $expire AND
	mapID = maps.ID
	";
	$result = mysql_query($sql);
	//No map for today?
	if (mysql_num_rows($result) == 0) {
		// If you want to modify the maps created! This is the line
		//GenerateMap($rows, $cols, $rockchance, $numBlocks = -1, $cp = -1, $tp = -1) {
		switch ($type) {
			case 1:  //Easy
				$map = GenerateMap(13, 7, 12, rand(7, 10), rand(0, 1), 0);
				break;

			case 2:  //Normal
				$map = GenerateMap(15, 9, 7, rand(11, 13), rand(1, 3) + rand(0, 1), 0);
				break;

			case 3:  //Hard
				$map = GenerateMap(19, 9, rand(7, 9), rand(14, 16), rand(2, 5), rand(1, 2));
				break;

			case 4:  //Full random map
				$map = getRandomSpecialMap();
				break;

			case 5:
				// TEST MAP...
				$ultraComplex[] = "soooooooooooooooooooooooooooor";
				$ultraComplex[] = "ro??????????????????????????of";
				$ultraComplex[] = "so??????????????????????????or";
				$ultraComplex[] = "ro??????????????????????????of";
				$ultraComplex[] = "so??????????????????????????or";
				$ultraComplex[] = "ro??????????????????????????of";
				$ultraComplex[] = "so??????????????????????????or";
				$ultraComplex[] = "ro??????????????????????????of";
				$ultraComplex[] = "so??????????????????????????or";
				$ultraComplex[] = "ro??????????????????????????of";
				$ultraComplex[] = "so??????????????????????????or";
				$ultraComplex[] = "roooooooooooooooooooooooooooof";

				$ultraComplex = insertPoint($ultraComplex, 'abcde');
				$ultraComplex = insertPoint($ultraComplex, 'tumngh');
				$ultraComplex = insertPoint($ultraComplex, 'ppppppppppp');

				$myparams['checkpoints'] = 5;
				$myparams['teleports'] = 3;
				$myparams['rockchance'] = 9;
				$myparams['walls'] = 38;
				$myparams['name'] = 'Ultra Complex';
				$map = GenerateShapedMap($ultraComplex, $myparams);

				break;

			default:
				$map = GenerateMap(rand(13, 18), rand(10, 14), rand(6, 9));
				break;
		}

		//Double check... $sql is already set
		$result = mysql_query($sql);
		//Are you SURE there's no map?
		if (mysql_num_rows($result) != 0)
			return mapOfTheDay($type);

		$code = GenerateMapCode($map);
		$sql = "INSERT INTO `maps` (`code`)
		VALUES ('$code')";

		$result = mysql_query($sql);
		if (!$result)
			die("Error on inserting map");
		$mapID = mysql_insert_id();
		$r['code'] = $code;
		$r['map'] = $map;
		$r['id'] = $mapID;

		$sql = "INSERT INTO `mapOfTheDay` (`mapID`, `mapType`, `mapDate`)
		VALUES ('$mapID', '$type', CURDATE()) ";
		$result = mysql_query($sql);
		if (!$result)
			die("Error on insert into mapOfTheDay");

		// ---------- Track statistics for 'yesterdays' map.
		trackMOTDstats($type);

		return $r;
	}
	$r['code'] = mysql_result($result, 0, 'code');
	$r['map'] = GenerateMapByCode($r['code']);
	$r['id'] = mysql_result($result, 0, 'ID');
	return $r;
}

//Select from yesterday
function getYesterdaysMap() {
	$sql = "
	select `ID`, `code` from `maps`
	WHERE ( 
		DAY(dateCreated) = DAY(NOW()) - 1 
		AND 
		MONTH(dateCreated) = MONTH(NOW()) 
		AND
		YEAR(dateCreated) = YEAR(NOW())
	)
	";
	$result = mysql_query($sql);
	//No map for today?
	if (mysql_num_rows($result) == 0) {
		return -1;
	}
	$r['code'] = mysql_result($result, 0, 'code');
	$r['id'] = mysql_result($result, 0, 'ID');
	return $r;
}

function getRandomSpecialMap() {

	//This can be used to add additional weight to certain maps that we like.
	$random = weight(0, 1, 2, 3, 4, 5, 6, 7, 8);

	$shape = array();
	$params = array();

	switch ($random) {

		//=====================================
		case 0:
			//Thirty
			$map = GenerateMap(
					18, 14, 20, //width, height, rocks
					weight(30), //Walls
					weight(1), //Checkpoints
					weight(1), //Teleports
					'Thirty'
			);
			break;
		//=====================================
		case 1:
			//Simple
			$map = GenerateMap(
					18, 9, 7, //width, height, rocks
					weight(15, 16, 17), //Walls
					weight(0), //Checkpoints
					weight(0), //Teleports
					'Finite'
			);
			break;
		//=====================================
		case 2:
			//ABC's
			$map = GenerateMap(
					19, 11, 12, //width, height, rocks
					weight(20, 21, 22, 22, 23), //Walls
					weight(3), //Checkpoints
					weight(0), //Teleports
					"ABC's "
			);
			break;
		//=====================================
		case 3:
			//Tele Madness
			$map = GenerateMap(
					17, 12, 10, //width, height, rocks
					weight(17, 18), //Walls
					weight(1), //Checkpoints
					weight(5), //Teleports
					'Teleport Madness'
			);
			break;
		//=====================================
		case 4: //Thursday
			//Rocky Maze
			$map = GenerateMap(
					19, 15, 5, //width, height, rocks
					weight(16, 17, 18), //Walls
					weight(1, 2, 2, 2, 3, 3), //Checkpoints
					weight(0), //Teleports
					'Rocky Maze'
			);
			break;
		//=====================================
		case 5: //Friday
			//Side to Side
			$map = GenerateMap(
					26, 6, 12, //width, height, rocks
					weight(17, 18, 19), //Walls
					weight(2, 2, 2, 3, 3), //Checkpoints
					weight(3, 3, 3, 4), //Teleports
					'Side to Side'
			);
			break;

		//=====================================
		case 6:
			//Ultimate's Random map:
			//Create shape
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			$shape[] = "??????????????????";
			//Insert points
			$shape = insertPoint($shape, "sfabcr", $target = '?');
			$shape = insertPoint($shape, weight("tu", "d", "tu", "", ""), $target = '?');
			//Set params
			$params['rockchance'] = 10;
			$params['walls'] = weight(21, 20, 22, 20, 21);
			$params['name'] = 'Ultimate Random';
			//Put it all together.
			$map = GenerateShapedMap($shape, $params);

			break;
		//=====================================
		//=====================================
		case 7:
			//Dual map
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "s???????????????????f";
			$dualmapa[] = "oqqqqqqqqqqqqqqqqqqqo";
			$dualmapb[] = "s???????????????????f";
			$dualmapb[] = "s???????????????????f";
			$dualmapb[] = "s???????????????????f";
			$dualmapb[] = "s???????????????????f";
			$dualmapb[] = "s???????????????????f";
			$dualmapb[] = "s???????????????????f";

			$dualmapa = insertPoint($dualmapa, 'abc');
			$dualmapb = insertPoint($dualmapb, 'abc');
			$dualmap = array_merge($dualmapa, $dualmapb);
			$dualmap = insertPoint($dualmap, 'tu');

			$myparams['checkpoints'] = 3;
			$myparams['teleports'] = 1;
			$myparams['rockchance'] = 9;
			$myparams['walls'] = weight(20, 20, 21, 21, 22, 23);
			$myparams['name'] = 'Seeing Double';
			$map = GenerateShapedMap($dualmap, $myparams);
			break;
		//=====================================
		//=====================================
		case 8:
			//Centralized
			$myshape[] = "ooooooooooooooooooo";
			$myshape[] = "o?????????????????o";
			$myshape[] = "o?????????????????o";
			$myshape[] = "o?????????????????o";
			$myshape[] = "o???????fos???????o";
			$myshape[] = "o?????????????????o";
			$myshape[] = "o?????????????????o";
			$myshape[] = "o?????????????????o";
			$myshape[] = "ooooooooooooooooooo";

			$myshape = insertPoint($myshape, "abc", $target = '?');
			$myshape = insertPoint($myshape, weight("tu", "d", "tud", ""), $target = '?');
			$myparams['rockchance'] = 7;
			$myparams['walls'] = weight(17, 18, 19, 18, 17);
			$myparams['name'] = 'Centralized';
			$map = GenerateShapedMap($myshape, $myparams);
			break;
		//=====================================
	}
	return $map;
}
?>
\ No newline at end of file
diff --git a/includes/maps.php b/includes/maps.php
index e322bc4..05559b4 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -349,7 +349,7 @@ function GenerateMap($rows, $cols, $rockchance, $numBlocks = -1, $cp = -1, $tp =
 				} elseif (rand(1, $rockchance) == 2) {

 					$grid[$y][$x] = "r";

 					$rocks++;

-					//!! rock count could be off if covered by checkpoint.

+					//TODO: rock count could be off if covered by checkpoint.

 					//Just a normal square.

 				} else {

 					$grid[$y][$x] = "o";

@@ -836,7 +836,7 @@ function findPath($mapMatrix, $start = '0,1', $target = 'f', $isBlockedByX = fal
 						$path = $mapMatrix[$y][$x];

 					

 					case "o":   //Available squares

-					// !!

+					// TODO:

 					case "p":

 					case "s": case "f":     //Start and end tiles

 						

@@ -917,7 +917,7 @@ function routePath($mygrid, $validate = false, $traverseBackwards = false) {
 	if ($traverseBackwards)

 		$cpnames = array("e", "d", "c", "b", "a");

 

-	//!! Improve the 'findTiles' function to prevent duplicate itterations.

+	//TODO: Improve the 'findTiles' function to prevent duplicate itterations.

 	//Add the existing checkpoints to target array.

 	foreach ($cpnames as $cpt)

 		if (findTiles($mygrid, $cpt))

diff --git a/js/globe.js b/js/globe.js
index 7fcd6a7..2c6f088 100644
--- a/js/globe.js
+++ b/js/globe.js
@@ -1,5 +1,5 @@
 

-// !! Remember to preload images

+// TODO: Remember to preload images

 

 

 function showSignin() {

@@ -15,15 +15,15 @@ function showSignin() {
 }

 

 

-var signinDiv = '<div class="wrapper" id="oid_wrapper" >

-<h2>Sign in</h2>

-	<div id="oid_box">

-		<h2 style="color:#333;">Do you have an account here?</h2>

-		<a href="#"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>

-		<a href="#"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>

-		<a href="http://openid.net/get-an-openid/what-is-openid/" style="position:absolute;color:#333;left:10px;bottom:10px;">Learn more about OpenID</a>

-	</div>

-</div>';

+var signinDiv = '<div class="wrapper" id="oid_wrapper" >' +

+'<h2>Sign in</h2>' +

+'	<div id="oid_box">' +

+'		<h2 style="color:#333;">Do you have an account here?</h2>' +

+'		<a href="#"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>' +

+'		<a href="#"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>' +

+'		<a href="http://openid.net/get-an-openid/what-is-openid/" style="position:absolute;color:#333;left:10px;bottom:10px;">Learn more about OpenID</a>' +

+'	</div>' +

+'</div>';

 

 

 

diff --git a/js/mapspecs.js b/js/mapspecs.js
index cbb642c..ded7bfc 100644
--- a/js/mapspecs.js
+++ b/js/mapspecs.js
@@ -136,9 +136,7 @@ function grid_click(obj) {
 		else 

 			obj.style.backgroundColor = playerWallColor;

 		

-		if (typeof playerWallEmblem === 'undefined') 

-			'';

-		else

+		if (typeof playerWallEmblem !== 'undefined') 

 			obj.style.backgroundImage="url(images/marks/"+playerWallEmblem+")";

 

 		//Add Wall

@@ -206,11 +204,12 @@ function requestSol(mapID) {
 }

 

 function requestSolDone() {

+	var JO;

 	if (typeof(JSON) == 'undefined') {

 		text = ajax.response;

-		var JO = !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, ''))) && eval('(' + text + ')');

+		JO = !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, ''))) && eval('(' + text + ')');

 	} else {

-		var JO = JSON.parse(ajax.response);

+		JO = JSON.parse(ajax.response);

 	}

 	if (JO.solution == 'undefined') 

 		return;

@@ -288,7 +287,7 @@ function request_path_done() {
 	mapdata[mapid].restoreTiles = new Array();

 	mapdata[mapid].pathColor = new Object;

 	

-	for(var i in JO.path) {

+	for(i in JO.path) {

 		mapdata[mapid].moveCount[i] = 0;

 		mapdata[mapid].pathColor[i] = '#ffffff';

 		animatePath(JO.path[i].path, mapid, JO.path[i].start, i);

@@ -297,11 +296,12 @@ function request_path_done() {
 }

 

 function decryptJSON(text) {

+	var JO;

 	if (typeof(JSON) == 'undefined') {

-		var JO = !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, ''))) && eval('(' + text + ')');

+		JO = !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, ''))) && eval('(' + text + ')');

 		//mapdata[mapid] = eval(document.getElementById(mapid+',mapdata').innerHTML);

 	} else {

-		var JO = JSON.parse(ajax.response);

+		JO = JSON.parse(ajax.response);

 	}

 	return JO;

 }

@@ -792,6 +792,7 @@ for (i=0;i<ARRcookies.length;i++)
     return unescape(y);

     }

   }

+  return "";

 }

 

 

diff --git a/js/scores.js b/js/scores.js
index 5acc36c..a75d77a 100644
--- a/js/scores.js
+++ b/js/scores.js
@@ -133,7 +133,7 @@ function scoresFormatPage(JO) {
 		p = p+ "<tr style='"+styleClass+" background-color: "+u.background+"; color:"+u.displayColor+";' title='Scored "+scoredLocalTime.format("h:MM:ss TT")+"'>";

 		p = p+ "<td style='text-align:left;'>";

 		

-				// !! Don't forget to make sure these images are cached;

+				// TODO: Don't forget to make sure these images are cached;

 		if (u.medal == 'gold') {

 			p = p+ "<img title='Current Champion' src='../images/MedalGoldCAR.png' style='width:32px;height:32px;vertical-align:middle'>";

 		} else if (u.medal == 'silver') {

diff --git a/pages/achievements.php b/pages/achievements.php
index 1d81220..9e91366 100644
--- a/pages/achievements.php
+++ b/pages/achievements.php
@@ -143,7 +143,7 @@ function toColor($n)
 return("#".substr("000000".dechex($n),-6));

 }

 

-// !! END TESTING AREA;

+// TODO: END TESTING AREA;

 

 //Self-healing code for unlocks.

 if (!$viewer) {

diff --git a/pages/challenge.php b/pages/challenge.php
index f011d3e..1f0e258 100644
--- a/pages/challenge.php
+++ b/pages/challenge.php
@@ -48,6 +48,7 @@ challenge5.help = "Try placing the walls as highlighted.";
 

 function challengeGo(mapid) {

 	var moves = mapjson[mapid].moves;

+	var tiles;

 	

 	switch (mapid) {

 	case '1':

@@ -85,7 +86,7 @@ function challengeGo(mapid) {
 			tv.unlock(5);

 		} else {

 			updateDsp(1, 'instructions', challenge4.help);

-			var tiles = ["4,1,5","4,2,6","4,3,7","4,4,9"];

+			tiles = ["4,1,5","4,2,6","4,3,7","4,4,9"];

 			markTiles(tiles);

 		}

 		break;

@@ -96,7 +97,7 @@ function challengeGo(mapid) {
 			//Unlock next button.

 		} else {

 			updateDsp(1, 'instructions', challenge5.help);

-			var tiles = ["5,1,5","5,2,6","5,3,3","5,4,2","5,3,1"];

+			tiles = ["5,1,5","5,2,6","5,3,3","5,4,2","5,3,1"];

 			markTiles(tiles);

 		}

 		break;

@@ -113,7 +114,7 @@ function markTiles(tiles) {
 	}

 }

 

-//!!

+//TODO:

 function challengeWall(mapid) {

 	//Disable function

 	return;

@@ -192,7 +193,7 @@ TutorialView.prototype.showTutorial = function(num) {
 		if (elem.className.indexOf('hidden') < 0)

 			elem.className += 'hidden';

 	}

-	var elem = document.getElementById("tut-" + num);

+	elem = document.getElementById("tut-" + num);

 	elem.className = elem.className.replace('hidden', '');

 	//Is the map after this disabled?

 	this.nextbtn.className = this.nextbtn.className.replace(' disabled', '');

diff --git a/pages/gallery.php b/pages/gallery.php
index 2d540b6..098cf74 100644
--- a/pages/gallery.php
+++ b/pages/gallery.php
@@ -30,14 +30,14 @@ include('./includes/mapoftheday.php');
 
 
 $openmaps[] = 'Souxoooooooooooooooooooo';
-$openmaps[] = 'ooxooooooooooooooooooooo';
-$openmaps[] = 'oxooooooooooooooeocooooo';
-$openmaps[] = 'oooooooooooooooooooooooo';
-$openmaps[] = 'ooooooooooaoootooooooooo';
-$openmaps[] = 'oooooooooooooooooooooooo';
-$openmaps[] = 'oooooooooooooooooooooooo';
-$openmaps[] = 'ooooooXXoooooooooooooooo';
-$openmaps[] = 'oooooXbdoooooooooooooooo';
+$openmaps[] = 'ooxoooXooooooooooooooooo';
+$openmaps[] = 'oxooooXoooooooooeocooooo';
+$openmaps[] = 'oxooooXooooooooooooooooo';
+$openmaps[] = 'oxooooXoooaoootooooooooo';
+$openmaps[] = 'oxooooXooooooooooooooooo';
+$openmaps[] = 'oxooooXooooooooooooooooo';
+$openmaps[] = 'oxooooXooooooooooooooooo';
+$openmaps[] = 'oxoooXbdoooooooooooooooo';
 $openmaps[] = 'fooooXooooooooooooooooos';
 
 $myparams['checkpoints'] = 5;
diff --git a/pages/home.php b/pages/home.php
index 2b59bc2..4e46ac6 100644
--- a/pages/home.php
+++ b/pages/home.php
@@ -159,7 +159,7 @@ function displayMaze($motd, $mapType) {
 	if ($accepted) {

 		$sol = getSolution($userID, $mapID);

 		$mysolution = $sol['solution'];

-		//!! implement mymoves

+		//TODO: implement mymoves

 		$mymoves = $sol['moves'];

 	}

 	if (isset($_SESSION[$mapID.'sol']) && $mysolution == '') {

@@ -263,7 +263,7 @@ function showStats(type) {
 		elem = document.getElementById("dl-" + i);

 		elem.className = elem.className.replace('selected', '');

 	}

-	var elem = document.getElementById("yms-" + type);

+	elem = document.getElementById("yms-" + type);

 	elem.className = elem.className.replace('hidden-maps', 'shown-maps');

 	elem = document.getElementById("dl-" + type);

 	if (elem.className.indexOf('selected') < 0)

diff --git a/pages/howtoplay.php b/pages/howtoplay.php
index b600fd8..8c9f2f5 100644
--- a/pages/howtoplay.php
+++ b/pages/howtoplay.php
@@ -116,7 +116,7 @@ function showTutorial(num) {
 		if (elem.className.indexOf('hidden') < 0)
 			elem.className += 'hidden';
 	}
-	var elem = document.getElementById("tut-" + num);
+	elem = document.getElementById("tut-" + num);
 	elem.className = elem.className.replace('hidden', '');
 }
 showTutorial(0);
diff --git a/pages/leaderboard.php b/pages/leaderboard.php
index 440f1e5..a457a8d 100644
--- a/pages/leaderboard.php
+++ b/pages/leaderboard.php
@@ -320,7 +320,7 @@ function showStats(type) {
 		elem = document.getElementById("dl-" + i);

 		elem.className = elem.className.replace('selected', '');

 	}

-	var elem = document.getElementById("yms-" + type);

+	elem = document.getElementById("yms-" + type);

 	elem.className = elem.className.replace('hidden-stats', '');

 	elem = document.getElementById("dl-" + type);

 	if (elem.className.indexOf('selected') < 0)

diff --git a/pages/tutorial.php b/pages/tutorial.php
index 95a5a53..d09480c 100644
--- a/pages/tutorial.php
+++ b/pages/tutorial.php
@@ -11,7 +11,7 @@ else
 topbar($Links);

 

 

-//!! Turn this into a function?

+//TODO: Turn this into a function?

 if ($accepted) {

 	include_once ('./includes/db.inc.php');

 	$userID = $_SESSION['userID'];

@@ -71,6 +71,7 @@ challenge5.help = "Try placing the walls as highlighted.";
 

 function challengeGo(mapid) {

 	var moves = mapjson[mapid].moves;

+	var tiles;

 	

 	switch (mapid) {

 	case '1':

@@ -84,7 +85,7 @@ function challengeGo(mapid) {
 			tv.unlock(3);

 		} else {

 			updateDsp(1, 'instructions', challenge2.help);

-			var tiles = ["2,3,5","2,4,6"];

+			tiles = ["2,3,5","2,4,6"];

 			markTiles(tiles);

 		}

 		break;

@@ -95,7 +96,7 @@ function challengeGo(mapid) {
 			tv.unlock(4);

 		} else {

 			updateDsp(1, 'instructions', challenge3.help);

-			var tiles = ["3,3,6","3,4,7","3,3,2","3,2,1"];

+			tiles = ["3,3,6","3,4,7","3,3,2","3,2,1"];

 			markTiles(tiles);

 		}

 		break;

@@ -106,7 +107,7 @@ function challengeGo(mapid) {
 			tv.unlock(5);

 		} else {

 			updateDsp(1, 'instructions', challenge4.help);

-			var tiles = ["4,1,5","4,2,6","4,3,7","4,4,9"];

+			tiles = ["4,1,5","4,2,6","4,3,7","4,4,9"];

 			markTiles(tiles);

 		}

 		break;

@@ -117,7 +118,7 @@ function challengeGo(mapid) {
 			//Unlock next button.

 		} else {

 			updateDsp(1, 'instructions', challenge5.help);

-			var tiles = ["5,1,5","5,2,6","5,3,3","5,4,2","5,3,1"];

+			tiles = ["5,1,5","5,2,6","5,3,3","5,4,2","5,3,1"];

 			markTiles(tiles);

 		}

 		break;

@@ -134,7 +135,7 @@ function markTiles(tiles) {
 	}

 }

 

-//!!

+//TODO:

 function challengeWall(mapid) {

 	//Required walls:

 	var reqwall = new Array();

@@ -212,7 +213,7 @@ TutorialView.prototype.showTutorial = function(num) {
 		if (elem.className.indexOf('hidden') < 0)

 			elem.className += 'hidden';

 	}

-	var elem = document.getElementById("tut-" + num);

+	elem = document.getElementById("tut-" + num);

 	elem.className = elem.className.replace('hidden', '');

 	//Is the map after this disabled?

 	this.nextbtn.className = this.nextbtn.className.replace(' disabled', '');