poll even if contact hasn't responded recently, so we can update the termination...

diff --git a/include/conversation.php b/include/conversation.php
index 68693bb9fcd49be6b18a9f79d0a3e3a519a5808d..1d5a92284ac217240ef4f2f088b7378190a07704 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -173,8 +173,8 @@ function localize_item(&$item){
                                $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
                }
        }
+       // add zrl's to public images
        if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
-logger('matched');
                foreach($matches as $mtch) {
                                $item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5]  . '[/img][/url]',$item['body']);
                }

diff --git a/include/onepoll.php b/include/onepoll.php
index 447881ab71715423dd81fa409ce202d9d917f024..804a166c80858c6a076de1755cabcbb41509aac6 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -54,9 +54,7 @@ function onepoll_run($argv, $argc){
                logger('onepoll: no contact');
                return;
        }
-
-       if(was_recently_delayed($contact_id))
-               return;
+       
 
        $d = datetime_convert();
 
@@ -87,7 +85,7 @@ function onepoll_run($argv, $argc){
        }
 
        $contact = $contacts[0];
-
+       logger('onepoll: ' . $contact['id'] . ' ' . $contact['name'], LOGGER_DEBUG);
 
        $xml = false;