ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-19 09:18:18 +03:00
Code Issues Releases Wiki Activity

referal -> referral

Browse source
This commit is contained in:
Mzhelskiy Maxim 2015-03-07 18:23:38 +07:00
parent a83e9d36e6
commit 10623463b1
12 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
application/classes/actions/ActionAuth.class.php
View file

@ -65,7 +65,7 @@ class ActionAuth extends Action
$this->AddEvent('activate', 'EventActivate');
$this->AddEvent('reactivation', 'EventReactivation');
$this->AddEvent('invite', 'EventInvite');
$this->AddEventPreg('/^referal$/i', '/^[\w\-\_]{1,200}$/i', 'EventReferal');
$this->AddEventPreg('/^referral$/i', '/^[\w\-\_]{1,200}$/i', 'EventReferral');
$this->AddEvent('ajax-login', 'EventAjaxLogin');
$this->AddEvent('ajax-password-reset', 'EventAjaxPasswordReset');
@ -427,7 +427,7 @@ class ActionAuth extends Action
/**
* Обработка реферального кода
*/
protected function EventReferal()
protected function EventReferral()
{
if ($this->User_IsAuthorization()) {
Router::LocationAction('/');
@ -437,7 +437,7 @@ class ActionAuth extends Action
*/
if ($sCode = $this->GetParam(0)) {
if ($iType = $this->Invite_GetInviteTypeByCode($sCode)) {
if (!Config::Get('general.reg.invite') or $iType != ModuleInvite::INVITE_TYPE_REFERAL) {
if (!Config::Get('general.reg.invite') or $iType != ModuleInvite::INVITE_TYPE_REFERRAL) {
$this->Session_Set('invite_code', $sCode);
}
}
@ -558,7 +558,7 @@ class ActionAuth extends Action
* Проверяем валидность кода
*/
if ($this->Invite_CheckCode(getRequestStr('invite_code'), ModuleInvite::INVITE_TYPE_CODE)) {
Router::Location($this->Invite_GetReferalLink(null, getRequestStr('invite_code')));
Router::Location($this->Invite_GetReferralLink(null, getRequestStr('invite_code')));
} else {
$this->Message_AddError($this->Lang_Get('auth.invite.alerts.error_code'), $this->Lang_Get('error'));
}

4
application/classes/actions/ActionSettings.class.php
View file

@ -372,7 +372,7 @@ class ActionSettings extends Action
$this->Viewer_Assign('iCountInviteAvailable', $this->Invite_GetCountInviteAvailable($this->oUserCurrent));
$this->Viewer_Assign('iCountInviteUsed', $this->Invite_GetCountInviteUsed($this->oUserCurrent->getId()));
$this->Viewer_Assign('sReferalLink', $this->Invite_GetReferalLink($this->oUserCurrent));
$this->Viewer_Assign('sReferralLink', $this->Invite_GetReferralLink($this->oUserCurrent));
/**
* Если отправили форму
*/
@ -401,7 +401,7 @@ class ActionSettings extends Action
}
$sRefCode = $oInvite->getCode();
} else {
if (!($sRefCode = $this->Invite_GetReferalCode($this->oUserCurrent))) {
if (!($sRefCode = $this->Invite_GetReferralCode($this->oUserCurrent))) {
return $this->EventErrorDebug();
}
}

24
application/classes/modules/invite/Invite.class.php
View file

@ -30,7 +30,7 @@ class ModuleInvite extends ModuleORM
/**
* Тип реферального инвайта, когда пользователь приглашает по своему реферальному коду
*/
const INVITE_TYPE_REFERAL = 1;
const INVITE_TYPE_REFERRAL = 1;
/**
* Тип инвайта по сгенерированному коду, когда пользователь генерирует для приглашения отдельный код (доступен в закрытом режиме сайта)
*/
@ -85,8 +85,8 @@ class ModuleInvite extends ModuleORM
$oUse->setCodeId($oCode->getId());
$oUse->setFromUserId($oCode->getUserId());
} elseif ($iType == self::INVITE_TYPE_REFERAL) {
$oUser = $this->User_GetUserByReferalCode($sCode);
} elseif ($iType == self::INVITE_TYPE_REFERRAL) {
$oUser = $this->User_GetUserByReferralCode($sCode);
$oUse->setFromUserId($oUser->getId());
} else {
return false;
@ -112,8 +112,8 @@ class ModuleInvite extends ModuleORM
return true;
}
}
} elseif ($iType == self::INVITE_TYPE_REFERAL) {
if ($oUser = $this->User_GetUserByReferalCode($sCode)) {
} elseif ($iType == self::INVITE_TYPE_REFERRAL) {
if ($oUser = $this->User_GetUserByReferralCode($sCode)) {
return true;
}
}
@ -134,8 +134,8 @@ class ModuleInvite extends ModuleORM
if ($this->CheckCode($sCode, self::INVITE_TYPE_CODE)) {
return self::INVITE_TYPE_CODE;
}
if ($this->CheckCode($sCode, self::INVITE_TYPE_REFERAL)) {
return self::INVITE_TYPE_REFERAL;
if ($this->CheckCode($sCode, self::INVITE_TYPE_REFERRAL)) {
return self::INVITE_TYPE_REFERRAL;
}
return false;
}
@ -146,13 +146,13 @@ class ModuleInvite extends ModuleORM
* @param ModuleUser_EntityUser $oUser
* @return string|null
*/
public function GetReferalCode($oUser)
public function GetReferralCode($oUser)
{
if (is_scalar($oUser)) {
$oUser = $this->User_GetUserById($oUser);
}
if (is_object($oUser)) {
return $oUser->getReferalCode();
return $oUser->getReferralCode();
}
return null;
}
@ -164,10 +164,10 @@ class ModuleInvite extends ModuleORM
* @param string|null $sCode
* @return null|string
*/
public function GetReferalLink($oUser, $sCode = null)
public function GetReferralLink($oUser, $sCode = null)
{
if ($sCode or $sCode = $this->GetReferalCode($oUser)) {
return Router::GetPath('auth/referal') . urlencode($sCode) . '/';
if ($sCode or $sCode = $this->GetReferralCode($oUser)) {
return Router::GetPath('auth/referral') . urlencode($sCode) . '/';
}
return null;
}

2
application/classes/modules/notify/Notify.class.php
View file

@ -255,7 +255,7 @@ class ModuleNotify extends Module
'sMailTo' => $sMailTo,
'oUserFrom' => $oUserFrom,
'sRefCode' => $sRefCode,
'sRefLink' => $this->Invite_GetReferalLink($oUserFrom, $sRefCode),
'sRefLink' => $this->Invite_GetReferralLink($oUserFrom, $sRefCode),
)
);
}

