import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -1,14 +1,5 @@
|
||||
<?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
|
||||
*/
|
||||
|
||||
abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
{
|
||||
/**
|
||||
@ -18,20 +9,30 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
protected $targetUser;
|
||||
|
||||
protected $_config;
|
||||
protected $_settings;
|
||||
protected $_numCols = 2;
|
||||
protected $_title = '';
|
||||
protected $underMaintenance = false;
|
||||
|
||||
public function init()
|
||||
{
|
||||
$this->_config = Zend_Registry::get('config');
|
||||
$this->_settings = new Model_Settings();
|
||||
|
||||
if ($this->_request->getModuleName() != 'install'
|
||||
&& strtoupper(get_class($this)) != 'ERRORCONTROLLER'
|
||||
&& $this->_needsUpgrade()) {
|
||||
$this->_redirect('/install/upgrade');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Zend_Registry::isRegistered('user')) {
|
||||
// guest user
|
||||
$users = new Users();
|
||||
$users = new Users_Model_Users();
|
||||
$user = $users->createRow();
|
||||
Zend_Registry::set('user', $user);
|
||||
}
|
||||
|
||||
$this->_config = Zend_Registry::get('config');
|
||||
|
||||
$this->user = Zend_Registry::get('user');
|
||||
$this->view->user = $this->user;
|
||||
|
||||
@ -45,6 +46,18 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
$this->_setBase();
|
||||
$this->view->numCols = $this->_numCols;
|
||||
|
||||
$this->view->module = $this->getRequest()->getModuleName();
|
||||
|
||||
if ($this->_getParam('subtitle')) {
|
||||
$this->view->pageSubtitle = $this->view->escape($this->_getParam('subtitle'));
|
||||
}
|
||||
|
||||
if ($this->getRequest()->getParam('next')) {
|
||||
$this->view->nextAction = $this->getRequest()->getParam('next');
|
||||
} else {
|
||||
$this->view->nextAction = '';
|
||||
}
|
||||
|
||||
if ($this->getRequest()->isXmlHttpRequest()) {
|
||||
$slowdown = $this->_config->environment->ajax_slowdown;
|
||||
if ($slowdown > 0) {
|
||||
@ -52,13 +65,20 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
}
|
||||
$this->_helper->layout->disableLayout();
|
||||
} else {
|
||||
$this->view->version = Setup::VERSION;
|
||||
$this->view->version = Application::VERSION;
|
||||
$this->view->messages = $this->_helper->FlashMessenger->getMessages();
|
||||
$this->view->loaderCombine = $this->_config->environment->YDN? 'true' : 'false';
|
||||
$this->view->loaderBase = $this->_config->environment->YDN?
|
||||
'http://yui.yahooapis.com/2.6.0/build/'
|
||||
'http://yui.yahooapis.com/2.7.0/build/'
|
||||
: $this->view->base . '/javascript/yui/';
|
||||
}
|
||||
|
||||
$this->view->min = $this->_config->environment->production ? '-min' : '';
|
||||
}
|
||||
|
||||
public function postDispatch()
|
||||
{
|
||||
$this->view->title = $this->_title;
|
||||
}
|
||||
|
||||
private function _setScriptPaths()
|
||||
@ -75,43 +95,29 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
$view->addScriptPath($newPath);
|
||||
}
|
||||
|
||||
private function _setBase()
|
||||
protected function _setBase()
|
||||
{
|
||||
if ($this->_config->subdomain->enabled) {
|
||||
$protocol = $this->_getProtocol();
|
||||
|
||||
$this->view->base = "$protocol://"
|
||||
. ($this->_config->subdomain->use_www? 'www.' : '')
|
||||
. $this->_config->subdomain->hostname;
|
||||
} else {
|
||||
$this->view->base = $this->view->getBase();
|
||||
}
|
||||
$this->view->base = $this->view->getBase();
|
||||
}
|
||||
|
||||
private function _validateTargetUser()
|
||||
{
|
||||
if (Zend_Registry::isRegistered('targetUser')) {
|
||||
// used by unit tests to inject the target user
|
||||
$this->targetUser = Zend_Registry::get('targetUser');
|
||||
} else {
|
||||
$userId = $this->_getParam('userid');
|
||||
protected abstract function _validateTargetUser();
|
||||
|
||||
if (is_null($userId)) {
|
||||
$this->targetUser = $this->user;
|
||||
} elseif ($this->_getParam('userid') == 0) {
|
||||
$users = new Users();
|
||||
$this->targetUser = $users->createRow();
|
||||
} else {
|
||||
if ($userId != $this->user->id && $this->user->role != User::ROLE_ADMIN) {
|
||||
$this->_helper->FlashMessenger->addMessage('Error: Invalid user id');
|
||||
$this->_redirect('profile/edit');
|
||||
}
|
||||
$users = new Users();
|
||||
$this->targetUser = $users->getRowInstance($userId);
|
||||
}
|
||||
protected function _needsUpgrade()
|
||||
{
|
||||
require 'setup/versions.php';
|
||||
|
||||
$lastVersion = array_pop($versions);
|
||||
|
||||
return $lastVersion != $this->_getDbVersion();
|
||||
}
|
||||
|
||||
protected function _getDbVersion()
|
||||
{
|
||||
if (!$version = $this->_settings->getVersion()) {
|
||||
$version = '1.0.1';
|
||||
}
|
||||
|
||||
$this->view->targetUser = $this->targetUser;
|
||||
return $version;
|
||||
}
|
||||
|
||||
protected function _checkMaintenanceMode()
|
||||
@ -122,20 +128,10 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
return;
|
||||
}
|
||||
|
||||
$settings = new Settings();
|
||||
$this->underMaintenance = $settings->isMaintenanceMode();
|
||||
$this->underMaintenance = $this->_settings->isMaintenanceMode();
|
||||
$this->view->underMaintenance = $this->underMaintenance;
|
||||
}
|
||||
|
||||
protected function _redirectToNormalConnection()
|
||||
{
|
||||
if ($this->_config->SSL->enable_mixed_mode) {
|
||||
$this->_redirect('http://' . $_SERVER['HTTP_HOST'] . $this->view->base);
|
||||
} else {
|
||||
$this->_redirect('');
|
||||
}
|
||||
}
|
||||
|
||||
protected function _redirectForMaintenance($backToNormalConnection = false)
|
||||
{
|
||||
if ($backToNormalConnection) {
|
||||
@ -152,7 +148,7 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
return parent::_redirect($url, $options);
|
||||
}
|
||||
|
||||
protected function _getProtocol()
|
||||
public function getProtocol()
|
||||
{
|
||||
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
|
||||
return 'https';
|
||||
@ -160,4 +156,16 @@ abstract class Monkeys_Controller_Action extends Zend_Controller_Action
|
||||
return 'http';
|
||||
}
|
||||
}
|
||||
|
||||
protected function _checkPermission($permission)
|
||||
{
|
||||
if (!$this->_hasPermission($permission)) {
|
||||
throw new Monkeys_AccessDeniedException();
|
||||
}
|
||||
}
|
||||
|
||||
protected function _overrideNumCols($numCols)
|
||||
{
|
||||
$this->view->numCols = $this->_numCols = $numCols;
|
||||
}
|
||||
}
|
||||
|
@ -1,14 +1,5 @@
|
||||
<?
|
||||
|
||||
/*
|
||||
* @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
|
||||
*/
|
||||
|
||||
abstract class Monkeys_Controller_Error extends Monkeys_Controller_Action
|
||||
{
|
||||
protected $_numCols = 1;
|
||||
@ -115,4 +106,8 @@ EOD;
|
||||
|
||||
return $mail;
|
||||
}
|
||||
|
||||
protected function _validateTargetUser()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@ -1,14 +1,5 @@
|
||||
<?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 Monkeys_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
|
||||
{
|
||||
private $_acl;
|
||||
@ -18,6 +9,10 @@ class Monkeys_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
|
||||
$this->_acl = $acl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Here we only check for the basic action access permissions.
|
||||
* In Monkeys_Controller_Action we check for more specific permissions
|
||||
*/
|
||||
public function preDispatch($request)
|
||||
{
|
||||
if (!Zend_Registry::get('config')->environment->installed
|
||||
@ -36,7 +31,7 @@ class Monkeys_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
|
||||
$user= Zend_Registry::get('user');
|
||||
} else {
|
||||
$auth = Zend_Auth::getInstance();
|
||||
$users = new Users();
|
||||
$users = new Users_Model_Users();
|
||||
if ($auth->hasIdentity()) {
|
||||
$user = $auth->getStorage()->read();
|
||||
$user->init();
|
||||
@ -59,7 +54,7 @@ class Monkeys_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
|
||||
}
|
||||
|
||||
// if an admin is not allowed for this action, then the action doesn't exist
|
||||
if (!$this->_acl->isAllowed(User::ROLE_ADMIN, $resource, $request->getActionName())) {
|
||||
if (!$this->_acl->isAllowed(Users_Model_User::ROLE_ADMIN, $resource, $request->getActionName())) {
|
||||
//echo "role: " . $user->role . " - resource: $resource - privilege: " . $request->getActionName() . "<br>\n";
|
||||
throw new Monkeys_BadUrlException($this->getRequest()->getRequestUri());
|
||||
}
|
||||
|
Reference in New Issue
Block a user