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');