diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/queue.php | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index b1bcf5108..90fdf9c1c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -90,7 +90,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p else $selected = ''; - $trimmed = mb_substr($rr['name'],0,22); + $trimmed = mb_substr($rr['name'],0,20); $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n"; } diff --git a/include/queue.php b/include/queue.php index d4fc7dbd6..ff280cb53 100644 --- a/include/queue.php +++ b/include/queue.php @@ -97,7 +97,7 @@ function queue_run($argv, $argc){ $deliver_status = 0; switch($contact['network']) { - case 'dfrn': + case NETWORK_DFRN: logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$data); @@ -109,7 +109,7 @@ function queue_run($argv, $argc){ remove_queue_item($q_item['id']); } break; - default: + case NETWORK_OSTATUS: if($contact['notify']) { logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$data); @@ -120,6 +120,18 @@ function queue_run($argv, $argc){ remove_queue_item($q_item['id']); } break; + default: + $a = get_app(); + $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false); + call_hooks('queue_deliver', $a, $params); + + if($params['result']) + remove_queue_item($q_item['id']); + else + update_queue_time($q_item['id']); + + break; + } } |