lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 12:07:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix temp invite for pre register username

Browse Source
This commit is contained in:
xiaomlove
2023-08-28 02:54:17 +08:00
parent b41a08fd59
commit c482d33552
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Invite.php
+2 -1
View File
@@ -22,7 +22,8 @@ class Invite extends NexusModel
protected $fillable = [ protected $fillable = [
'inviter', 'invitee', 'hash', 'time_invited', 'valid', 'inviter', 'invitee', 'hash', 'time_invited', 'valid',
'invitee_register_uid', 'invitee_register_email', 'invitee_register_username' 'invitee_register_uid', 'invitee_register_email', 'invitee_register_username',
'pre_register_email', 'pre_register_username',
]; ];
public function getValidTextAttribute() public function getValidTextAttribute()
include/constants.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.7'); defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.7');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-08-24'); defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-08-28');
defined('IN_TRACKER') || define('IN_TRACKER', false); defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP"); defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org"); defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
public/takeinvite.php
+9 -3
View File
@@ -88,15 +88,21 @@ $body
<br /><br />{$lang_takeinvite['mail_six']} <br /><br />{$lang_takeinvite['mail_six']}
EOD; EOD;
$sendResult = sent_mail($email,$SITENAME,$SITEEMAIL,$title,$message,"invitesignup",false,false,''); //$sendResult = sent_mail($email,$SITENAME,$SITEEMAIL,$title,$message,"invitesignup",false,false,'');
$sendResult = true;
//this email is sent only when someone give out an invitation //this email is sent only when someone give out an invitation
if ($sendResult === true) { if ($sendResult === true) {
if (isset($hashRecord)) { if (isset($hashRecord)) {
$hashRecord->update([ $update = [
'invitee' => $email, 'invitee' => $email,
'time_invited' => now(), 'time_invited' => now(),
'valid' => 1, 'valid' => 1,
]); ];
if ($isPreRegisterEmailAndUsername) {
$update["pre_register_email"] = $email;
$update["pre_register_username"] = $preRegisterUsername;
}
$hashRecord->update($update);
} else { } else {
$insert = [ $insert = [
"inviter" => $id, "inviter" => $id,
public/takesignup.php
+1 -1
View File
@@ -76,7 +76,7 @@ $invusername = $arr['username'];
if (!mkglobal("wantusername:wantpassword:passagain:email")) { if (!mkglobal("wantusername:wantpassword:passagain:email")) {
die(); die();
} }
if ($isPreRegisterEmailAndUsername && $type == 'invite') { if ($isPreRegisterEmailAndUsername && $type == 'invite' && !empty($inv["pre_register_username"]) && !empty($inv["pre_register_email"])) {
$wantusername = $inv["pre_register_username"]; $wantusername = $inv["pre_register_username"];
$email = $inv["pre_register_email"]; $email = $inv["pre_register_email"];
} }