From 97ff1db6f900c7619eb657baa8a3c3eeb13a9bdb Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Thu, 19 Jul 2007 23:15:05 +0000
Subject: [PATCH] Fixed some php notices

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39034 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/ManifestBuilder.php | 2 +-
 core/model/ErrorPage.php | 8 +++++---
 core/model/Versioned.php | 2 +-
 security/Member.php      | 2 +-
 security/Security.php    | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php
index 29fea7dd6..ed70d57e5 100644
--- a/core/ManifestBuilder.php
+++ b/core/ManifestBuilder.php
@@ -179,7 +179,7 @@ class ManifestBuilder {
 
 			} else if(substr($item,-4) == '.css') {
 					$cssName = substr($item, 0, -4);
-					Debug::message($item);
+					// Debug::message($item);
 
 					if($themeName) {
 						$cssManifest[$cssName]['themes'][$themeName] = "$folder/$item"; 
diff --git a/core/model/ErrorPage.php b/core/model/ErrorPage.php
index a174a3c53..31f935419 100755
--- a/core/model/ErrorPage.php
+++ b/core/model/ErrorPage.php
@@ -71,8 +71,8 @@ class ErrorPage extends Page {
 		// Temporarily log out when producing this page
 		$loggedInMember = Member::currentUser();
 		Session::clear("loggedInAs");
-		$alc_enc = $_COOKIE['alc_enc'];
-		Cookie::set('alc_enc',null);
+		$alc_enc = isset($_COOKIE['alc_enc']) ? $_COOKIE['alc_enc'] : null;
+		Cookie::set('alc_enc', null);
 
 		// Run the page
 		Requirements::clear();
@@ -86,7 +86,9 @@ class ErrorPage extends Page {
 
 		// Log back in
 		Session::set("loggedInAs", $loggedInMember->ID);
-		Cookie::set('alc_enc',$alc_enc);
+		if(isset($alc_enc)) {
+			Cookie::set('alc_enc', $alc_enc);
+		}
 		
 		return $this->extension_instances['Versioned']->publish($fromStage, $toStage, $createNewVersion);
 	}
diff --git a/core/model/Versioned.php b/core/model/Versioned.php
index 3104653ae..f4a7f64c8 100755
--- a/core/model/Versioned.php
+++ b/core/model/Versioned.php
@@ -280,7 +280,7 @@ class Versioned extends DataObjectDecorator {
 			$from = Versioned::get_one_by_stage($this->owner->class, $fromStage, "`{$baseClass}`.ID = {$this->owner->ID}");
 		}
 		
-		$publisherID = Member::currentUser()->ID ?  Member::currentUser()->ID : 0;
+		$publisherID = isset(Member::currentUser()->ID) ? Member::currentUser()->ID : 0;
 		
 		if($from) {
 			$from->forceChange();
diff --git a/security/Member.php b/security/Member.php
index be17c70ba..a52b4af4a 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -404,7 +404,7 @@ class Member extends DataObject {
 	function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 		
-		if(!DB::query("SELECT * FROM Member")->value() && $_REQUEST['username'] && $_REQUEST['password']) {
+		if(!DB::query("SELECT * FROM Member")->value() && isset($_REQUEST['username']) && isset($_REQUEST['password'])) {
 			Security::findAnAdministrator($_REQUEST['username'], $_REQUEST['password']);
 			
 			if(!Database::$supressOutput) {
diff --git a/security/Security.php b/security/Security.php
index 7590b3f16..5d28ff501 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -211,7 +211,7 @@ class Security extends Controller {
 			Permission::grant($adminGroup->ID, "ADMIN");
 		}
 		
-		if(!$member) {
+		if(!isset($member)) {
 			$member = Object::create('Member');
 			$member->FirstName = $member->Surname = 'Admin';
 			$member->Email = $username;