You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ch...@apache.org on 2009/02/15 22:02:33 UTC
svn commit: r744754 - in /incubator/shindig/trunk/php/src:
common/UrlGenerator.php gadgets/MetadataHandler.php
gadgets/render/GadgetHtmlRenderer.php
Author: chabotc
Date: Sun Feb 15 21:02:32 2009
New Revision: 744754
URL: http://svn.apache.org/viewvc?rev=744754&view=rev
Log:
Re-enabled the iframe generation for the metadata service
Removed:
incubator/shindig/trunk/php/src/common/UrlGenerator.php
Modified:
incubator/shindig/trunk/php/src/gadgets/MetadataHandler.php
incubator/shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php
Modified: incubator/shindig/trunk/php/src/gadgets/MetadataHandler.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/MetadataHandler.php?rev=744754&r1=744753&r2=744754&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/MetadataHandler.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/MetadataHandler.php Sun Feb 15 21:02:32 2009
@@ -37,14 +37,25 @@
return $response;
}
+ private function getIframeURL(Gadget $gadget, GadgetContext $context) {
+ $v = $gadget->getChecksum();
+ $view = $gadget->getView($context->getView());
+ $up = '';
+ foreach ($gadget->gadgetSpec->userPrefs as $pref) {
+ $up .= '&up_' . urlencode($pref['name']) . '=' . urlencode($pref['value']);
+ }
+ $locale = $context->getLocale();
+ //Note: putting the URL last, else some browsers seem to get confused (reported by hi5)
+ return Config::get('default_iframe_prefix') . 'container=' . $context->getContainer() . ($context->getIgnoreCache() ? '&nocache=1' : '&v=' . $v) . ($context->getModuleId() != 0 ? '&mid=' . $context->getModuleId() : '') . '&lang=' . $locale['lang'] . '&country=' . $locale['country'] . '&view=' . $view['view'] . $up . '&url=' . urlencode($context->getUrl());
+ }
+
+
private function makeResponse($gadget, $gadgetModuleId, $gadgetUrl, $context) {
$response = array();
-
$prefs = array();
foreach ($gadget->gadgetSpec->userPrefs as $pref) {
$prefs[$pref['name']] = $pref;
}
-
$views = array();
foreach ($gadget->gadgetSpec->views as $name => $view) {
// we want to include all information, except for the content
@@ -53,8 +64,6 @@
}
$oauth = array();
-
- //FIXME missing from the spec parsing still
/*
$oauthspec = $gadget->getOAuthSpec();
if (! empty($oauthspec)) {
@@ -64,14 +73,11 @@
}
*/
- //FIXME UrlGenerator needs fixin' still
- //$response['iframeUrl'] = UrlGenerator::getIframeURL($gadget, $context);
-
+ $response['iframeUrl'] = $this->getIframeURL($gadget, $context);
$response['features'] = $gadget->features;
$response['links'] = $gadget->gadgetSpec->links;
$response['icons'] = $gadget->gadgetSpec->icon;
$response['views'] = $views;
-
$response['author'] = $gadget->getAuthor();
$response['authorEmail'] = $gadget->getAuthorEmail();
$response['description'] = $gadget->getDescription();
@@ -94,10 +100,8 @@
$response['singleton'] = $gadget->getSingleton();
$response['scaling'] = $gadget->getScaling();
$response['scrolling'] = $gadget->getScrolling();
-
$response['moduleId'] = $gadgetModuleId;
$response['url'] = $gadgetUrl;
-
$response['userPrefs'] = $prefs;
$response['oauth'] = $oauth;
return $response;
Modified: incubator/shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php?rev=744754&r1=744753&r2=744754&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php Sun Feb 15 21:02:32 2009
@@ -29,7 +29,6 @@
class GadgetHtmlRenderer extends GadgetRenderer {
public function renderGadget(Gadget $gadget, $view) {
-
// Was a privacy policy header configured? if so set it
if (Config::get('P3P') != '') {
header("P3P: " . Config::get('P3P'));