[pLog-svn] r842 - in plog/trunk: class/summary/action locale
templates/summary
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Tue Jan 25 21:29:22 GMT 2005
Author: oscar
Date: 2005-01-25 21:29:21 +0000 (Tue, 25 Jan 2005)
New Revision: 842
Modified:
plog/trunk/class/summary/action/doblogregistration.class.php
plog/trunk/class/summary/action/registeraction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/summary/registerstep1.template
plog/trunk/templates/summary/registerstep5.template
Log:
finally it seems that it's working better...
Modified: plog/trunk/class/summary/action/doblogregistration.class.php
===================================================================
--- plog/trunk/class/summary/action/doblogregistration.class.php 2005-01-25 21:00:51 UTC (rev 841)
+++ plog/trunk/class/summary/action/doblogregistration.class.php 2005-01-25 21:29:21 UTC (rev 842)
@@ -4,7 +4,6 @@
include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
include_once( PLOG_CLASS_PATH."class/summary/view/doblogregistrationview.class.php" );
include_once( PLOG_CLASS_PATH."class/summary/view/blogtemplatechooserview.class.php" );
@@ -33,12 +32,6 @@
{
// validated values
$tf = new Textfilter();
- $this->blogName = $tf->filterAllHTML( $this->_request->getValue( "blogName" ));
- $this->blogLocale = $this->_request->getValue( "blogLocale" );
- $this->userName = $tf->filterAllHTML($this->_request->getValue( "userName" ));
- $this->userPassword = $tf->filterAllHTML($this->_request->getValue( "userPassword" ));
- $this->userEmail = $tf->filterAllHTML($this->_request->getValue( "userEmail" ));
- $this->userFullName = $tf->filterAllHTML($this->_request->getValue( "userFullName" ));
//$this->log->debug("blog name is ".$this->blogName);
$this->log->debug("blog name is ".$this->_request->getValue(blogName));
Modified: plog/trunk/class/summary/action/registeraction.class.php
===================================================================
--- plog/trunk/class/summary/action/registeraction.class.php 2005-01-25 21:00:51 UTC (rev 841)
+++ plog/trunk/class/summary/action/registeraction.class.php 2005-01-25 21:29:21 UTC (rev 842)
@@ -1,8 +1,9 @@
<?php
include_once( PLOG_CLASS_PATH."class/action/action.class.php" );
+include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
include_once( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
-include_once( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
+include_once( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
/**
* Base action that all register actions should extend
@@ -27,11 +28,26 @@
$this->Action( $actionInfo, $request );
$this->_config = &Config::getConfig();
$this->_locale = &Locales::getLocale( $this->_config->getValue("default_locale" ));
+
+ $tf = new Textfilter();
+ $this->blogName = $tf->filterAllHTML( $this->_request->getValue( "blogName" ));
+ $this->blogLocale = $this->_request->getValue( "blogLocale" );
+ $this->userName = $tf->filterAllHTML($this->_request->getValue( "userName" ));
+ $this->userPassword = $tf->filterAllHTML($this->_request->getValue( "userPassword" ));
+ $this->userEmail = $tf->filterAllHTML($this->_request->getValue( "userEmail" ));
+ $this->userFullName = $tf->filterAllHTML($this->_request->getValue( "userFullName" ));
+
}
//}}}
+
+ function validationErrorProcessing()
+ {
+ parent::validationErrorProcessing();
+ $this->setValues();
+ }
/**
- * make these values tranfered until the last register step
+ * make these values tranferred until the last register step
*/
function setValues(){
$this->_view->setValue( "userName", $this->userName );
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-25 21:00:51 UTC (rev 841)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-25 21:29:21 UTC (rev 842)
@@ -823,7 +823,7 @@
$messages['finish'] = 'Finish';
$messages['register_need_confirmation'] = 'An email message including the confirmation has been sent to your email address, please click the link as soon as you receive the message to start blogging!';
$messages['register_step5_help'] = 'Congratulations, your new user and blog have been successfully created!';
-$messages['register_blog_link'] = 'If you would like to take a look at your new blog, you can go there now: <a href="%1$s">%2$s</a>';
+$messages['register_blog_link'] = 'If you would like to take a look at your new blog, you can go there now: <a href="%2$s">%1$s</a>';
$messages['register_blog_admin_link'] = 'If you prefer to start posting right away, please click to go to the <a href="admin.php">administration interface</a>';
$messages['register_error'] = 'There was an error during the process';
// registration article topic and text
Modified: plog/trunk/templates/summary/registerstep1.template
===================================================================
--- plog/trunk/templates/summary/registerstep1.template 2005-01-25 21:00:51 UTC (rev 841)
+++ plog/trunk/templates/summary/registerstep1.template 2005-01-25 21:29:21 UTC (rev 842)
@@ -38,7 +38,7 @@
</div>
</fieldset>
<div class="buttons">
- <input type="submit" value="» {$locale->tr("register_next")}" name="Register"/>
+ <input type="submit" value="{$locale->tr("register_next")} »" name="Register"/>
<input type="hidden" name="op" value="RegisterStep2"/>
</div>
</form>
Modified: plog/trunk/templates/summary/registerstep5.template
===================================================================
--- plog/trunk/templates/summary/registerstep5.template 2005-01-25 21:00:51 UTC (rev 841)
+++ plog/trunk/templates/summary/registerstep5.template 2005-01-25 21:29:21 UTC (rev 842)
@@ -11,7 +11,8 @@
{else}
{assign var=url value=$blog->getBlogRequestGenerator()}
{assign var=blogName value=$blog->getBlog()}
- {$locale->pr("register_blog_link",$blogName)}<br/>
+ {assign var=blogUrl value=$url->blogLink()}
+ {$locale->pr("register_blog_link",$blogName,$blogUrl)}<br/>
{$locale->tr("register_blog_admin_link")}<br/>
{/if}
</p>
More information about the pLog-svn
mailing list