PSR2

modules/expirycheck/lib/Auth/Process/ExpiryDate.php

@@ -25,8 +25,8 @@ namespace SimpleSAML\Module\expirycheck\Auth\Process;
 class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
 {
     private $warndaysbefore = 0;
-	private $netid_attr = NULL;
-	private $expirydate_attr = NULL;
+    private $netid_attr = null;
+    private $expirydate_attr = null;
     private $date_format = 'd.m.Y';
 
 
@@ -36,7 +36,8 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
      * @param array $config  Configuration information about this filter.
      * @param mixed $reserved  For future use.
      */
-	public function __construct($config, $reserved) {
+    public function __construct($config, $reserved)
+    {
         parent::__construct($config, $reserved);
 
         assert(is_array($config));
@@ -77,7 +78,8 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
      * @return bool
      *
      */
-	public function shWarning(&$state, $expireOnDate, $warndaysbefore) {
+    public function shWarning(&$state, $expireOnDate, $warndaysbefore)
+    {
         $now = time();
         $end = $expireOnDate;
 
@@ -97,7 +99,8 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
      *  @return bool
      *
      */
-	public function checkDate($expireOnDate) {
+    public function checkDate($expireOnDate)
+    {
         $now = time();
         $end = $expireOnDate;
 
@@ -106,7 +109,6 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
         } else {
             return false;
         }
-
     }
 
     /**
@@ -114,22 +116,22 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
      *
      * @param array &$state  The current state.
      */
-	public function process(&$state) {
+    public function process(&$state)
+    {
         /*
          * UTC format: 20090527080352Z
          */
         $netId = $state['Attributes'][$this->netid_attr][0];
         $expireOnDate = strtotime($state['Attributes'][$this->expirydate_attr][0]);
 
-		if (self::shWarning($state, $expireOnDate, $this->warndaysbefore)) {
+        if ($this->shWarning($state, $expireOnDate, $this->warndaysbefore)) {
             assert(is_array($state));
-			if (isset($state['isPassive']) && $state['isPassive'] === TRUE) {
+            if (isset($state['isPassive']) && $state['isPassive'] === true) {
                 // We have a passive request. Skip the warning.
                 return;
             }
 
-			\SimpleSAML\Logger::warning('expirycheck: NetID ' . $netId .
-			                           ' is about to expire!');
+            \SimpleSAML\Logger::warning('expirycheck: NetID '.$netId.' is about to expire!');
 
             // Save state and redirect
             $state['expireOnDate'] = date($this->date_format, $expireOnDate);
@@ -139,7 +141,7 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
             \SimpleSAML\Utils\HTTP::redirectTrustedURL($url, array('StateId' => $id));
         }
 
-		if (!self::checkDate($expireOnDate)) {
+        if (!$this->checkDate($expireOnDate)) {
             \SimpleSAML\Logger::error('expirycheck: NetID '.$netId.
                 ' has expired ['.date($this->date_format, $expireOnDate).']. Access denied!');
 
@@ -149,9 +151,6 @@ class ExpiryDate extends \SimpleSAML\Auth\ProcessingFilter
             $id = \SimpleSAML\Auth\State::saveState($state, 'expirywarning:expired');
             $url = \SimpleSAML\Module::getModuleURL('expirycheck/expired.php');
             \SimpleSAML\Utils\HTTP::redirectTrustedURL($url, array('StateId' => $id));
-
         }
     }
-
-
 }