aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-17 21:12:31 -0700
committerFriendika <info@friendika.com>2011-07-17 21:12:31 -0700
commit1fa2231c20db99c78f0c8681ebae04b6eecf0954 (patch)
treea56a5a459dae1cfa2bdb8dd1e9cc0e66a48a74d8
parent43110db749850e49d309ad8b3e72266bd373a2a8 (diff)
downloadvolse-hubzilla-1fa2231c20db99c78f0c8681ebae04b6eecf0954.tar.gz
volse-hubzilla-1fa2231c20db99c78f0c8681ebae04b6eecf0954.tar.bz2
volse-hubzilla-1fa2231c20db99c78f0c8681ebae04b6eecf0954.zip
invite system
-rw-r--r--include/zotfns.php3
-rw-r--r--mod/contacts.php2
-rw-r--r--mod/invite.php12
-rw-r--r--mod/register.php32
-rw-r--r--view/register.tpl11
5 files changed, 55 insertions, 5 deletions
diff --git a/include/zotfns.php b/include/zotfns.php
index 1ec39aefc..b695b6fcb 100644
--- a/include/zotfns.php
+++ b/include/zotfns.php
@@ -1,5 +1,8 @@
<?php
+
+require_once('include/salmon.php');
+
function zot_get($url,$args) {
$argstr = '';
foreach($args as $k => $v) {
diff --git a/mod/contacts.php b/mod/contacts.php
index 388bf08e6..2fc01a0d8 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -13,7 +13,7 @@ function contacts_init(&$a) {
$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
- if(get_config('system','invitations_only')) {
+ if(get_config('system','invitation_only')) {
$x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) {
$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
diff --git a/mod/invite.php b/mod/invite.php
index 5a6745436..d4eb9c5ef 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -20,7 +20,7 @@ function invite_post(&$a) {
$total = 0;
- if(get_config('system','invitations_only')) {
+ if(get_config('system','invitation_only')) {
$invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining');
if((! $x) && (! is_site_admin()))
@@ -39,12 +39,16 @@ function invite_post(&$a) {
if($invonly && ($x || is_site_admin())) {
$code = autoname(8) . srand(1000,9999);
$nmessage = str_replace('$invite_code',$code,$message);
- // store in db
+
+ $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
+ dbesc($code),
+ dbesc(datetime_convert())
+ );
if(! is_site_admin()) {
$x --;
if($x >= 0)
- set_pconfig(local_user(),'system','invites_remaining,$x);
+ set_pconfig(local_user(),'system','invites_remaining',$x);
else
return;
}
@@ -81,7 +85,7 @@ function invite_content(&$a) {
$tpl = get_markup_template('invite.tpl');
$invonly = false;
- if(get_config('system','invitations_only')) {
+ if(get_config('system','invitation_only')) {
$invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining');
if((! $x) && (! is_site_admin())) {
diff --git a/mod/register.php b/mod/register.php
index 5fac9d79c..549d07a91 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -32,7 +32,11 @@ function register_post(&$a) {
break;
}
+ $using_invites = get_config('system','invitation_only');
+ $num_invites = get_config('system','number_invites');
+
+ $invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
$nickname = ((x($_POST,'nickname')) ? notags(trim($_POST['nickname'])) : '');
$email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
@@ -43,6 +47,19 @@ function register_post(&$a) {
$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
$tmp_str = $openid_url;
+
+ if($using_invites) {
+ if(! $invite_id) {
+ notice( t('An invitation is required.') . EOL);
+ return;
+ }
+ $r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
+ if(! results($r)) {
+ notice( t('Invitation could not be verified.') . EOL);
+ return;
+ }
+ }
+
if((! x($username)) || (! x($email)) || (! x($nickname))) {
if($openid_url) {
if(! validate_url($tmp_str)) {
@@ -329,6 +346,12 @@ function register_post(&$a) {
if( $a->config['register_policy'] == REGISTER_OPEN ) {
+
+ if($using_invites && $invite_id) {
+ q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+ set_pconfig($newuid,'system','invites_remaining',$num_invites);
+ }
+
$email_tpl = get_intltext_template("register_open_eml.tpl");
$email_tpl = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'],
@@ -376,6 +399,10 @@ function register_post(&$a) {
else
push_lang('en');
+ if($using_invites && $invite_id) {
+ q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+ set_pconfig($newuid,'system','invites_remaining',$num_invites);
+ }
$email_tpl = get_intltext_template("register_verify_eml.tpl");
$email_tpl = replace_macros($email_tpl, array(
@@ -434,6 +461,7 @@ function register_content(&$a) {
$openid_url = ((x($_POST,'openid_url')) ? $_POST['openid_url'] : ((x($_GET,'openid_url')) ? $_GET['openid_url'] : ''));
$nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : ''));
$photo = ((x($_POST,'photo')) ? $_POST['photo'] : ((x($_GET,'photo')) ? hex2bin($_GET['photo']) : ''));
+ $invite_id = ((x($_POST,'invite_id')) ? $_POST['invite_id'] : ((x($_GET,'invite_id')) ? $_GET['invite_id'] : ''));
$noid = get_config('system','no_openid');
@@ -476,6 +504,10 @@ function register_content(&$a) {
$o = get_markup_template("register.tpl");
$o = replace_macros($o, array(
'$oidhtml' => $oidhtml,
+ '$invitations' => get_config('system','invitation_only'),
+ '$invite_desc' => t('Membership on this site is by invitation only.'),
+ '$invite_label' => t('Your invitation ID: '),
+ '$invite_id' => $invite_id,
'$realpeople' => $realpeople,
'$regtitle' => t('Registration'),
'$registertext' =>((x($a->config,'register_text'))
diff --git a/view/register.tpl b/view/register.tpl
index ac8388de4..16e8ba767 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -16,6 +16,17 @@
</div>
<div id="register-openid-end" ></div>
+{{ if $invitations }}
+
+ <p id="register-invite-desc">$invite_desc</p>
+ <div id="register-invite-wrapper" >
+ <label for="register-invite" id="label-register-invite" >$invite_label</label>
+ <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
+ </div>
+ <div id="register-name-end" ></div>
+
+{{ endif }}
+
<div id="register-name-wrapper" >
<label for="register-name" id="label-register-name" >$namelabel</label>