From c4a3487f0cee6391419fd73f2f89f074731a064c Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Mon, 9 Nov 2015 20:29:36 -0800
Subject: remove the obsolete avatar_img function (gravatar/libravatar lookup)

---
 include/network.php | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index c67c019ef..65599bd05 100644
--- a/include/network.php
+++ b/include/network.php
@@ -526,28 +526,6 @@ function allowed_email($email) {
 
 
 
-function avatar_img($email) {
-
-	$avatar = array();
-	$a = get_app();
-
-	$avatar['size'] = 300;
-	$avatar['email'] = $email;
-	$avatar['url'] = '';
-	$avatar['success'] = false;
-
-	call_hooks('avatar_lookup', $avatar);
-
-	if (! $avatar['success'])
-		$avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo();
-
-	logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
-
-	return $avatar['url'];
-}
-
-
-
 function parse_xml_string($s,$strict = true) {
 	if($strict) {
 		if(! strstr($s,'<?xml'))
-- 
cgit v1.2.3


From fabf7081d39481bb22ee27c4beaf96e5529168eb Mon Sep 17 00:00:00 2001
From: ken restivo <ken@restivo.org>
Date: Fri, 20 Nov 2015 18:56:41 -0800
Subject: Use http_status() instead of homegrowing it. Adapt http_status to
 handle replies with data.

---
 include/network.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index 65599bd05..026f5ee0a 100644
--- a/include/network.php
+++ b/include/network.php
@@ -320,17 +320,18 @@ function xml_status($st, $message = '') {
 	killme();
 }
 
+
+
 /**
- * @brief Send HTTP status header and exit.
+ * @brief Send HTTP status header 
  *
  * @param int $val
  *    integer HTTP status result value
  * @param string $msg
  *    optional message
- * @returns (does not return, process is terminated)
+ * @returns nil
  */
-function http_status_exit($val, $msg = '') {
-
+function http_status($val, $msg = '') {
 	if ($val >= 400)
 		$msg = (($msg) ? $msg : 'Error');
 	if ($val >= 200 && $val < 300)
@@ -338,10 +339,26 @@ function http_status_exit($val, $msg = '') {
 
 	logger('http_status_exit ' . $val . ' ' . $msg);	
 	header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
+}
+
+
+
+/**
+ * @brief Send HTTP status header and exit.
+ *
+ * @param int $val
+ *    integer HTTP status result value
+ * @param string $msg
+ *    optional message
+ * @returns (does not return, process is terminated)
+ */
+function http_status_exit($val, $msg = '') {
+	http_status($val, $msg);
 	killme();
 }
 
 
+
 // convert an XML document to a normalised, case-corrected array
 // used by webfinger
 
-- 
cgit v1.2.3