diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_notify.php | 3 | ||||
| -rw-r--r-- | mod/item.php | 7 | ||||
| -rw-r--r-- | mod/message.php | 6 | ||||
| -rw-r--r-- | mod/photos.php | 5 |
4 files changed, 8 insertions, 13 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 911d7f02c..be0de36e0 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -169,10 +169,9 @@ function dfrn_notify_post(&$a) { intval($posted_id) ); - $url = $a->get_baseurl(); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"comment-import\" \"$posted_id\" &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", array(),$foo)); if(($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { diff --git a/mod/item.php b/mod/item.php index 7efb3db9e..bd0358ea6 100644 --- a/mod/item.php +++ b/mod/item.php @@ -238,10 +238,10 @@ function item_post(&$a) { ); } } - $url = $a->get_baseurl(); + $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"$notify_type\" \"$post_id\" &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &", array(),$foo)); goaway($a->get_baseurl() . "/" . $_POST['return'] ); @@ -307,13 +307,12 @@ function item_content(&$a) { // ignore the result } - $url = $a->get_baseurl(); $drop_id = intval($item['id']); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); // send the notification upstream/downstream as the case may be - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"drop\" \"$drop_id\" &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(),$foo)); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); diff --git a/mod/message.php b/mod/message.php index 0f55412bb..b8236641a 100644 --- a/mod/message.php +++ b/mod/message.php @@ -67,11 +67,10 @@ function message_post(&$a) { if(count($r)) $post_id = $r[0]['id']; - $url = $a->get_baseurl(); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); if($post_id) { - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"mail\" \"$post_id\" &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo)); notice( t('Message sent.') . EOL ); } @@ -134,11 +133,10 @@ function message_content(&$a) { } if(($a->argc > 2) && ($a->argv[1] == 'redeliver') && intval($a->argv[2])) { - $url = $a->get_baseurl(); $post_id = intval($a->argv[2]); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"mail\" \"$post_id\" &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo)); goaway($a->get_baseurl() . '/message' ); } diff --git a/mod/photos.php b/mod/photos.php index 8936649b7..3f8607575 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -122,14 +122,13 @@ function photos_post(&$a) { intval($_SESSION['uid']) ); - $url = $a->get_baseurl(); $drop_id = intval($rr['id']); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); // send the notification upstream/downstream as the case may be if($rr['visible']) - proc_close(proc_open("\"php_path\" \"include/notifier.php\" \"$url\" \"drop\" \"$drop_id\" & ", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", array(),$foo)); } @@ -166,7 +165,7 @@ function photos_post(&$a) { // send the notification upstream/downstream as the case may be if($i[0]['visible']) - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$url\" \"drop\" \"$drop_id\" & ", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", array(),$foo)); } } |