8
application/classes/modules/user/User.class.php
View file

@ -463,8 +463,8 @@ class ModuleUser extends Module
*/
public function Add(ModuleUser_EntityUser $oUser)
{
if (is_null($oUser->getReferalCode())) {
$oUser->setReferalCode(md5((string)$oUser->getMail() . func_generator(32)));
if (is_null($oUser->getReferralCode())) {
$oUser->setReferralCode(md5((string)$oUser->getMail() . func_generator(32)));
}
if ($sId = $this->oMapper->Add($oUser)) {
$oUser->setId($sId);
@ -525,9 +525,9 @@ class ModuleUser extends Module
* @param string $sCode Реферальный код
* @return ModuleUser_EntityUser|null
*/
public function GetUserByReferalCode($sCode)
public function GetUserByReferralCode($sCode)
{
$id = $this->oMapper->GetUserByReferalCode($sCode);
$id = $this->oMapper->GetUserByReferralCode($sCode);
return $this->GetUserById($id);
}

8
application/classes/modules/user/entity/User.entity.class.php
View file

@ -245,9 +245,9 @@ class ModuleUser_EntityUser extends Entity
*
* @return string|null
*/
public function getReferalCode()
public function getReferralCode()
{
return $this->_getDataOne('user_referal_code');
return $this->_getDataOne('user_referral_code');
}
/**
@ -748,9 +748,9 @@ class ModuleUser_EntityUser extends Entity
*
* @param string $data
*/
public function setReferalCode($data)
public function setReferralCode($data)
{
$this->_aData['user_referal_code'] = $data;
$this->_aData['user_referral_code'] = $data;
}
/**

12
application/classes/modules/user/mapper/User.mapper.class.php
View file

@ -43,12 +43,12 @@ class ModuleUser_MapperUser extends Mapper
user_ip_register,
user_activate,
user_activate_key,
user_referal_code
user_referral_code
)
VALUES(?, ?, ?, ?, ?, ?, ?, ?)
";
if ($iId = $this->oDb->query($sql, $oUser->getLogin(), $oUser->getPassword(), $oUser->getMail(),
$oUser->getDateRegister(), $oUser->getIpRegister(), $oUser->getActivate(), $oUser->getActivateKey(), $oUser->getReferalCode())
$oUser->getDateRegister(), $oUser->getIpRegister(), $oUser->getActivate(), $oUser->getActivateKey(), $oUser->getReferralCode())
) {
return $iId;
}
@ -74,7 +74,7 @@ class ModuleUser_MapperUser extends Mapper
user_count_vote = ? ,
user_activate = ? ,
user_activate_key = ? ,
user_referal_code = ? ,
user_referral_code = ? ,
user_profile_name = ? ,
user_profile_sex = ? ,
user_profile_country = ? ,
@ -102,7 +102,7 @@ class ModuleUser_MapperUser extends Mapper
$oUser->getCountVote(),
$oUser->getActivate(),
$oUser->getActivateKey(),
$oUser->getReferalCode(),
$oUser->getReferralCode(),
$oUser->getProfileName(),
$oUser->getProfileSex(),
$oUser->getProfileCountry(),
@ -346,13 +346,13 @@ class ModuleUser_MapperUser extends Mapper
* @param string $sCode Код
* @return int|null
*/
public function GetUserByReferalCode($sCode)
public function GetUserByReferralCode($sCode)
{
$sql = "SELECT
u.user_id
FROM
" . Config::Get('db.table.user') . " as u
WHERE u.user_referal_code = ? ";
WHERE u.user_referral_code = ? ";
if ($aRow = $this->oDb->selectRow($sql, $sCode)) {
return $aRow['user_id'];
}

6
application/frontend/components/user/settings/invite.tpl
View file

@ -19,9 +19,9 @@
{/if}
</strong>
{else}
{if $sReferalLink}
{lang name='user.settings.invites.referal_link'}:<br/>
<strong>{$sReferalLink|escape}</strong>
{if $sReferralLink}
{lang name='user.settings.invites.referral_link'}:<br/>
<strong>{$sReferralLink|escape}</strong>
{/if}
{/if}

2
application/frontend/i18n/ru.php
View file

@ -1401,7 +1401,7 @@ return array(
'available_no' => 'У вас пока нет доступных инвайтов',
'used' => 'Приглашено пользователей',
'used_empty' => 'нет',
'referal_link' => 'Ваша персональная реферальная ссылка',
'referral_link' => 'Ваша персональная реферальная ссылка',
'many' => 'много',
'fields' => array(
'email' => array(

8
application/install/backend/step/updateVersion.php
View file

@ -646,9 +646,9 @@ class InstallStepUpdateVersion extends InstallStep
/**
* Реферальный код
*/
$sReferalCode = $aUser['user_referal_code'];
if (!$sReferalCode) {
$sReferalCode = md5($aUser['user_id'] . '_' . mt_rand());
$sReferralCode = $aUser['user_referral_code'];
if (!$sReferralCode) {
$sReferralCode = md5($aUser['user_id'] . '_' . mt_rand());
}
/**
@ -664,7 +664,7 @@ class InstallStepUpdateVersion extends InstallStep
*/
$sAvatar = mysqli_escape_string($this->rDbLink, $sAvatar);
$sPhoto = mysqli_escape_string($this->rDbLink, $sPhoto);
$this->dbQuery("UPDATE prefix_user SET user_admin = '{$isAdmin}' , user_referal_code = '{$sReferalCode}' , user_settings_timezone = " . ($sTzName ? "'{$sTzName}'" : 'null') . " , user_profile_avatar = '{$sAvatar}', user_profile_foto = '{$sPhoto}' WHERE user_id ='{$aUser['user_id']}'");
$this->dbQuery("UPDATE prefix_user SET user_admin = '{$isAdmin}' , user_referral_code = '{$sReferralCode}' , user_settings_timezone = " . ($sTzName ? "'{$sTzName}'" : 'null') . " , user_profile_avatar = '{$sAvatar}', user_profile_foto = '{$sPhoto}' WHERE user_id ='{$aUser['user_id']}'");
/**
* Удаляем таблицы

3
application/install/data/sql/patch_1.0.3_to_2.0.0.sql
View file

@ -869,3 +869,6 @@ ALTER TABLE `prefix_invite_code`
ALTER TABLE `prefix_invite_use`
ADD PRIMARY KEY (`id`), ADD KEY `type` (`type`), ADD KEY `code_id` (`code_id`), ADD KEY `from_user_id` (`from_user_id`), ADD KEY `to_user_id` (`to_user_id`);
-- 07.03.2015
ALTER TABLE `prefix_user` CHANGE `user_referal_code` `user_referral_code` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;

2
framework

@ -1 +1 @@
Subproject commit 31b4cc4c82732f7029c90955dc0ee6213948d1f3
Subproject commit bafdaa07e0f0a97ee4fe097f70e561efc7087506