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

import v1.1.0_RC2 | 2009-09-20

Browse Source
This commit is contained in:
6543
2019-07-17 22:19:00 +02:00
parent 3b7ba80568
commit 38c146901c
2504 changed files with 101817 additions and 62316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/default/controllers/FeedbackController.php
View File

@ -54,9 +54,9 @@ class FeedbackController extends CommunityID_Controller_Action
try {
$mail->send();
$this->_helper->FlashMessenger->addMessage('Thank you for your interest. Your message has been routed.');
$this->_helper->FlashMessenger->addMessage($this->view->translate('Thank you for your interest. Your message has been routed.'));
} catch (Zend_Mail_Protocol_Exception $e) {
$this->_helper->FlashMessenger->addMessage('Sorry, the feedback couldn\'t be delivered. Please try again later.');
$this->_helper->FlashMessenger->addMessage($this->view->translate('Sorry, the feedback couldn\'t be delivered. Please try again later.'));
if ($this->_config->logging->level == Zend_Log::DEBUG) {
$this->_helper->FlashMessenger->addMessage($e->getMessage());
}
@ -90,7 +90,7 @@ class FeedbackController extends CommunityID_Controller_Action
Zend_Mail::setDefaultTransport(new Zend_Mail_Transport_Sendmail());
}
$mail = new Zend_Mail();
$mail = new Zend_Mail('UTF-8');
$mail->setBodyText(<<<EOD
Dear Administrator,

7
modules/default/controllers/HistoryController.php
View File

@ -11,6 +11,13 @@
class HistoryController extends CommunityID_Controller_Action
{
public function preDispatch()
{
if ($this->user->role == Users_Model_User::ROLE_ADMIN) {
throw new Monkeys_AccessDeniedException();
}
}
public function indexAction()
{
$this->_helper->actionStack('index', 'login', 'users');

2
modules/default/controllers/MessageusersController.php
View File

@ -67,7 +67,7 @@ class MessageusersController extends CommunityID_Controller_Action
$users = new Users_Model_Users();
foreach ($users->getUsers() as $user) {
if ($user->role == ROLE_ADMIN) {
if ($user->role == Users_Model_User::ROLE_ADMIN) {
continue;
}

35
modules/default/controllers/OpenidController.php
View File

@ -21,7 +21,7 @@ class OpenidController extends CommunityID_Controller_Action
if (!$request) {
$this->_helper->viewRenderer->setNeverRender(true);
header('HTTP/1.0 403 Forbidden');
$this->_response->setRawHeader('HTTP/1.0 403 Forbidden');
Zend_Registry::get('logger')->log("OpenIdController::providerAction: FORBIDDEN", Zend_Log::DEBUG);
echo 'Forbidden';
return;
@ -159,7 +159,7 @@ class OpenidController extends CommunityID_Controller_Action
$this->view->policyUrl = false;
// The class Auth_OpenID_SRegRequest is included in the following file
require 'libs/Auth/OpenID/SReg.php';
require_once 'libs/Auth/OpenID/SReg.php';
$sregRequest = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
$props = $sregRequest->allRequestedFields();
@ -203,7 +203,7 @@ class OpenidController extends CommunityID_Controller_Action
$response = $request->answer(true, null, $id);
// The class Auth_OpenID_SRegRequest is included in the following file
require 'libs/Auth/OpenID/SReg.php';
require_once 'libs/Auth/OpenID/SReg.php';
$sregRequest = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
$props = $sregRequest->allRequestedFields();
@ -226,7 +226,7 @@ class OpenidController extends CommunityID_Controller_Action
// not planning on validating stuff here yet, but I call this
// for the date element to be filled properly
$personalInfoForm->isValid($formData);
$foo = $personalInfoForm->isValid($formData);
$sregResponse = Auth_OpenID_SRegResponse::extractResponse($sregRequest,
$personalInfoForm->getUnqualifiedValues());
@ -261,11 +261,15 @@ class OpenidController extends CommunityID_Controller_Action
$webresponse = $server->encodeResponse($response);
foreach ($webresponse->headers as $k => $v) {
header("$k: $v");
if ($k == 'location') {
$this->_response->setRedirect($v);
} else {
$this->_response->setHeader($k, $v);
}
}
header('Connection: close');
echo $webresponse->body;
$this->_response->setHeader('Connection', 'close');
$this->_response->appendBody($webresponse->body);
} elseif ($this->_getParam('deny')) {
if ($this->_getParam('forever')) {
$sites = new Model_Sites();
@ -281,10 +285,7 @@ class OpenidController extends CommunityID_Controller_Action
$this->_saveHistory($request->trust_root, Model_History::DENIED);
header('HTTP/1.1 302 Found');
header('Content-Type: text/plain; charset=us-ascii');
header('Connection: close');
header('Location: ' . $request->getCancelUrl());
return $this->_sendResponse($server, $request->answer(false));
}
}
@ -317,16 +318,20 @@ class OpenidController extends CommunityID_Controller_Action
$webresponse = $server->encodeResponse($response);
if ($webresponse->code != AUTH_OPENID_HTTP_OK) {
header(sprintf("HTTP/1.1 %d ", $webresponse->code), true, $webresponse->code);
$this->_response->setRawHeader(sprintf("HTTP/1.1 %d ", $webresponse->code), true, $webresponse->code);
}
foreach ($webresponse->headers as $k => $v) {
header("$k: $v");
if ($k == 'location') {
$this->_response->setRedirect($v);
} else {
$this->_response->setHeader($k, $v);
}
}
header('Connection: close');
$this->_response->setHeader('Connection', 'close');
echo $webresponse->body;
$this->_response->appendBody($webresponse->body);
}

7
modules/default/controllers/SitesController.php
View File

@ -11,6 +11,13 @@
class SitesController extends CommunityID_Controller_Action
{
public function preDispatch()
{
if ($this->user->role == Users_Model_User::ROLE_ADMIN) {
throw new Monkeys_AccessDeniedException();
}
}
public function indexAction()
{
$this->_helper->actionStack('index', 'login', 'users');

2
modules/default/forms/Feedback.php
View File

@ -48,7 +48,7 @@ class Form_Feedback extends Zend_Form
'captcha' => 'Image',
'sessionClass' => get_class(Zend_Registry::get('appSession')),
'font' => APP_DIR . '/libs/Monkeys/fonts/Verdana.ttf',
'imgDir' => APP_DIR . '/webdir/captchas',
'imgDir' => WEB_DIR . '/captchas',
'imgUrl' => $this->_baseWebDir . '/captchas',
'wordLen' => 4,
'fontSize' => 30,

61
modules/default/forms/FeedbackForm.php
View File

@ -1,61 +0,0 @@
<?php
/*
* @copyright Copyright (C) 2005-2009 Keyboard Monkeys Ltd. http://www.kb-m.com
* @license http://creativecommons.org/licenses/BSD/ BSD License
* @author Keyboard Monkey Ltd
* @since CommunityID 0.9
* @package CommunityID
* @packager Keyboard Monkeys
*/
class FeedbackForm extends Zend_Form
{
private $_baseWebDir;
public function __construct($options = null, $baseWebDir = null)
{
$this->_baseWebDir = $baseWebDir;
parent::__construct($options);
}
public function init()
{
$name = new Monkeys_Form_Element_Text('name');
translate('Enter your name');
$name->setLabel('Enter your name')
->setRequired(true);
$email = new Monkeys_Form_Element_Text('email');
translate('Enter your E-mail');
$email->setLabel('Enter your E-mail')
->addFilter('StringToLower')
->setRequired(true)
->addValidator('EmailAddress');
$feedback = new Monkeys_Form_Element_Textarea('feedback');
translate('Enter your questions or comments');
$feedback->setLabel('Enter your questions or comments')
->setRequired(true)
->setAttrib('cols', 60)
->setAttrib('rows', 4);
// ZF has some bugs when using mutators here, so I have to use the config array
translate('Please enter the text below');
$captcha = new Monkeys_Form_Element_Captcha('captcha', array(
'label' => 'Please enter the text below',
'captcha' => array(
'captcha' => 'Image',
'sessionClass' => get_class(Zend_Registry::get('appSession')),
'font' => APP_DIR . '/libs/Monkeys/fonts/Verdana.ttf',
'imgDir' => APP_DIR . '/webdir/captchas',
'imgUrl' => $this->_baseWebDir . '/captchas',
'wordLen' => 4,
'fontSize' => 30,
'timeout' => 300,
)
));
$this->addElements(array($name, $email, $feedback, $captcha));
}
}

4
modules/default/forms/MessageUsers.php
View File

@ -14,12 +14,12 @@ class Form_MessageUsers extends Zend_Form
public function init()
{
$subject = new Monkeys_Form_Element_Text('subject');
translate('Subject:');
translate('Subject');
$subject->setLabel('Subject')
->setRequired(true);
$cc = new Monkeys_Form_Element_Text('cc');
translate('CC:');
translate('CC');
$cc->setLabel('CC');
$bodyPlain = new Monkeys_Form_Element_Textarea('bodyPlain');

34
modules/default/forms/MessageUsersForm.php
View File

@ -1,34 +0,0 @@
<?php
/*
* @copyright Copyright (C) 2005-2009 Keyboard Monkeys Ltd. http://www.kb-m.com
* @license http://creativecommons.org/licenses/BSD/ BSD License
* @author Keyboard Monkey Ltd
* @since CommunityID 0.9
* @package CommunityID
* @packager Keyboard Monkeys
*/
class MessageUsersForm extends Zend_Form
{
public function init()
{
$subject = new Zend_Form_Element_Text('subject');
translate('Subject:');
$subject->setLabel('Subject:')
->setRequired(true);
$cc = new Zend_Form_Element_Text('cc');
translate('CC:');
$cc->setLabel('CC:');
$bodyPlain = new Zend_Form_Element_Textarea('bodyPlain');
translate('Body:');
$bodyPlain->setLabel('Body:');
$bodyHTML = new Zend_Form_Element_Textarea('bodyHTML');
$bodyHTML->setLabel('Body:');
$this->addElements(array($subject, $cc, $bodyPlain, $bodyHTML));
}
}

28
modules/default/forms/OpenidLoginForm.php
View File

@ -1,28 +0,0 @@
<?php
/*
* @copyright Copyright (C) 2005-2009 Keyboard Monkeys Ltd. http://www.kb-m.com
* @license http://creativecommons.org/licenses/BSD/ BSD License
* @author Keyboard Monkey Ltd
* @since CommunityID 0.9
* @package CommunityID
* @packager Keyboard Monkeys
*/
class OpenIdLoginForm extends Zend_Form
{
public function init()
{
$openIdIdentity = new Zend_Form_Element_Text('openIdIdentity');
translate('Username');
$openIdIdentity->setLabel('Username')
->setRequired(true);
$password = new Zend_Form_Element_Password('password');
translate('Password');
$password->setLabel('Password')
->setRequired(true);
$this->addElements(array($openIdIdentity, $password));
}
}

2
modules/default/models/Field.php
View File

@ -30,7 +30,7 @@ class Model_Field extends Zend_Db_Table_Row_Abstract
break;
case self::TYPE_DATE:
$el = new Monkeys_Form_Element_Date($varname);
$el->addValidator('date')
$el->addValidator('date', false, array('format_type' => 'Y-m-d'))
->setShowEmptyValues(true)
->setStartEndYear(1900, date('Y') - 7)
->setReverseYears(true);

4
modules/default/views/scripts/cid/index.phtml
View File

@ -1,4 +1,4 @@
<h2><?php echo $this->translate('About Community-id') ?></h2>
<h2><?php echo $this->translate('About Community-ID') ?></h2>
<div>
<label><?php echo $this->translate('Version installed:') ?></label>
<?php echo $this->version ?>
@ -12,7 +12,7 @@
<?php foreach ($this->news as $item): ?>
<li>
<div>
<a href="<?php echo $item->link ?>"><?= $item->title ?></a>
<a href="<?php echo $item->link ?>"><?php echo $item->title ?></a>
</div>
<div class="newsExcerpt">
<?php echo $item->content ?>

2
modules/default/views/scripts/identity/id.phtml
View File

@ -1,4 +1,4 @@
<div id="article">
This is the identity page for the Community-ID user identified with:
<?= $this->translate('This is the identity page for the Community-ID user identified with:') ?>
<h2 style="text-align:center"><?php echo $this->idUrl ?></h2>
</div>

2
modules/default/views/scripts/index/index-de.phtml
View File

@ -24,7 +24,7 @@
<?php foreach ($this->news as $item): ?>
<li>
<div>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?= $item->title ?></a>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?php echo $item->title ?></a>
</div>
<div class="newsExcerpt">
<?php echo $item->excerpt ?>

2
modules/default/views/scripts/index/index-en.phtml
View File

@ -24,7 +24,7 @@
<?php foreach ($this->news as $item): ?>
<li>
<div>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?= $item->title ?></a>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?php echo $item->title ?></a>
</div>
<div class="newsExcerpt">
<?php echo $item->excerpt ?>

2
modules/default/views/scripts/index/index-es.phtml
View File

@ -23,7 +23,7 @@
<ul>
<?php foreach ($this->news as $item): ?>
<div>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?= $item->title ?></a>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?php echo $item->title ?></a>
</div>
<div class="newsExcerpt">
<?php echo $item->excerpt ?>

2
modules/default/views/scripts/index/index-sv.phtml
View File

@ -34,7 +34,7 @@
<?php foreach ($this->news as $item): ?>
<li>
<div>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?= $item->title ?></a>
<a href="<?php echo $this->base . '/news/' . $item->id ?>"><?php echo $item->title ?></a>
</div>
<div class="newsExcerpt">
<?php echo $item->excerpt ?>