Author: bshaffer
Date: 2010-02-14 21:19:30 +0100 (Sun, 14 Feb 2010)
New Revision: 28026
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/sfAppSecurityTask.class.php
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
Log:
misc updates, multiline formatting fix
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
2010-02-14 20:09:15 UTC (rev 28025)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppGroupSecurityTask.class.php
2010-02-14 20:19:30 UTC (rev 28026)
@@ -35,7 +35,6 @@
$maxModule = 6;
$maxAction = 6;
$maxHasAccess = 10;
- $maxCredentials = 150;
$this->initializeSecurityTaskExtra();
$this->bootstrapSymfony($arguments['application'], $options['env'], true);
@@ -111,7 +110,7 @@
$this->log(sprintf($item['has_access'] ? $formatRow1:$formatRow2,
$this->formatter->format($count == 0 ? $group :
'',$this->labelFormat),
$item['module'], $item['action'],
$item['has_access_string'],
-
$this->formatMultilineCredentials($item['credential_string'], $maxCredentials,
$maxGroup+$maxModule+$maxAction+$maxHasAccess+4)));
+
$this->formatMultilineCredentials($item['credential_string'],
$this->maxCredentials, $maxGroup+$maxModule+$maxAction+$maxHasAccess+4)));
$count++;
}
}
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
2010-02-14 20:09:15 UTC (rev 28025)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppRouteSecurityTask.class.php
2010-02-14 20:19:30 UTC (rev 28026)
@@ -30,7 +30,6 @@
{
$maxName = 4;
$maxIsSecure = 9;
- $maxCredentials = 150;
$this->initializeSecurityTaskExtra();
@@ -97,7 +96,7 @@
{
$this->log(sprintf($policy['is_secure'] ? $formatRow1 : $formatRow2,
$name, $policy['is_secure_string'],
-
$this->formatMultilineCredentials($policy['credential_string'],
$maxCredentials, $maxName+$maxIsSecure+2)));
+
$this->formatMultilineCredentials($policy['credential_string'],
$this->maxCredentials, $maxName+$maxIsSecure+2)));
}
}
}
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppSecurityTask.class.php
2010-02-14 20:09:15 UTC (rev 28025)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppSecurityTask.class.php
2010-02-14 20:19:30 UTC (rev 28026)
@@ -26,7 +26,6 @@
$maxModule = 6;
$maxAction = 6;
$maxIsSecure = 9;
- $maxCredentials = 150;
$this->initializeSecurityTaskExtra();
@@ -63,7 +62,10 @@
{
if (!$arguments['module'] || $arguments['module'] == $item['module'])
{
- $this->log(sprintf($item['is_secure'] ? $formatRow1:$formatRow2,
$item['module'], $item['action'],
$this->formats[$item['is_secure']?'yes':'no'],
$this->formatMultilineCredentials($item['credential_string'], $maxCredentials,
$maxModule+$maxAction+$maxIsSecure+3)));
+ $this->log(sprintf($item['is_secure'] ? $formatRow1:$formatRow2,
+ $item['module'], $item['action'],
+ $this->formats[$item['is_secure']?'yes':'no'],
+
$this->formatMultilineCredentials($item['credential_string'],
$this->maxCredentials, $maxModule+$maxAction+$maxIsSecure+3)));
}
}
}
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
2010-02-14 20:09:15 UTC (rev 28025)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfAppUserSecurityTask.class.php
2010-02-14 20:19:30 UTC (rev 28026)
@@ -35,7 +35,6 @@
$maxModule = 6;
$maxAction = 6;
$maxHasAccess = 10;
- $maxCredentials = 150;
$this->initializeSecurityTaskExtra();
@@ -114,7 +113,7 @@
$this->log(sprintf($item['has_access'] ? $formatRow1:$formatRow2,
$this->formatter->format($count == 0 ? $name:'',
$this->labelFormat),
$item['module'], $item['action'],
$item['has_access_string'],
-
$this->formatMultilineCredentials($item['credential_string'], $maxCredentials,
$maxUsername+$maxModule+$maxAction+$maxHasAccess+4)
+
$this->formatMultilineCredentials($item['credential_string'],
$this->maxCredentials, $maxUsername+$maxModule+$maxAction+$maxHasAccess+4)
));
$count++;
}
Modified:
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
===================================================================
---
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
2010-02-14 20:09:15 UTC (rev 28025)
+++
plugins/csSecurityTaskExtraPlugin/branches/1.3/lib/task/sfBaseSecurityTaskExtraTask.class.php
2010-02-14 20:19:30 UTC (rev 28026)
@@ -2,7 +2,8 @@
abstract class sfBaseSecurityTaskExtraTask extends sfBaseTask
{
- protected $labelFormat = array('fg' => 'white', 'bold' => true);
+ protected $labelFormat = array('fg' => 'white', 'bold' => true),
+ $maxCredentials = 130;
protected function initializeSecurityTaskExtra()
{
@@ -148,7 +149,9 @@
{
$line = substr($credentials, 0, $maxCredentials);
$split = max(strrpos($line, $this->formats['left_parenthesis']),
- strrpos($line, $this->formats['right_parenthesis']) +
strlen($this->formats['right_parenthesis']));
+ (strrpos($line, $this->formats['right_parenthesis']) !==
false) ?
+ strrpos($line, $this->formats['right_parenthesis']) +
strlen($this->formats['right_parenthesis']) : 0);
+
if ($split == 0)
{
$split = max(strrpos($line, $this->formats['and']) +
strlen($this->formats['and']),
--
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.
