tonyair/silverstripe-multiform
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-multiform synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Added currentSessionHash property to MultiForm which stores the currently opened session by the user

Browse Source 
API CHANGE Renamed MultiForm::getSessionRecord() to getCurrentSession() and removed the parameter, since this wasn't done in a very OOP manner
MINOR Test for MultiFormSession::markCompleted() to ensure that session can't be used again by MultiForm
This commit is contained in:
Sean Harvey 2009-08-05 10:12:13 +00:00
parent a907cc6493
commit c2ba6d441f
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
code/MultiForm.php
View File

@ -23,6 +23,12 @@ abstract class MultiForm extends Form {
*/
protected $session;
/**
* The current encrypted MultiFormSession identification.
* @var string
*/
protected $currentSessionHash;
/**
* Defines which subclass of {@link MultiFormStep} should be the first
* step in the multi-step process.
@ -77,6 +83,9 @@ abstract class MultiForm extends Form {
* @param string $name The form name, typically the same as the method name
*/
public function __construct($controller, $name) {
if(isset($_GET['MultiFormSessionID'])) {
$this->setCurrentSessionHash($_GET['MultiFormSessionID']);
}
// Set up the session for this MultiForm instance
$this->setSession();
@ -210,17 +219,14 @@ abstract class MultiForm extends Form {
* Perhaps it would be best dealt with on a separate class?
*/
protected function setSession() {
// If there's a MultiFormSessionID variable set, find that, otherwise create a new session
if(isset($_GET['MultiFormSessionID'])) {
$this->session = $this->getSessionRecord($_GET['MultiFormSessionID']);
}
$this->session = $this->getCurrentSession();
// If there was no session found, create a new one instead
if(!$this->session) {
$this->session = new MultiFormSession();
$this->session->write();
}
// Create encrypted identification to the session instance if it doesn't exist
if(!$this->session->Hash) {
$this->session->Hash = sha1($this->session->ID . '-' . microtime());
@ -229,13 +235,22 @@ abstract class MultiForm extends Form {
}
/**
* Return an instance of MultiFormSession.
*
* @param string $hash The unique, encrypted hash to identify the session
* @return MultiFormSession
* Set the currently used encrypted hash to identify
* the MultiFormSession.
*
* @param string $hash Encrypted identification to session
*/
function getSessionRecord($hash) {
$SQL_hash = Convert::raw2sql($hash);
function setCurrentSessionHash($hash) {
$this->currentSessionHash = $hash;
}
/**
* Return the currently used {@link MultiFormSession}
* @return MultiFormSession|boolean FALSE
*/
function getCurrentSession() {
if(!$this->currentSessionHash) return false;
$SQL_hash = Convert::raw2sql($this->currentSessionHash);
return DataObject::get_one('MultiFormSession', "Hash = '$SQL_hash' AND IsComplete = 0");
}

10
tests/MultiFormTest.php
View File

@ -25,6 +25,7 @@ class MultiFormTest extends FunctionalTest {
function setUp() {
parent::setUp();
$this->controller = new MultiFormTest_Controller();
$this->form = $this->controller->Form();
}
@ -79,6 +80,13 @@ class MultiFormTest extends FunctionalTest {
$this->assertNotNull($actionPrevResponse->getBody());
}
function testCompletedSession() {
$this->form->setCurrentSessionHash($this->form->session->Hash);
$this->assertType('MultiFormSession', $this->form->getCurrentSession());
$this->form->session->markCompleted();
$this->assertFalse($this->form->getCurrentSession());
}
}
class MultiFormTest_Controller extends Controller implements TestOnly {
@ -136,4 +144,4 @@ class MultiFormTest_StepThree extends MultiFormStep implements TestOnly {
);
}
}
}