6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.0.1 | 2009-07-07

Browse Source
This commit is contained in:
6543
2019-07-17 22:10:53 +02:00
parent b484e522e8
commit 2c1152f0d3
19 changed files with 179 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/users/controllers/ProfilegeneralController.php
View File

@ -188,7 +188,7 @@ class Users_ProfilegeneralController extends Monkeys_Controller_Action
public function deleteAction()
{
$mail = self::getMail();
$mail->setFrom('support@community-id.org');
$mail->setFrom($this->_config->email->supportemail);
$mail->addTo($this->_config->email->supportemail);
$mail->setSubject('Community-ID user deletion');

19
modules/users/controllers/RegisterController.php
View File

@ -118,7 +118,7 @@ class Users_RegisterController extends Monkeys_Controller_Action
$users = new Users();
if ($this->_request->getParam('token') == ''
|| !($user = $users->getUserWithToken($this->_request->getParam('token')))) {
$this->_helper->FlashMessenger->addMessage('Invalid token');
$this->_helper->FlashMessenger->addMessage($this->view->translate('Invalid token'));
$this->_redirect('');
}
@ -142,22 +142,25 @@ class Users_RegisterController extends Monkeys_Controller_Action
public function declineeulaAction()
{
$users = new Users();
if (!($user = $users->getUserWithToken($this->_request->getParam('token'))) || $this->_request->getParam('token') == '') {
if ($this->_request->getParam('token') == ''
|| !($user = $users->getUserWithToken($this->_request->getParam('token')))) {
Zend_Registry::get('logger')->log('invalid token', Zend_Log::DEBUG);
$this->_helper->FlashMessenger->addMessage('Invalid token');
$this->_helper->FlashMessenger->addMessage($this->view->translate('Invalid token'));
$this->_redirect('');
}
$user->delete();
$this->_helper->FlashMessenger->addMessage('Your account has been deleted');
$this->_helper->FlashMessenger->addMessage($this->view->translate('Your account has been deleted'));
$this->_redirect('');
}
public function accepteulaAction()
{
$users = new Users();
if (!($user = $users->getUserWithToken($this->_request->getParam('token'))) || $this->_request->getParam('token') == '') {
$this->_helper->FlashMessenger->addMessage('Invalid token');
if ($this->_request->getParam('token') == ''
|| !($user = $users->getUserWithToken($this->_request->getParam('token')))) {
$this->_helper->FlashMessenger->addMessage($this->view->translate('Invalid token'));
$this->_redirect('');
}
@ -216,9 +219,9 @@ class Users_RegisterController extends Monkeys_Controller_Action
Zend_Mail::setDefaultTransport(new Zend_Mail_Transport_Sendmail());
}
$mail = new Zend_Mail();
$mail = new Zend_Mail('UTF-8');
$mail->setBodyText($emailTemplate);
$mail->setFrom('support@community-id.org');
$mail->setFrom($this->_config->email->supportemail);
$mail->addTo($user->email);
$mail->setSubject($this->view->translate('Community-ID registration confirmation'));

2
modules/users/controllers/UserslistController.php
View File

@ -38,7 +38,7 @@ class Users_UserslistController extends Monkeys_Controller_Action
$jsonObj = new StdClass();
$jsonObj->recordsReturned = count($usersRows);
$jsonObj->totalRecords = $users->getNumUsers($where);
$jsonObj->totalRecords = $users->getNumUsers();
$jsonObj->totalUnconfirmedUsers = $users->getNumUnconfirmedUsers();
$jsonObj->startIndex = $_GET['startIndex'];
$jsonObj->sort = $this->_getParam('sort');