Changeset 9826

Timestamp:

Jan 1, 2009, 12:06:33 AM (14 years ago)

Author:

ebihara

Message:

#3265,#3264:changed MemberConfigAccessBlock? to display errors

File:

• OpenPNE3/trunk/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php (modified) (2 diffs)

OpenPNE3/trunk/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php

@@ -33 +33 @@
     }
 
-    $memberIds = array_merge($this->blockedId, $value);
-    foreach ($memberIds as $memberId)
+    foreach ($value as $memberId)
     {
       $relation = MemberRelationshipPeer::retrieveByFromAndTo($this->member->getId(), $memberId);
       if (!$relation)
       {
-        if (!MemberPeer::retrieveByPK($memberId))
-        {
-          continue;
-        }
-
         $relation = new MemberRelationship();
         $relation->setMemberIdFrom($this->member->getId());
@@ -61 +55 @@
     {
       $this->setDefault($name, $this->blockedId);
+
+      $this->mergePostValidator(new sfValidatorCallback(array(
+        'callback'  => array('MemberConfigAccessBlockForm', 'validate'),
+        'arguments' => array('ids' => $this->blockedId),
+      )));
     }
 
     return $result;
   }
+
+  public static function validate($validator, $values, $arguments = array())
+  {
+    $result = array();
+
+    $memberIds = array_merge($arguments['ids'], $values['access_block']);
+
+    if (in_array(sfContext::getInstance()->getUser()->getMemberId(), $memberIds))
+    {
+      throw new sfValidatorError($validator, 'invalid');
+    }
+
+    foreach ($memberIds as $memberId)
+    {
+      if (!$memberId)
+      {
+        continue;
+      }
+
+      if (!MemberPeer::retrieveByPK($memberId))
+      {
+        throw new sfValidatorError($validator, 'invalid');
+      }
+
+      $result[] = $memberId;
+    }
+
+    $values['access_block'] = $result;
+    return $values;
+  }
 }