preliminary network abstraction, configurable debugging.

6 files changed, 23 insertions, 12 deletions

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f2fadee8c..d82f80df8 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -234,8 +234,10 @@ function dfrn_notify_post(&$a) {
 
 					if($datarray['type'] == 'remote-comment') {
 						$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+						$proc_debug = get_config('system','proc_debug');
 
-						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", 
+
+						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" $proc_debug &", 
 							array(),$foo));
 
 						if(($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
diff --git a/mod/item.php b/mod/item.php
index c98d77331..922a407ef 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -226,8 +226,9 @@ function item_post(&$a) {
 	}
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	$proc_debug = get_config('system','proc_debug');
 
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
+	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" $proc_debug &",
 		array(),$foo));
 
 	goaway($a->get_baseurl() . "/" . $_POST['return'] );
@@ -314,10 +315,12 @@ function item_content(&$a) {
 			}
 			$drop_id = intval($item['id']);
 			$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+			$proc_debug = get_config('system','proc_debug');
+
 			
 			// send the notification upstream/downstream as the case may be
 
-			proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &",
+			proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" $proc_debug &",
 				array(), $foo));
 
 			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
diff --git a/mod/like.php b/mod/like.php
index 2ee887241..10a466b50 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -96,8 +96,9 @@ function like_content(&$a) {
 		);
 
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+		$proc_debug = get_config('system','proc_debug');
 
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
+		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" $proc_debug &",
 			array(),$foo));
 		return;
 	}
@@ -163,8 +164,9 @@ EOT;
 
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	$proc_debug = get_config('system','proc_debug');
 
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
+	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" $proc_debug &",
 		array(),$foo));
 
 	return; // NOTREACHED
diff --git a/mod/message.php b/mod/message.php
index 7406ef178..a16b0d8cf 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -68,9 +68,11 @@ function message_post(&$a) {
 		$post_id = $r[0]['id'];
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	$proc_debug = get_config('system','proc_debug');
+notice("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &");
 	
 	if($post_id) {
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
+		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &",
 			array(),$foo));
 		notice( t('Message sent.') . EOL );
 	}
@@ -136,8 +138,10 @@ function message_content(&$a) {
 	if(($a->argc > 2) && ($a->argv[1] == 'redeliver') && intval($a->argv[2])) {
 		$post_id = intval($a->argv[2]);
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+		$proc_debug = get_config('system','proc_debug');
 
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
+
+		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug & ",
 			array(),$foo));
 		goaway($a->get_baseurl() . '/message' );
 	}
diff --git a/mod/photos.php b/mod/photos.php
index a807c926c..705c76200 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -125,11 +125,12 @@ function photos_post(&$a) {
 
 					$drop_id = intval($rr['id']);
 					$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+					$proc_debug = get_config('system','proc_debug');
 
 					// send the notification upstream/downstream as the case may be
 
 					if($rr['visible'])
-						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
+						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" $proc_debug & ",
 							array(),$foo));
 
 				}
@@ -165,10 +166,12 @@ function photos_post(&$a) {
 				$drop_id = intval($i[0]['id']);
 				$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 				
+				$proc_debug = get_config('system','proc_debug']);
+
 				// send the notification upstream/downstream as the case may be
 
 				if($i[0]['visible'])
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
+					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" $proc_debug & ",
 						array(),$foo));
 			}
 		}
diff --git a/mod/profile.php b/mod/profile.php
index 7abc0e166..8c23b6c57 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -77,9 +77,6 @@ function profile_init(&$a) {
 function profile_content(&$a, $update = 0) {
 
 
-	file_put_contents('uid.log',"{$_SERVER['QUERY_STRING']} ". session_id() . "\n", FILE_APPEND);
-
-
 	require_once("include/bbcode.php");
 	require_once('include/security.php');