1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00

Fixes #4493 - USER_WIDTH causing PHP8 error.

This commit is contained in:
Cameron
2021-04-20 13:32:58 -07:00
parent cad29d50cf
commit c57b029877

View File

@@ -25,7 +25,7 @@ class e_signup
function __construct() function __construct()
{ {
$this->pref = e107::pref('core'); $this->pref = e107::pref();
$this->pref['user_reg_veri'] = intval($this->pref['user_reg_veri']); $this->pref['user_reg_veri'] = intval($this->pref['user_reg_veri']);
@@ -134,7 +134,7 @@ class e_signup
$clean_email = "xxx"; $clean_email = "xxx";
}*/ }*/
$new_email = $tp->toDB(varset($_POST['resend_newemail'], '')); $new_email = $tp->toDB(varset($_POST['resend_newemail']));
if(!check_email($new_email )) if(!check_email($new_email ))
{ {
$new_email = FALSE; $new_email = FALSE;
@@ -210,7 +210,7 @@ class e_signup
return true; return true;
} }
$result = e107::getEmail()->sendEmail($row['user_email'], $row['user_name'], $eml, false); $result = e107::getEmail()->sendEmail($row['user_email'], $row['user_name'], $eml);
if(!$result) if(!$result)
{ {
@@ -244,16 +244,16 @@ class e_signup
$text = "<div id='signup-resend-email'> $text = "<div id='signup-resend-email'>
<form method='post' class='form-horizontal' action='".e_SELF."?resend' id='resend_form' autocomplete='off'> <form method='post' class='form-horizontal' action='".e_SELF."?resend' id='resend_form' autocomplete='off'>
<table style='".USER_WIDTH."' class='table fborder'> <table style='".defset('USER_WIDTH')."' class='table fborder'>
<tr> <tr>
<td class='forumheader3' style='width:30%'>".LAN_SIGNUP_48."</td> <td class='forumheader3' style='width:30%'>".LAN_SIGNUP_48."</td>
<td class='forumheader3'>".$frm->text('resend_email','',80)." <td class='forumheader3'>".$frm->text('resend_email')."
<a class='e-expandit' href='#different'>".LAN_SIGNUP_121."</a></td> <a class='e-expandit' href='#different'>".LAN_SIGNUP_121."</a></td>
</tr> </tr>
</table> </table>
<div id='different' class='e-hideme'> <div id='different' class='e-hideme'>
<table style='".USER_WIDTH."' class='table fborder'> <table style='".defset('USER_WIDTH')."' class='table fborder'>
<tr> <tr>
<td class='forumheader3' colspan='2'>".LAN_SIGNUP_49."</td> <td class='forumheader3' colspan='2'>".LAN_SIGNUP_49."</td>
</tr> </tr>
@@ -385,7 +385,7 @@ class e_signup
// Set initial classes, and any which the user can opt to join // Set initial classes, and any which the user can opt to join
if ($init_class = $userMethods->userClassUpdate($row, 'userfull')) if ($init_class = $userMethods->userClassUpdate($row))
{ {
//print_a($init_class); exit; //print_a($init_class); exit;
$dbData['data']['user_class'] = $init_class; $dbData['data']['user_class'] = $init_class;
@@ -412,7 +412,7 @@ class e_signup
{ {
require_once(e_HANDLER.'login.php'); require_once(e_HANDLER.'login.php');
$usr = new userlogin(); $usr = new userlogin();
$usr->login($row['user_loginname'], md5($row['user_name'].$row['user_password'].$row['user_join']), 'signup', ''); $usr->login($row['user_loginname'], md5($row['user_name'].$row['user_password'].$row['user_join']), 'signup');
} }