1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 17:01:43 +02:00

Global fix and PHP Doc fix.

This commit is contained in:
Cameron
2019-02-21 12:05:54 -08:00
parent 9568f5c888
commit b03611922f
2 changed files with 4 additions and 3 deletions

View File

@@ -192,7 +192,7 @@ if(!defined($COPPA_TEMPLATE))
{ {
$COPPA_TEMPLATE = $COPPA_TEMPLATE =
LAN_SIGNUP_77." <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>".LAN_SIGNUP_14."</a>. " LAN_SIGNUP_77." <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>".LAN_SIGNUP_14."</a>. "
.LAN_SIGNUP_15." ".$tp->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."<br /> .LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."<br />
<br /> <br />
<div style='text-align:center'><b>".LAN_SIGNUP_17."</b> <div style='text-align:center'><b>".LAN_SIGNUP_17."</b>
{SIGNUP_COPPA_FORM} {SIGNUP_COPPA_FORM}

View File

@@ -345,7 +345,7 @@ class UserHandler
* Detect Password Hash Algorythm type * Detect Password Hash Algorythm type
* @param string $hash - Password hash to analyse * @param string $hash - Password hash to analyse
* @param string $mode - (optional) set to 'text' for a plain-text description. * @param string $mode - (optional) set to 'text' for a plain-text description.
* @return bool|int * @return bool|int|array
*/ */
public function getHashType($hash, $mode='constant') public function getHashType($hash, $mode='constant')
{ {
@@ -1333,7 +1333,8 @@ class e_user_provider
$userdata['user_perms'] = ''; $userdata['user_perms'] = '';
$userdata['user_realm'] = ''; $userdata['user_realm'] = '';
$userdata['user_pwchange'] = $now; $userdata['user_pwchange'] = $now;
/** @var e_system_user' $user */
$user = e107::getSystemUser(0, false); $user = e107::getSystemUser(0, false);
$user->setData($userdata); $user->setData($userdata);
$user->getExtendedModel(); // init $user->getExtendedModel(); // init