Skip to content

By ref errors #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mambax7 merged 1 commit into from
Apr 13, 2017
Merged

By ref errors #459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions htdocs/register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ function userCheck($uname, $email, $pass, $vpass)
if (isset($_GET['actkey'])) {
$clean_actkey = XoopsFilterInput::clean($_GET['actkey'], 'STRING');
}
$op = in_array($op, array('actv', 'activate'), true) ? $op : 'register';
}

switch ($op) {
Expand Down Expand Up @@ -215,7 +216,7 @@ function userCheck($uname, $email, $pass, $vpass)
}
// Sending notification email to user for self activation
if ($xoopsConfigUser['activation_type'] == 0) {
$xoopsMailer =& xoops_getMailer();
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('register.tpl');
$xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
Expand All @@ -232,7 +233,7 @@ function userCheck($uname, $email, $pass, $vpass)
}
// Sending notification email to administrator for activation
} elseif ($xoopsConfigUser['activation_type'] == 2) {
$xoopsMailer =& xoops_getMailer();
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('adminactivate.tpl');
$xoopsMailer->assign('USERNAME', $uname);
Expand All @@ -254,7 +255,7 @@ function userCheck($uname, $email, $pass, $vpass)
}
}
if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
$xoopsMailer =& xoops_getMailer();
$xoopsMailer = xoops_getMailer();
$xoopsMailer->reset();
$xoopsMailer->useMail();
/* @var $member_handler XoopsMemberHandler */
Expand Down Expand Up @@ -299,7 +300,7 @@ function userCheck($uname, $email, $pass, $vpass)
$xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
if ($xoopsConfigUser['activation_type'] == 2) {
$myts = MyTextSanitizer::getInstance();
$xoopsMailer =& xoops_getMailer();
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('activated.tpl');
$xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
Expand Down