GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Work in progress: fixing Poll posting URLs, working on AS input

Browse Source
This commit is contained in:
Brion Vibber 2011-03-10 11:22:08 -08:00
parent b653b2fb64
commit 2567474ddd
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/Poll/PollPlugin.php
View File

@ -124,8 +124,11 @@ class PollPlugin extends MicroAppPlugin
function onRouterInitialized($m) function onRouterInitialized($m)
{ {
$m->connect('main/poll/new', $m->connect('main/poll/new',
array('action' => 'newpoll'), array('action' => 'newpoll'));
array('id' => '[0-9]+'));
$m->connect('main/poll/:id',
array('action' => 'showpoll'),
array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
$m->connect('main/poll/:id/respond', $m->connect('main/poll/:id/respond',
array('action' => 'respondpoll'), array('action' => 'respondpoll'),
@ -190,6 +193,32 @@ class PollPlugin extends MicroAppPlugin
function saveNoticeFromActivity($activity, $profile, $options=array()) function saveNoticeFromActivity($activity, $profile, $options=array())
{ {
// @fixme // @fixme
common_log(LOG_DEBUG, "XXX activity: " . var_export($activity, true));
common_log(LOG_DEBUG, "XXX options: " . var_export($options, true));
// Ok for now, we can grab stuff from the XML entry directly.
// This won't work when reading from JSON source
if ($activity->entry) {
$elements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'data');
if ($elements->length) {
$data = $elements->item(0);
$question = $data->getAttribute('question');
$opts = array();
foreach ($data->attributes as $node) {
$name = $node->nodeName;
if (substr($name, 0, 6) == 'option') {
$n = intval(substr($name, 6));
if ($n > 0) {
$opts[$n - 1] = $node->nodeValue;
}
}
}
common_log(LOG_DEBUG, "YYY question: $question");
common_log(LOG_DEBUG, "YYY opts: " . var_export($opts, true));
} else {
common_log(LOG_DEBUG, "YYY no poll data");
}
}
} }
function activityObjectFromNotice($notice) function activityObjectFromNotice($notice)