import v1.0.1 | 2009-07-07
This commit is contained in:
@ -102,7 +102,7 @@ Feedback:
|
||||
$feedback
|
||||
EOD
|
||||
);
|
||||
$mail->setFrom('support@community-id.org');
|
||||
$mail->setFrom($this->_config->email->supportemail);
|
||||
$mail->addTo($configEmail->supportemail);
|
||||
$mail->setSubject('Community-ID feedback form');
|
||||
|
||||
|
@ -122,7 +122,7 @@ class MessageusersController extends Monkeys_Controller_Action
|
||||
}
|
||||
|
||||
$mail = new Zend_Mail('UTF-8');
|
||||
$mail->setFrom('support@community-id.org');
|
||||
$mail->setFrom($this->_config->email->supportemail);
|
||||
|
||||
return $mail;
|
||||
}
|
||||
|
@ -116,6 +116,10 @@ class OpenidController extends Monkeys_Controller_Action
|
||||
|
||||
private function _proceed()
|
||||
{
|
||||
if ($this->user->role == User::ROLE_GUEST) {
|
||||
throw new Monkeys_AccessDeniedException();
|
||||
}
|
||||
|
||||
// needed for unit tests
|
||||
$this->_helper->layout->disableLayout();
|
||||
$this->_helper->viewRenderer->setNeverRender(true);
|
||||
@ -156,6 +160,11 @@ class OpenidController extends Monkeys_Controller_Action
|
||||
}
|
||||
private function _saveHistory(Zend_OpenId_Provider $server, $result)
|
||||
{
|
||||
// only log if user exists
|
||||
if ($this->user->role == User::ROLE_GUEST) {
|
||||
return;
|
||||
}
|
||||
|
||||
$histories = new Histories();
|
||||
$history = $histories->createRow();
|
||||
$history->user_id = $this->user->id;
|
||||
|
@ -19,6 +19,9 @@ class ErrorMessages
|
||||
{
|
||||
translate('Value is empty, but a non-empty value is required');
|
||||
translate('\'%value%\' is not a valid email address in the basic format local-part@hostname');
|
||||
translate('\'%hostname%\' is not a valid hostname for email address \'%value%\'');
|
||||
translate('\'%value%\' appears to be a DNS hostname but cannot match TLD against known list');
|
||||
translate('\'%value%\' appears to be a local network name but local network names are not allowed');
|
||||
translate('Captcha value is wrong');
|
||||
translate('Password confirmation does not match');
|
||||
}
|
||||
|
22
modules/default/views/scripts/about/index-sv.phtml
Normal file
22
modules/default/views/scripts/about/index-sv.phtml
Normal file
@ -0,0 +1,22 @@
|
||||
<p>
|
||||
Community-ID är en tjänst som levereras till dig av Keyboard Monkeys Ltd., Community as a Service ™.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Keyboard Monkeys Ltd. fokuserar på att erbjuda öppen källkodslösningar och -produkter för att stärka nätverkandet på Internet. Vi erbjuder även konsulttjänster för en stor mängd öppen källkodstekniker, speciellt då lösningar och produkter för nätverkande.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Följande tjänster och produkter finns tillgängliga eller under utveckling:
|
||||
<ul>
|
||||
<li>
|
||||
<b><a href="http://sourceforge.net/projects/sciret">Sciret</a></b> - Avancerad kunskapsdatabas/expertsystem
|
||||
</li>
|
||||
<li>
|
||||
<b><a href="http://sourceforge.net/projects/textroller">TextRoller</a></b> - Blog-plattform
|
||||
</li>
|
||||
<li>
|
||||
<b>Community Solutions</b> - Samarbetsplattform för öppen källkods-utveckling (under utveckling)
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
50
modules/default/views/scripts/index/index-sv.phtml
Normal file
50
modules/default/views/scripts/index/index-sv.phtml
Normal file
@ -0,0 +1,50 @@
|
||||
<div id="home">
|
||||
<h2>
|
||||
Community ID: Gratis OpenID-identitet<br />
|
||||
till 100% baserad på öppen källkod
|
||||
</h2>
|
||||
<div class="yui-g">
|
||||
<div class="yui-u first">
|
||||
<p>
|
||||
Redan från början har Community-ID byggts med säkerhet som största ledstjärna. Varje del i vår teknik
|
||||
har valts med tanke på dess säkerhet och viktigast av allt - allting är baserat på öppen källkod.
|
||||
<!--
|
||||
Since its inception Community-ID has been built with security as the foremost concern.
|
||||
Every element in our technology stack has been chosen looking at its security record,
|
||||
and most importantly, everything is Open Source.
|
||||
-->
|
||||
</p>
|
||||
<p>
|
||||
Det betyder att vi är öppna för granskning från hela världen. Det är redan bevisat att säkerhet
|
||||
genom att undanhålla hela eller delar av en produkt inte fungerar, så när du använder en sådan
|
||||
produkt utsätts dina data (och därför ockå du själv) för en stor risk.
|
||||
<!-- This means we're open to scrutiny by the entire world. It is already a proven fact that security by obscurity doesn't work, and when you use a product or service whose underlying mechanism is kept as a secret, you're putting your data (and therefore yourself) into great risk.
|
||||
-->
|
||||
</p>
|
||||
<p style="font-weight: bold; text-align:center">
|
||||
Vad väntar du på?<br />
|
||||
Förenkla livet och minska riskerna.<br /><br />
|
||||
<a href="<?= $this->base ?>/users/register">SKAFFA GRATIS OpenID NU</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="yui-u">
|
||||
<div id="homeNews">
|
||||
<h3>Senaste nytt</h3>
|
||||
<ul>
|
||||
<? foreach ($this->news as $item): ?>
|
||||
<li>
|
||||
<div>
|
||||
<a href="<?= $item->link['href'] ?>"><?= $item->title ?></a>
|
||||
</div>
|
||||
<div class="newsExcerpt">
|
||||
<?= $item->content ?>
|
||||
</div>
|
||||
</li>
|
||||
<? endforeach ?>
|
||||
</ul> <!-- FF bug -->
|
||||
</div>
|
||||
<div class="borderFadingLeft">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
1
modules/default/views/scripts/index/subheader-sv.phtml
Executable file
1
modules/default/views/scripts/index/subheader-sv.phtml
Executable file
@ -0,0 +1 @@
|
||||
<!-- placeholder for home subheader -->
|
@ -187,6 +187,9 @@ class Install_CredentialsController extends Monkeys_Controller_Action
|
||||
if (!is_writable(WEB_DIR . '/captchas')) {
|
||||
$errors[] = $this->view->translate('The directory "captchas" under the web directory for Community-ID must be writable by the web server user (%s)', $webServerUser);
|
||||
}
|
||||
if (!extension_loaded('mysqli')) {
|
||||
$errors[] = $this->view->translate('You need to have the %s extension installed', '<a href="http://www.php.net/manual/en/mysqli.installation.php">MySQLi</a>');
|
||||
}
|
||||
|
||||
return $errors;
|
||||
}
|
||||
|
@ -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');
|
||||
|
||||
|
@ -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'));
|
||||
|
||||
|
@ -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');
|
||||
|
Reference in New Issue
Block a user