Changeset 10840

Timestamp:

Feb 24, 2009, 3:41:44 PM (13 years ago)

Author:

ShogoKawahara

Message:

#3661:added rpc_relay.html as the web asset

Location:

OpenPNE3/plugins/opOpenSocialPlugin/trunk

Files:

• apps/pc_backend/modules/opOpenSocialPlugin/templates/containerConfigSuccess.php (modified) (1 diff)
• apps/pc_frontend/modules/application/actions/components.class.php (modified) (1 diff)
• apps/pc_frontend/modules/application/templates/_gadget.php (modified) (1 diff)
• lib/user/opOpenSocialContainerConfig.class.php (modified) (1 diff)
• web/js/rpc_relay.html (added)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_backend/modules/opOpenSocialPlugin/templates/containerConfigSuccess.php

@@ -4 +4 @@
 
 <h2><?php echo __('OpenSocialコンテナの設定') ?></h2>
+
+<p>※OpenSocialコンテナURLは、スラッシュで終らせてください。</p>
 
 <form action="<?php echo url_for('opOpenSocialPlugin/containerConfig') ?>" method="post">

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/components.class.php

@@ -91 +91 @@
     if ($isUseOuterShindig)
     {
-      $this->iframeUrl = SnsConfigPeer::get('shindig_url').'/gadgets/ifr?'.http_build_query($getParams).'#rpctoken='.rand(0,getrandmax());
+      $this->iframeUrl = SnsConfigPeer::get('shindig_url').'gadgets/ifr?'.http_build_query($getParams).'#rpctoken='.rand(0,getrandmax());
     }
     else

OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/_gadget.php

@@ -20 +20 @@
 if ($scrolling)
 {
-  echo "on";
+  echo "yes";
 }
 else
 {
-  echo "off";
+  echo "no";
 }
-?>" height="<?php echo ($height) ?>" frameborder="no" src="<?php echo $iframeUrl ?>" class="gadgets-gadget" name="remote_iframe_<?php echo $mid ?>" id="remote_iframe_<?php echo $mid ?>"></iframe>
+?>" height="<?php echo ($height) ?>" frameborder="no" src="<?php echo $sf_data->getRaw('iframeUrl') ?>" class="gadgets-gadget" name="remote_iframe_<?php echo $mid ?>" id="remote_iframe_<?php echo $mid ?>"></iframe>
 </div>
 </div></div>

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/user/opOpenSocialContainerConfig.class.php

@@ -135 +135 @@
         ),
         'rpc' => array(
-          'parentRelayUrl' => 'http://',
+          'parentRelayUrl' => '#sns_url#opOpenSocialPlugin/js/rpc_relay.html',
           'useLegacyProtocol' => false
         ),