diff options
| author | friendica <info@friendica.com> | 2013-02-13 00:14:01 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-13 00:14:01 -0800 |
| commit | d1e5337c72a358acd94f5e5aa53f96ce05abd6c5 (patch) | |
| tree | 5fb332591fd14df7a9953c5dfa80c034574b9bfd /include | |
| parent | 02c636ed23ffde0b6423c2676cacc7ed88dc45de (diff) | |
| download | volse-hubzilla-d1e5337c72a358acd94f5e5aa53f96ce05abd6c5.tar.gz volse-hubzilla-d1e5337c72a358acd94f5e5aa53f96ce05abd6c5.tar.bz2 volse-hubzilla-d1e5337c72a358acd94f5e5aa53f96ce05abd6c5.zip | |
recursion and typo in rmagic with zid
Diffstat (limited to 'include')
| -rw-r--r-- | include/enotify.php | 35 | ||||
| -rw-r--r-- | include/zot.php | 4 |
2 files changed, 0 insertions, 39 deletions
diff --git a/include/enotify.php b/include/enotify.php index 2441bc3b0..32f4cc2e7 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -341,41 +341,6 @@ function notification($params) { logger('notification: sending notification email'); - $id_for_parent = "${params['parent']}@${hostname}"; - - // Is this the first email notification for this parent item and user? - - $r = q("select `id` from `notify-threads` where `master-parent-item` = %d and `receiver-uid` = %d limit 1", - intval($params['parent']), - intval($datarray['uid']) ); - - // If so, create the record of it and use a message-id smtp header. - - if(!$r) { - logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . -intval($params['uid']), LOGGER_DEBUG); - $r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`) - values(%d,%d,%d,%d)", - intval($notify_id), - intval($params['parent']), - intval($params['uid']), - 0 ); - - $additional_mail_header .= "Message-ID: <${id_for_parent}>\n"; - $log_msg = "include/enotify: No previous notification found for this parent:\n" . - " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; - logger($log_msg, LOGGER_DEBUG); - } - - // If not, just "follow" the thread. - - else { - $additional_mail_header = "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n"; - logger("include/enotify: There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); - } - - - $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", $body))),ENT_QUOTES,'UTF-8')); $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), diff --git a/include/zot.php b/include/zot.php index 39983f712..51b04e1ef 100644 --- a/include/zot.php +++ b/include/zot.php @@ -49,10 +49,6 @@ function zot_get_hubloc($arr,$primary = false) { function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_key = null) { - -// FIXME json encode all params -// build the packet externally so that here we really are doing just a zot of the packet. - $params = array( 'type' => $type, 'sender' => json_encode(array( |