From 29e990dac3c718bf5920e93abaf148eda468b6ca Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 19 Aug 2009 22:35:00 +0300
Subject: [PATCH] Restructured the component and session init processes.

---
 vendor/zynapse/active_session.php | 11 +++++----
 vendor/zynapse/zynapse.php        | 39 +++++++++++++------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/vendor/zynapse/active_session.php b/vendor/zynapse/active_session.php
index 0e513db..579e9d8 100644
--- a/vendor/zynapse/active_session.php
+++ b/vendor/zynapse/active_session.php
@@ -45,22 +45,23 @@ class ActiveSession {
 		$id = null,
 		
 		# session key to store verification data in
-		$key = '____zynapse_secure_session_data_verification____',
+		$key = '____active_session_verification_data____',
 		
 		# Session class has been started?
 		$started = false;
 	
 	
 	function __construct () {
-		if ( array_key_exists('sess_id', $_REQUEST) ) {
-			session_id($_REQUEST['sess_id']);
-		}
+		
+	}
+	
+	function start () {
 		session_start();
-      $this->id = session_id();
 	}
 	
 	function init () {
 		//TODO validate and init zynapse's session features
+      $this->id = session_id();
 		$this->started = true;
 	}
 	
diff --git a/vendor/zynapse/zynapse.php b/vendor/zynapse/zynapse.php
index bd143d9..dfe653d 100644
--- a/vendor/zynapse/zynapse.php
+++ b/vendor/zynapse/zynapse.php
@@ -50,36 +50,29 @@ class Zynapse {
 		require_once(ZNAP_LIB_ROOT."/action_view.php");
 		require_once(ZNAP_LIB_ROOT."/active_session.php");
 		
-		// enable php's session storage
+		// Enable PHP sessions
+		ActiveSession::start();
+		
+		// Init the environment system (ActionEnvironment)
+		self::$env = new ActionEnvironment();
+		self::$env->init();
+		
+		// Init the session control system (ActiveSession)
 		self::$session = new ActiveSession();
-		
-		// init core components
-		self::init_env();
-		self::init_base();
-		self::init_view();
-		
-		// init zynapse's session system
 		self::$session->init();
 		
+		// Init the core controller system (ActionBase)
+		self::$base = new ActionBase();
+		self::$base->init();
+		
+		// Init the output and page rendering system (ActionView)
+		self::$view = new ActionView();
+		self::$view->init();
+		
 		echo "hello world<br />\n";
 		echo self::$env->environment."<br />\n<br />\n";
 	}
 	
-	function init_env () {
-		self::$env = new ActionEnvironment();
-		self::$env->init();
-	}
-	
-	function init_base () {
-		self::$base = new ActionBase();
-		self::$base->init();
-	}
-	
-	function init_view () {
-		self::$view = new ActionView();
-		self::$view->init();
-	}
-	
 }
 
 ?>
\ No newline at end of file