Changeset 12228

Timestamp:

Jul 11, 2009, 7:11:15 PM (14 years ago)

Author:

ebihara

Message:

#3970:メンバーのメール投稿アドレスにハッシュを含められるようにした

Location:

OpenPNE3/trunk

Files:

• config/OpenPNE.yml.sample (modified) (2 diffs)
• config/ProjectConfiguration.class.php.sample (modified) (1 diff)
• lib/helper/opUtilHelper.php (modified) (1 diff)
• lib/model/doctrine/Member.class.php (modified) (1 diff)
• lib/model/doctrine/MemberImage.class.php (modified) (1 diff)
• lib/routing/opMailRoute.class.php (modified) (1 diff)

OpenPNE3/trunk/config/OpenPNE.yml.sample

@@ -17 +17 @@
 
 # メール投稿アドレスにメンバー毎にユニークなハッシュを含める
-# Contain an individual hash to an e-mail address that is used for posting something to the SNS
-is_mail_address_contain_hash: false
+# Contain an individual hash for an e-mail address that is used to post something to the SNS
+is_mail_address_contain_hash: true
+
+# メール投稿アドレスのハッシュの長さ
+# Length of hash for an e-mail address for posting
+mail_address_hash_length: 12
 
 
@@ -31 +35 @@
   options:
 
+
 ######################################
 # プロキシ (Proxy)

OpenPNE3/trunk/config/ProjectConfiguration.class.php.sample

@@ -4 +4 @@
 sfCoreAutoload::register();
 
-define('OPENPNE_CONFIGURAIOTN_SAMPLE_HASH', '64b6863a70e4a74930c6c00e140d61f7');
+define('OPENPNE_CONFIGURAIOTN_SAMPLE_HASH', 'ffc9f45bbeb1cb8832c211b87f225c8d');
 
 class ProjectConfiguration extends sfProjectConfiguration

OpenPNE3/trunk/lib/helper/opUtilHelper.php

@@ -553 +553 @@
   $files = array_merge(array(sfConfig::get('sf_apps_dir').$configPath), $configuration->globEnablePlugin('/apps'.$configPath));
 
+  $user = sfContext::getInstance()->getUser();
+
+  if (sfConfig::get('op_is_mail_address_contain_hash') && $user->hasCredential('SNSMember'))
+  {
+    $params['hash'] = $user->getMember()->getMailAddressHash();
+  }
+
   $routing = new opMailRouting(new sfEventDispatcher());
   $config = new sfRoutingConfigHandler();

OpenPNE3/trunk/lib/model/doctrine/Member.class.php

@@ -265 +265 @@
     return parent::delete($conn);
   }
+
+  public function getMailAddressHash($length = null)
+  {
+    if (is_null($length))
+    {
+      $length = sfConfig::get('op_mail_address_hash_length', 12);
+    }
+
+    $hash = $this->getConfig('mail_address_hash');
+    if (!$hash)
+    {
+      $hash = md5(strval($this->id).$this->getConfig('password'));
+    }
+
+    return substr($hash, 0, (int)$length);
+  }
 }

OpenPNE3/trunk/lib/model/doctrine/MemberImage.class.php

@@ -18 +18 @@
     }
 
-    $primaryImage = $this->Member->Image;
+    $primaryImage = $this->Member->MemberImage;
     if ($primaryImage)
     {

OpenPNE3/trunk/lib/routing/opMailRoute.class.php

@@ -28 +28 @@
       {
         $this->member = $config->getMember();
+        if (isset($this->requirements['hash']))
+        {
+          $hash = $this->member->getMailAddressHash();
+          if (!isset($this->parameters['hash']) || $hash !== $this->parameters['hash'])
+          {
+            $this->member = null;
+          }
+        }
       }
     }