make default profile photo configurable - should be functional but ne…

…eds admin ui

include/identity.php

@@ -1109,3 +1109,24 @@ function get_theme_uid() {
 	}
 	return $uid;
 }
+
+/**
+ * @function get_default_profile_photo($size = 175)
+ *   Retrieves the path of the default_profile_photo for this system
+ *   with the specified size.
+ * @param int $size
+ *    one of (175, 80, 48)
+ * @returns string
+ * 
+ */
+
+function get_default_profile_photo($size = 175) {
+	$scheme = get_config('system','default_profile_photo');
+	if(! $scheme)
+		$scheme = 'rainbow_man';
+	return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg';
+}
+
+
+
+

include/network.php

@@ -548,7 +548,7 @@ function avatar_img($email) {
 	call_hooks('avatar_lookup', $avatar);
 
 	if(! $avatar['success'])
-		$avatar['url'] = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg';
+		$avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo();
 
 	logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
 	return $avatar['url'];

include/photo/photo_driver.php

@@ -576,9 +576,9 @@ function import_profile_photo($photo,$xchan) {
 		$photo_failure = true;
 	}
 	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg';
-		$thumb = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/80.jpg';
-		$micro = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/48.jpg';
+		$photo = $a->get_baseurl() . '/' . get_default_profile_photo();
+		$thumb = $a->get_baseurl() . '/' . get_default_profile_photo(80);
+		$micro = $a->get_baseurl() . '/' . get_default_profile_photo(48);
 		$type = 'image/jpeg';
 	}
 

mod/photo.php

@@ -24,7 +24,7 @@ function photo_init(&$a) {
 
 	$observer_xchan = get_observer_hash();
 
-	$default = 'images/default_profile_photos/rainbow_man/175.jpg';
+	$default = get_default_profile_photo();
 
 	if(isset($type)) {
 
@@ -38,11 +38,11 @@ function photo_init(&$a) {
 
 				case 'm':
 					$resolution = 5;
-					$default = 'images/default_profile_photos/rainbow_man/80.jpg';
+					$default = get_default_profile_photo(80);
 					break;
 				case 's':
 					$resolution = 6;
-					$default = 'images/default_profile_photos/rainbow_man/48.jpg';
+					$default = get_default_profile_photo(48);
 					break;
 				case 'l':
 				default:
@@ -135,15 +135,15 @@ function photo_init(&$a) {
 			switch($resolution) {
 
 				case 4:
-					$data = file_get_contents('images/default_profile_photos/rainbow_man/175.jpg');
+					$data = file_get_contents(get_default_profile_photo());
 					$mimetype = 'image/jpeg';
 					break;
 				case 5:
-					$data = file_get_contents('images/default_profile_photos/rainbow_man/80.jpg');
+					$data = file_get_contents(get_default_profile_photo(80));
 					$mimetype = 'image/jpeg';
 					break;
 				case 6:
-					$data = file_get_contents('images/default_profile_photos/rainbow_man/48.jpg');
+					$data = file_get_contents(get_default_profile_photo(48));
 					$mimetype = 'image/jpeg';
 					break;
 				default: