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

Conflicts:
	includes/db.inc.php

1 files changed, 13 insertions, 2 deletions

diff --git a/index.php b/index.php
index 9a5f7d7..49793a0 100644
--- a/index.php
+++ b/index.php
@@ -99,8 +99,15 @@ switch ($request) {
 	break;

 	

 	case "redirect":

-		$to = $_GET['to'];

-		DoRedirect("<strong>THIS URL COULD BE UNSAFE! Please confirm!</strong><br/>", $to, $duration = "8");

+		//Whitelist things?

+		if (true) {

+			require('redirect.php');

+		} else {

+			//Redirect instantly:

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

+			DoRedirect(NULL, $to, $duration = "0");

+		}

+		exit;

 	break;

 	

 	case "hometutorial":

@@ -212,6 +219,10 @@ switch ($request) {
 	require 'pages/chat.php';

    break;

 	

+	case "mapeditor":

+	require 'pages/mapeditor.php';

+   break;

+	

 	case "admin":

 	if ($_SESSION['isAdmin'] == true) {

 		require 'pages/admin.php';