Author: chabotc
Date: Fri May 9 06:45:20 2008
New Revision: 654813
URL: http://svn.apache.org/viewvc?rev=654813&view=rev
Log:
Missing new config function and require of zend framework cleanup
Modified:
incubator/shindig/trunk/php/config.php
incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php
Modified: incubator/shindig/trunk/php/config.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/config.php?rev=654813&r1=654812&r2=654813&view=diff
==============================================================================
--- incubator/shindig/trunk/php/config.php (original)
+++ incubator/shindig/trunk/php/config.php Fri May 9 06:45:20 2008
@@ -39,7 +39,7 @@
// The data handlers for the social data, this is a list of class names
// seperated by a , For example:
- //'handlers' => 'PartuzaHandler',
+ // 'handlers' => 'PartuzaHandler',
// if the value is empty, the defaults used in the example above will
be used.
'handlers' => '',
@@ -101,4 +101,14 @@
throw new ConfigException("Invalid Config Key");
}
}
+
+ static function set($key, $val)
+ {
+ global $shindigConfig;
+ if (isset($shindigConfig[$key])) {
+ $shindigConfig[$key] = $val;
+ } else {
+ throw new ConfigException("Invalid Config Key");
+ }
+ }
}
Modified: incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php?rev=654813&r1=654812&r2=654813&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php Fri May 9
06:45:20 2008
@@ -60,10 +60,10 @@
//header("HTTP/1.1 $status", true);
if ($status == 200) {
$output = '';
- if ($_GET['contentType'] == 'FEED') {
+ if (isset($_GET['contentType']) && $_GET['contentType']
== 'FEED') {
// We are including this library manually
because the autoload doesnt work with
// this, its filename doesnt match with the
class name.
- require 'src/common/Zend/Feed.php';
+ require 'Zend/Feed.php';
$numEntries = $_GET['numEntries'];
$getSummaries = $_GET['getSummaries'];
$channel = array();