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

Conflicts:
	globe.php
	pages/login.php

1 files changed, 11 insertions, 3 deletions

diff --git a/index.php b/index.php
index 2786237..9e47971 100644
--- a/index.php
+++ b/index.php
@@ -31,12 +31,12 @@ if ($accepted) {
 	$sql = "

 	SELECT 

 		users.wallColor,

-		users.wallEmblem

+		users.wallEmblem,

+		users.wallOrientation

 	FROM `users` 

 	WHERE ID = '$userID' ";

 	$result = mysql_query($sql);

-	if ($result)

-		list($wallColor, $wallEmblem) = mysql_fetch_row($result);

+	if ($result) list($wallColor, $wallEmblem, $wallOrientation) = mysql_fetch_row($result);

 }

 

 // Footer Links 

@@ -230,6 +230,14 @@ switch ($request) {
 		require 'pages/about.php';

 	}

 	break;

+

+	case "process":

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

+		require 'pages/process.php';

+	} else {

+		require 'pages/about.php';

+	}

+	break;

 	

 	case "massemail":

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