no more url in cmdline
This commit is contained in:
parent
ce515ac2e8
commit
facca43e2d
Binary file not shown.
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1,015 B |
|
@ -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);
|
||||
|
||||
|
|
|
@ -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()");
|
||||
|
||||
|
|
|
@ -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'])) {
|
||||
|
|
|
@ -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']);
|
||||
|
|
|
@ -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' );
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue