mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Removed old messaging emailing options

Browse Source
This commit is contained in:
Lucas Bartholemy 2014-07-07 16:26:29 +02:00
parent 01f697ce16
commit 87700d1b02
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/modules_core/user/controllers/AccountController.php
View File

@ -216,7 +216,6 @@ class AccountController extends Controller
$user = Yii::app()->user->getModel();
$model = new AccountEmailingForm();
$model->receive_email_messaging = $user->getSetting("receive_email_messaging", 'core', User::RECEIVE_EMAIL_ALWAYS);
$model->receive_email_activities = $user->getSetting("receive_email_activities", 'core', HSetting::Get('receive_email_activities', 'mailing'));
$model->receive_email_notifications = $user->getSetting("receive_email_notifications", 'core', HSetting::Get('receive_email_notifications', 'mailing'));
@ -224,7 +223,6 @@ class AccountController extends Controller
$model->attributes = Yii::app()->input->stripClean($_POST['AccountEmailingForm']);
if ($model->validate()) {
$user->setSetting("receive_email_messaging", $model->receive_email_messaging);
$user->setSetting("receive_email_activities", $model->receive_email_activities);
$user->setSetting("receive_email_notifications", $model->receive_email_notifications);

4
protected/modules_core/user/forms/AccountEmailingForm.php
View File

@ -27,7 +27,6 @@
class AccountEmailingForm extends CFormModel
{
public $receive_email_messaging;
public $receive_email_activities;
public $receive_email_notifications;
@ -37,7 +36,7 @@ class AccountEmailingForm extends CFormModel
public function rules()
{
return array(
array('receive_email_messaging, receive_email_activities, receive_email_notifications', 'in',
array('receive_email_activities, receive_email_notifications', 'in',
'range' => array(
User::RECEIVE_EMAIL_NEVER,
User::RECEIVE_EMAIL_DAILY_SUMMARY,
@ -57,7 +56,6 @@ class AccountEmailingForm extends CFormModel
{
return array(
'receive_email_notifications' => Yii::t('UserModule.base', 'Send notifications?'),
'receive_email_messaging' => Yii::t('UserModule.base', 'Send messages?'),
'receive_email_activities' => Yii::t('UserModule.base', 'Send activities?'),
);
}

11
protected/modules_core/user/views/account/emailing.php
View File

@ -38,17 +38,6 @@
<hr>
<strong><?php echo Yii::t('UserModule.account', 'Private messaging'); ?></strong><br />
<?php echo Yii::t('UserModule.account', 'Get an email, when users write you a private message or reply this.'); ?>
<?php
echo $form->dropDownList($model, 'receive_email_messaging', array(
User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.base', 'Never'),
User::RECEIVE_EMAIL_ALWAYS => Yii::t('UserModule.base', 'Always'),
), array('id' => 'reg_group', 'class' => 'form-control'));
?>
<hr>
<?php echo CHtml::submitButton(Yii::t('base', 'Save'), array('class' => 'btn btn-primary')); ?>
<!-- show flash message after saving -->