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

6 files changed, 24 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index fcedbc3..c28716e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/motdLockFile
+/motdLockFile

+/nbproject/private/
\ No newline at end of file
diff --git a/globe.php b/globe.php
index dd9902d..22d34c5 100644
--- a/globe.php
+++ b/globe.php
@@ -78,8 +78,7 @@ function CookieLogin() {
 	";

 	

 	$result = mysql_query($sql);

-	if (mysql_num_rows($result) == 0)

-		return;

+	if (mysql_num_rows($result) == 0) return;

 		

 	list($claimedid, $email, $display, $dateJoined, $isAdmin) = mysql_fetch_row($result);

 	

diff --git a/index.php b/index.php
index ca81bb1..de4421b 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,10 @@
 <?PHP

 ob_start("ob_gzhandler");

 

-//TODO: !! Make sure updating.php exists, and that the images in images/btns/ are uploaded.

+//Start session

+if (!session_id()) session_start();

+//session_regenerate_id();

+

 //Show updating page?

 //$showUpdatePage = true;

 $showUpdatePage = false;

@@ -11,7 +14,6 @@ if ($showUpdatePage AND $_GET['cu'] !== "true") {
 	exit;

 }

 

-//globe will start the session.

 include_once("globe.php");

 include_once("./includes/header.php");

 include_once ('./includes/sqlEmbedded.php');

diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644
index 0000000..04e3d5e
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}

+php.version=PHP_54

+source.encoding=UTF-8

+src.dir=.

+tags.asp=false

+tags.short=true

+web.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 0000000..bd3b6e3
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://www.netbeans.org/ns/project/1">

+    <type>org.netbeans.modules.php.project</type>

+    <configuration>

+        <data xmlns="http://www.netbeans.org/ns/php-project/1">

+            <name>BetaPathery</name>

+        </data>

+    </configuration>

+</project>

diff --git a/pages/login.php b/pages/login.php
index b7c4317..07662c3 100644
--- a/pages/login.php
+++ b/pages/login.php
@@ -151,6 +151,7 @@ try {
       $_SESSION['dateJoined'] = $dateJoined;

 		

 		//The below is me hashing the claimedID.

+		//TODO: Store these values in a single location...

 		$salt = "33qs5d4j6z98gt1a7n6b5d4x1c66f5nuh8a6d8g9j09aphgf56z5745";

 		$pepper = "chilis baby-back ribss! I want my baby back, baby back, baby back, baby back, baby back, I want my, baby backTREE3!";

 		$one = MD5($claimedid);