no more url in cmdline

diff --git a/images/camera-icon.gif b/images/camera-icon.gif
index 83c7124a8bd794512fde0aa4ac475c42868fc7e2..a4adf9adfa18e3072f6ced0499ce5364e0950e9c 100644 (file)
Binary files a/images/camera-icon.gif and b/images/camera-icon.gif differ

diff --git a/include/notifier.php b/include/notifier.php
index 36ff27054ffecea8e26f7f73d29f6c82bc1bfa7a..dcc772454780ae4fc28d3778c0551ef75831e180 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,6 +1,7 @@
 <?php
 
-print_r($argv);
+$debugging = false;
+
 require_once("boot.php");
 
 $a = new App;
@@ -13,19 +14,21 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
 require_once("session.php");
 require_once("datetime.php");
 
-if($argc < 3)
+if($argc < 2)
        exit;
-dbg(3);
+
+       $a->set_baseurl(get_config('system',url'));
+
        $baseurl = $argv[1];
        $a->set_baseurl($argv[1]);
 
-       $cmd = $argv[2];
+       $cmd = $argv[1];
 
        switch($cmd) {
 
                case 'mail':
                default:
-                       $item_id = intval($argv[3]);
+                       $item_id = intval($argv[2]);
                        if(! $item_id)
                                killme();
                        break;
@@ -233,7 +236,10 @@ dbg(3);
                }
        }
        $atom .= "</feed>\r\n";
-echo $atom;
+
+       if($debugging)
+               echo $atom;
+
        // create a clone of this feed but with comments disabled to send to those who can't respond. 
 
        $atom_nowrite = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
@@ -265,7 +271,10 @@ echo $atom;
                $url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id'];
 
                $xml = fetch_url($url);
-echo $xml;
+
+               if($debugging)
+                       echo $xml;
+
                if(! $xml)
                        continue;
 
@@ -302,7 +311,9 @@ echo $xml;
                }
 
                $xml = post_url($rr['notify'],$postvars);
-echo $xml;
+
+               if($debugging)
+                       echo $xml;
 
                $res = simplexml_load_string($xml);
 

diff --git a/include/poller.php b/include/poller.php
index 0ef4d126afe447a338be39303f271a9dd379234e..e946dabf6096f4c1bae325ba68db9e44ba3a54d0 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -15,10 +15,9 @@ require_once('datetime.php');
 require_once('simplepie/simplepie.inc');
 require_once('include/items.php');
 
-if($argc < 2)
-       exit;
-dbg(3);
-       $a->set_baseurl($argv[1]);
+
+
+       $a->set_baseurl(get_config('system','url'));
 
        $contacts = q("SELECT * FROM `contact` WHERE `dfrn-id` != '' AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 911d7f02c60541c1d3fbc72b78f01582d097347c..be0de36e06d49f529c8d1be6f6a85b8734e6761f 100644 (file)
--- 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 7efb3db9e461203178e4f6f8680e51242ed908f3..bd0358ea6c8b847874dfcad92bd1fa1b85ad7b76 100644 (file)
--- 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 0f55412bb65785b7491951dc7ee0d7c29e7cfaf2..b8236641a9c749a765fee383aba4c5d7db925896 100644 (file)
--- 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 8936649b705999d4f8747e2007ca44f5bb05749c..3f860757507d5099bf9ef06a6af3117b603ebe95 100644 (file)
--- 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));
                        }
                }