Totally tacky...

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index cbdd11eb976eecf590eeee067db7a527f7cdc158..c2487435e49e172f6a246726c602029486336e6b 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -460,11 +460,7 @@ function item_post(&$a) {
                // NOTREACHED
        }
 
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-       logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
-
-       proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
+       proc_run('php', "include/notifier.php", $notify_type, "$post_id");
 
        $datarray['id'] = $post_id;
 
@@ -496,10 +492,17 @@ function item_post(&$a) {
                }
        }
 
-       if((x($_POST,'return')) && strlen($_POST['return']))
+       logger('post_complete');
+       if((x($_POST,'return')) && strlen($_POST['return'])) {
+               logger('return: ' . $_POST['return']);
                goaway($a->get_baseurl() . "/" . $_POST['return'] );
-
+       }
        $json = array('success' => 1);
+       if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
+               $json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];
+
+       logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
+
        echo json_encode($json);
        killme();
        // NOTREACHED
@@ -588,12 +591,10 @@ function item_content(&$a) {
                                }       
                        }
                        $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\" \"drop\" \"$drop_id\" &", array(), $foo));
-                       proc_run($php_path,"include/notifier.php","drop","$drop_id");
+                       proc_run('php',"include/notifier.php","drop","$drop_id");
 
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                        //NOTREACHED