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

Fixed re-creating of a new Hash field even if one exists, also fixed non-object errors through better structured setSession() method

Browse Source
This commit is contained in:
Sean Harvey 2008-05-14 11:30:35 +00:00
parent 39229e19f4
commit edcdbf8935
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/MultiForm.php
View File

@ -139,13 +139,9 @@ abstract class MultiForm extends Form {
if(isset($_GET['StepID'])) { if(isset($_GET['StepID'])) {
$stepID = (int)$_GET['StepID']; $stepID = (int)$_GET['StepID'];
$currentStep = DataObject::get_one('MultiFormStep', "SessionID = {$this->session->ID} AND ID = {$stepID}"); $currentStep = DataObject::get_one('MultiFormStep', "SessionID = {$this->session->ID} AND ID = {$stepID}");
// @TODO if you set a wrong ID, then it ends up at this point with a non-object error.
} elseif($this->session->CurrentStepID) { } elseif($this->session->CurrentStepID) {
// @TODO if you set a wrong ID, then it ends up at this point with a non-object error.
$currentStep = $this->session->CurrentStep(); $currentStep = $this->session->CurrentStep();
} else { } else {
// @TODO fix the fact that you can continually refresh on the first step creating new records
// @TODO encapsulate this into it's own method - it's the same code as the next() method anyway
$currentStep = new $startStepClass(); $currentStep = new $startStepClass();
$currentStep->SessionID = $this->session->ID; $currentStep->SessionID = $this->session->ID;
$currentStep->write(); $currentStep->write();
@ -205,14 +201,21 @@ abstract class MultiForm extends Form {
user_error('MultiForm::init(): Please define a correct value for $url_type on ' . $this->class, E_USER_ERROR); user_error('MultiForm::init(): Please define a correct value for $url_type on ' . $this->class, E_USER_ERROR);
break; break;
} }
} else { }
// If there was no session found, create a new one instead
if(!$this->session) {
// @TODO fix the fact that you can continually refresh on the first step creating new records // @TODO fix the fact that you can continually refresh on the first step creating new records
$this->session = new MultiFormSession(); $this->session = new MultiFormSession();
$this->session->write(); $this->session->write();
}
// We have to have an ID, before we can hash the ID of the session. @TODO a better way here? // We have to have an ID, before we can hash the ID of the session. @TODO a better way here?
if($urlType == 'Hash') $this->session->Hash = sha1($this->session->ID . '-' . microtime()); if($urlType == 'Hash') {
$this->session->write(); // I guess we could hash something else than the ID, this is a bit ugly... if(!$this->session->Hash) {
$this->session->Hash = sha1($this->session->ID . '-' . microtime());
$this->session->write(); // I guess we could hash something else than the ID, this is a bit ugly...
}
} }
} }
@ -225,7 +228,7 @@ abstract class MultiForm extends Form {
*/ */
function getSessionRecordByHash($hash) { function getSessionRecordByHash($hash) {
$SQL_hash = Convert::raw2sql($hash); $SQL_hash = Convert::raw2sql($hash);
return DataObject::get_one('MultiFormSession', "Hash = '$SQL_hash'"); return DataObject::get_one('MultiFormSession', "Hash = '$SQL_hash' AND IsComplete = 0");
} }
/** /**
@ -235,7 +238,7 @@ abstract class MultiForm extends Form {
* @return MultiFormSession * @return MultiFormSession
*/ */
function getSessionRecordByID($id) { function getSessionRecordByID($id) {
return DataObject::get_by_id('MultiFormSession', $id); return DataObject::get_one('MultiFormSession', "MultiFormSession.ID = $id AND IsComplete = 0");
} }
/** /**

16
code/MultiFormSession.php
View File

@ -13,8 +13,9 @@
class MultiFormSession extends DataObject { class MultiFormSession extends DataObject {
static $db = array( static $db = array(
'Data' => 'Text', // stores serialized maps with all session information 'Data' => 'Text', // stores serialized maps with all session information
'Hash' => 'Varchar(40)' // cryptographic hash identification to this session 'Hash' => 'Varchar(40)', // cryptographic hash identification to this session
'IsComplete' => 'Boolean' // flag to determine if this session is marked completed
); );
static $has_one = array( static $has_one = array(
@ -26,6 +27,17 @@ class MultiFormSession extends DataObject {
'FormSteps' => 'MultiFormStep' 'FormSteps' => 'MultiFormStep'
); );
/**
* Mark this session as completed.
*
* This sets the flag "IsComplete" to true,
* and writes the session back.
*/
public function markCompleted() {
$this->IsComplete = 1;
$this->write();
}
/** /**
* These actions are performed when write() is called on this object. * These actions are performed when write() is called on this object.
*/ */