aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Winslow <evan@elgg.org>2011-03-18 22:25:02 -0700
committerEvan Winslow <evan@elgg.org>2011-03-18 22:25:02 -0700
commit198cd62a80dbc685d8e10686e81c7b5a4a2f2773 (patch)
treea2edd1abacf09699c1525630a0fa2e563535dd64
parent9e4ac3d0d5b24cd6c91b33a5402fb5e636df61f4 (diff)
downloadelgg-198cd62a80dbc685d8e10686e81c7b5a4a2f2773.tar.gz
elgg-198cd62a80dbc685d8e10686e81c7b5a4a2f2773.tar.bz2
Cleaned up registration terms and updated to 1.8 style
Upped version.
-rw-r--r--languages/en.php12
-rw-r--r--manifest.xml2
-rw-r--r--start.php37
-rw-r--r--views/default/account/forms/register.php46
-rw-r--r--views/default/registrationterms/register.php16
5 files changed, 30 insertions, 83 deletions
diff --git a/languages/en.php b/languages/en.php
index 079e85e07..ba7b03d92 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,10 +1,6 @@
<?php
-$english = array(
- 'agreetoterms' => "I have read and agree to the",
- 'terms' => 'Terms',
- 'agreetoterms:required' => "You must first agree to the terms",
-);
-
-add_translation("en",$english);
-?> \ No newline at end of file
+add_translation("en", array(
+ 'registrationterms:agree' => 'I have read and agree to the <a href="%s">Terms of Service</a>',
+ 'registrationterms:required' => "You must first agree to the terms",
+)); \ No newline at end of file
diff --git a/manifest.xml b/manifest.xml
index 38912072b..f7e84f155 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
<name>Registration Terms</name>
<author>Evan Winslow</author>
- <version>1.0</version>
+ <version>1.1</version>
<description>Force users to check a box saying they agree to the site's terms before they are allowed to register</description>
<website>http://www.facebook.com/evanwinslow</website>
<copyright>(C) Evan Winslow 2010</copyright>
diff --git a/start.php b/start.php
index de7657fab..acd890ae1 100644
--- a/start.php
+++ b/start.php
@@ -1,28 +1,19 @@
<?php
-/*******************************************************************************
- * registrationterms
- *
- * @author Administrator
- ******************************************************************************/
- function registrationterms_init()
- {
- global $CONFIG;
+function registrationterms_init() {
+ //put the terms agreement at the very end
+ elgg_extend_view('register/extend', 'registrationterms/register', 1000);
- //put the terms agreement at the very end
- extend_view('register/extend', 'registrationterms/register', 1000);
-
- //block user registration if they don't check the box
- register_plugin_hook('action', 'register', 'registrationterms_register_hook');
- }
-
- function registrationterms_register_hook()
- {
- if (get_input('agreetoterms',false) != 'true') {
- register_error(elgg_echo('agreetoterms:required'));
- forward($_SERVER['HTTP_REFERER']);
- }
+ //block user registration if they don't check the box
+ elgg_register_plugin_hook_handler('action', 'register', 'registrationterms_register_hook');
+}
+
+function registrationterms_register_hook() {
+ if (get_input('agreetoterms', false) != 'true') {
+ register_error(elgg_echo('registrationterms:required'));
+ forward(REFERER);
}
-
- register_elgg_event_handler('init', 'system', 'registrationterms_init');
+}
+
+elgg_register_elgg_event_handler('init', 'system', 'registrationterms_init');
?> \ No newline at end of file
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
deleted file mode 100644
index 3e53b6f05..000000000
--- a/views/default/account/forms/register.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Elgg register form
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$username = get_input('u');
-$email = get_input('e');
-$name = get_input('n');
-
-$admin_option = false;
-if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
- $admin_option = true;
-}
-
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />";
-
-$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $email)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "general-textarea", 'value' => $username)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "general-textarea")) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "general-textarea")) . "</label><br />";
-
-// view to extend to add more fields to the registration form
-$form_body .= elgg_view('register/extend');
-
-// Add captcha hook
-$form_body .= elgg_view('input/captcha');
-
-if ($admin_option) {
- $form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
-}
-
-$form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid']));
-$form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode']));
-$form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
-$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
-?>
-
-<div id="register-box">
-<h2><?php echo elgg_echo('register'); ?></h2>
-<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
-</div> \ No newline at end of file
diff --git a/views/default/registrationterms/register.php b/views/default/registrationterms/register.php
index a8ad88cdb..7f746719b 100644
--- a/views/default/registrationterms/register.php
+++ b/views/default/registrationterms/register.php
@@ -1,9 +1,15 @@
<?php
/**
- *
+ *
*/
+
+$label = elgg_echo('registrationterms:agree', array(elgg_get_site_url() . 'expages/read/Terms'));
+
+$input = elgg_view('input/checkbox', array(
+ 'name' => 'agreetoterms',
+ 'value' => 'true',
+));
?>
-<label>
- <input type="checkbox" name="agreetoterms" value="true">
- <?php echo elgg_echo('agreetoterms')." <a href=\"{$vars['url']}pg/expages/read/Terms/\">".elgg_echo('terms')."</a>"; ?>
-</label><br/> \ No newline at end of file
+<div>
+ <label><?php echo "$input $label"; ?></label>
+</div> \ No newline at end of file