Changeset 10530

Timestamp:

Jan 27, 2009, 10:59:25 PM (11 years ago)

Author:

ShogoKawahara

Message:

#3500:added 030_security.yml of fixtures to set the security token

Location:

OpenPNE3/plugins/opOpenSocialPlugin/trunk

Files:

• apps/pc_backend/modules/opOpenSocialPlugin/lib/ApplicationConfigForm.class.php (modified) (4 diffs)
• data/fixtures/010_navigation.yml (modified) (1 diff)
• data/fixtures/030_security.yml (added)
• lib/vendor/Shindig/config/local.php (modified) (2 diffs)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_backend/modules/opOpenSocialPlugin/lib/ApplicationConfigForm.class.php

@@ -28 +28 @@
       'is_view_profile_application' => new sfWidgetFormInputCheckbox(),
       'home_application_limit'      => new sfWidgetFormInput(),
-      'application_token_max_age'   => new sfWidgetFormInput(),
-      'application_cache_time'      => new sfWidgetFormInput(),
+      'shindig_token_cipher_key'    => new sfWidgetFormInput(),
+      'shindig_token_hmac_key'      => new sfWidgetFormInput(),
+      'shindig_token_max_age'       => new sfWidgetFormInput(),
+      'shindig_cache_time'          => new sfWidgetFormInput(),
     ));
 
@@ -36 +38 @@
       'is_view_profile_application' => new sfValidatorBoolean(),
       'home_application_limit'      => new sfValidatorInteger(array('min' => 0)),
-      'application_token_max_age'   => new sfValidatorInteger(array('min' => 0)),
-      'application_cache_time'      => new sfValidatorInteger(array('min' => 0)),
+      'shindig_token_cipher_key'    => new sfValidatorString(),
+      'shindig_token_hmac_key'      => new sfValidatorString(),
+      'shindig_token_max_age'       => new sfValidatorInteger(array('min' => 0)),
+      'shindig_cache_time'          => new sfValidatorInteger(array('min' => 0)),
     ));
 
@@ -44 +48 @@
       'is_view_profile_application' => $is_view_profile_application,
       'home_application_limit'      => SnsConfigPeer::get('home_application_limit', 3),
-      'application_token_max_age'   => SnsConfigPeer::get('application_max_token_age', 60*60),
-      'application_cache_time'      => SnsConfigPeer::get('application_cache_time', 24*60*60),
+      'shindig_token_cipher_key'    => SnsConfigPeer::get('shindig_token_cipher_key'),
+      'shindig_token_hmac_key'      => SnsConfigPeer::get('shindig_token_hmac_key'),
+      'shindig_token_max_age'       => SnsConfigPeer::get('shindig_max_token_age', 60*60),
+      'shindig_cache_time'          => SnsConfigPeer::get('shindig_cache_time', 24*60*60),
     ));
 
@@ -52 +58 @@
       'is_view_profile_application' => 'プロフィール画面にアプリを表示する',
       'home_application_limit'      => 'ホーム・プロフィール画面のアプリ表示上限',
-      'application_token_max_age'   => 'トークン有効期限(秒)',
-      'application_cache_time'      => 'キャッシュ有効期限(秒)',
+      'shindig_token_cipher_key'    => 'トークン暗号化キー',
+      'shindig_token_hmac_key'      => 'トークンハッシュ化キー',
+      'shindig_token_max_age'   => 'トークン有効期限(秒)',
+      'shindig_cache_time'      => 'キャッシュ有効期限(秒)',
     ));
     $this->widgetSchema->setNameFormat('application_config[%s]');

OpenPNE3/plugins/opOpenSocialPlugin/trunk/data/fixtures/010_navigation.yml

@@ -11 +11 @@
 
 NavigationI18n:
-  default_navigation_application_i18n:
+  default_navigation_application_i18n_en:
+    id: default_navigation_application
+    caption: "Applications"
+    culture: "en"
+  default_navigation_application_i18n_ja:
     id: default_navigation_application
     caption: "アプリケーション"
     culture: "ja_JP"
-
-  friend_navigation_application_i18n:
+  friend_navigation_application_i18n_en:
+    id: friend_navigation_application
+    caption: "Applications"
+    culture: "en"
+  friend_navigation_application_i18n_ja:
     id: friend_navigation_application
     caption: "アプリケーション"

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/vendor/Shindig/config/local.php

@@ -7 +7 @@
   'default_js_prefix' => $webprefix.'/gadgets/js/',
   'default_iframe_prefix' => $webprefix.'/gadgets/ifr?',
-  'token_max_age' => SnsConfigPeer::get('application_token_max_age', 60*60),
+
+  'token_cipher_key' => SnsConfigPeer::get('shindig_token_cipher_key'),
+  'token_hmac_key' => SnsConfigPeer::get('shindig_token_hmac_key'),
+  'token_max_age' => SnsConfigPeer::get('shindig_token_max_age', 60*60),
   
   'base_path'      => realpath(dirname(__FILE__).'/..').'/',
@@ -26 +29 @@
   'messages_service' => 'opJsonDbOpensocialService',
 
-  'cache_time' => SnsConfigPeer::get('application_cache_time', 60*60),
+  'cache_time' => SnsConfigPeer::get('shindig_cache_time', 60*60),
   'cache_root' => sfConfig::get('sf_app_cache_dir').'/plugins/opOpenSocialPlugin',