Author: bshaffer
Date: 2010-02-12 17:34:55 +0100 (Fri, 12 Feb 2010)
New Revision: 27956
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
Log:
bootstraps symfony in order to take advantage of security config handlers.
replaces deprecated "ereg"
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
2010-02-12 16:29:35 UTC (rev 27955)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
2010-02-12 16:34:55 UTC (rev 27956)
@@ -30,6 +30,8 @@
protected function execute($arguments = array(), $options = array())
{
+ $this->bootstrapSymfony($arguments['application'], $options['env'], true);
+
$databaseManager = new sfDatabaseManager($this->configuration);
$connection = $databaseManager->getDatabase('doctrine')->getConnection();
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
2010-02-12 16:29:35 UTC (rev 27955)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
2010-02-12 16:34:55 UTC (rev 27956)
@@ -27,6 +27,8 @@
*/
protected function execute($arguments = array(), $options = array())
{
+ $this->bootstrapSymfony($arguments['application'], $options['env'], true);
+
$this->routes = $this->getRouting()->getRoutes();
$this->security = $this->getSecurityByModuleAction();
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
2010-02-12 16:29:35 UTC (rev 27955)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
2010-02-12 16:34:55 UTC (rev 27956)
@@ -30,6 +30,8 @@
protected function execute($arguments = array(), $options = array())
{
+ $this->bootstrapSymfony($arguments['application'], $options['env'], true);
+
$databaseManager = new sfDatabaseManager($this->configuration);
$connection = $databaseManager->getDatabase('doctrine')->getConnection();
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
2010-02-12 16:29:35 UTC (rev 27955)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
2010-02-12 16:34:55 UTC (rev 27956)
@@ -44,7 +44,7 @@
$security = array('global-defaut' => $this->appSecurity);
foreach ($files as $policy_file) {
- ereg("^".sfConfig::get('sf_app_dir')."/modules/([^/]+)/", $policy_file,
$matches);
+ preg_match("#^".sfConfig::get('sf_app_dir')."/modules/([^/]+)/#",
$policy_file, $matches);
$policy = $this->loadModuleSecurity($matches[1]);
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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.com/group/symfony-svn?hl=en.
