Changeset 12378

Timestamp:

Jul 24, 2009, 11:23:39 AM (14 years ago)

Author:

ShogoKawahara

Message:

#4160:fixed opValidatorNextUri::doClean() to reject outside url

File:

• OpenPNE3/trunk/lib/validator/opValidatorNextUri.class.php (modified) (2 diffs)

OpenPNE3/trunk/lib/validator/opValidatorNextUri.class.php

@@ -22 +22 @@
     parent::configure($options, $messages);
     $this->setOption('required', false);
+    $this->setOption('trim', true);
     $this->setOption('empty_value', '@homepage');
+    $this->addOption('logout_uri', 'member/logout');
   }
 
@@ -30 +32 @@
   protected function doClean($value)
   {
+    $clean = parent::doClean($value);
+
     $routing = sfContext::getInstance()->getRouting();
-    $routeInfo = $routing->findRoute($value);
 
-    if (sfConfig::get('sf_login_module') === $routeInfo['parameters']['module']
-      && sfConfig::get('sf_login_action') === $routeInfo['parameters']['action'])
+    $routeInfo = $routing->findRoute($clean);
+    if ($routeInfo)
     {
-      return '@homepage';
+      $module = $routeInfo['parameters']['module'];
+      $action = $routeInfo['parameters']['action'];
+    }
+    else
+    {
+      return $this->getOption('empty_value');
     }
 
-    return $value;
+    if ($this->getOption('logout_uri'))
+    {
+      $logoutRouteInfo = $routing->findRoute($this->getOption('logout_uri'));
+      $logoutModule = $logoutRouteInfo['parameters']['module'];
+      $logoutAction = $logoutRouteInfo['parameters']['action'];
+      if ($logoutModule === $module &&  $logoutAction === $action)
+      {
+        return $this->getOption('empty_value');
+      }
+    }
+
+    if (sfConfig::get('sf_login_module') === $module && sfConfig::get('sf_login_action') === $action)
+    {
+      return $this->getOption('empty_value');
+    }
+
+    return $clean;
   }
 }