Author: david
Date: Mon Sep 28 16:55:02 2009
New Revision: 3576
Log:
Copy security forwarding actions from sfBasicSecurityFilter.
Modified:
trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
Modified: trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Mon Sep 28 16:49:06
2009 (r3575)
+++ trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Mon Sep 28 16:55:02
2009 (r3576)
@@ -66,21 +66,21 @@
$hasAccess = self::allowAccess($user, $aco, $actionId, $options);
break;
- // Allow to *any* user that is logged in, or if action is "read"
+ // Allow to *any* user that is logged in, or if action is "read"
case 'QubitActor':
case 'QubitRepository':
$hasAccess = (null != $user || QubitAclAction::READ_ID == $actionId);
break;
- // Administrator or editor
+ // Administrator or editor
case 'QubitTerm':
$hasAccess = $user->hasGroup(array(
- QubitAclGroup::ADMINISTRATOR_ID,
- QubitAclGroup::EDITOR_ID
+ QubitAclGroup::ADMINISTRATOR_ID,
+ QubitAclGroup::EDITOR_ID
));
break;
- // Administrator only
+ // Administrator only
case 'QubitUser':
case 'QubitMenu':
case 'QubitStaticPage':
@@ -327,7 +327,7 @@
foreach ($repositories as $repository)
{
$options['parameters'] = array('repositoryId' => $repository->id);
- if (self::DENY == self::check($informationObject, $actionId, $options))
+ if (!self::check($informationObject, $actionId, $options))
{
$deniedRepositories[] = $repository->id;
}
@@ -340,4 +340,35 @@
return $deniedRepositories;
}
+
+
+ /**
+ * Forwards the current request to the secure action.
+ *
+ * Copied from sfBasicSecurityFilter
+ *
+ * @see lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php
+ * @throws sfStopException
+ */
+ public static function forwardToSecureAction()
+ {
+
sfContext::getInstance()->getController()->forward(sfConfig::get('sf_secure_module'),
sfConfig::get('sf_secure_action'));
+
+ throw new sfStopException();
+ }
+
+ /**
+ * Forwards the current request to the login action.
+ *
+ * Copied from sfBasicSecurityFilter
+ *
+ * @see lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php
+ * @throws sfStopException
+ */
+ public static function forwardToLoginAction()
+ {
+
sfContext::getInstance()->getController()->forward(sfConfig::get('sf_login_module'),
sfConfig::get('sf_login_action'));
+
+ throw new sfStopException();
+ }
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
