1126 break up largo byline

functions.php

@@ -166,6 +166,7 @@ private function require_files() {
 			'/inc/open-graph.php',
 			'/inc/verify.php',
 			'/inc/post-tags.php',
+			'/inc/byline_class.php',
 			'/inc/header-footer.php',
 			'/inc/related-content.php',
 			'/inc/featured-content.php',

inc/avatars/functions.php

@@ -4,60 +4,76 @@
  */
 
 // Constants
-define('LARGO_AVATAR_META_NAME', 'largo_avatar');
-define('LARGO_AVATAR_ACTION_NAME', 'largo_avatar_upload');
-define('LARGO_AVATAR_INPUT_NAME', 'largo_user_avatar');
+define( 'LARGO_AVATAR_META_NAME', 'largo_avatar' );
+define( 'LARGO_AVATAR_ACTION_NAME', 'largo_avatar_upload' );
+define( 'LARGO_AVATAR_INPUT_NAME', 'largo_user_avatar' );
 
-if (is_admin())
-	include dirname(__FILE__) . '/admin.php';
+if ( is_admin() )
+	include dirname( __FILE__ ) . '/admin.php';
 
-function largo_get_avatar_filter($avatar, $id_or_email, $size, $default, $alt ) {
-	$image_src = largo_get_avatar_src($id_or_email, $size);
-	if (!empty($image_src))
+function largo_get_avatar_filter( $avatar, $id_or_email, $size, $default, $alt ) {
+	$image_src = largo_get_avatar_src( $id_or_email, $size );
+	if ( ! empty( $image_src ) ) {
 		return '<img src="' . $image_src[0] . '" alt="'. $alt . '" width="' . $size . '" height="' . $size . '" class="avatar avatar-' . $size . ' photo" />';
-	else
+	} else {
 		return $avatar;
+	}
 }
-add_action('get_avatar', 'largo_get_avatar_filter', 1, 5);
+add_action( 'get_avatar', 'largo_get_avatar_filter', 1, 5 );
+
+/**
+ * Get the avatar image HTML for the given user id/email and size
+ *
+ * @param int|string $id_or_email a wordpress user ID or user email address;
+ * @param int $string The size of the avatar
+ */
+function largo_get_avatar_src( $id_or_email, $size ) {
+	// get the user ID;
+	if ( ! is_numeric( $id_or_email ) ) {
+		$user = get_user_by( 'email', $id_or_email );
+		$id = $user->ID;
+	} else {
+		$id = (int) $id_or_email;
+	}
 
-function largo_get_avatar_src($id_or_email, $size) {
-	$avatar_id = largo_get_user_avatar_id($id_or_email);
+	$avatar_id = largo_get_user_avatar_id( $id );
 
-	if (empty($avatar_id))
+	if ( empty( $avatar_id ) ) {
 		return false;
-
+	}
+
 	global $_wp_additional_image_sizes;
 
 	$copy = $_wp_additional_image_sizes;
-	usort($copy, function($a, $b) {
+	usort( $copy, function( $a, $b ) {
 		return $a['width'] - $b['width'];
 	});
 
-	$square_image_sizes = array_filter($copy, function($arg) {
-		return ($arg['width'] / $arg['height']) == 1;
-	});
+	$square_image_sizes = array_filter( $copy, function( $arg ) {
+		return ( $arg['width'] / $arg['height'] ) == 1;
+	} );
 
-	$requested_size = array($size, $size);
+	$requested_size = array( $size, $size );
 
-	foreach ($square_image_sizes as $key => $val) {
-		if (round((float) ($val['width'] / $val['height']), 1, PHP_ROUND_HALF_DOWN) ==
-			round((float) ($requested_size[0] / $requested_size[1]), 1, PHP_ROUND_HALF_DOWN))
+	foreach ( $square_image_sizes as $key => $val ) {
+		if ( round( ( float ) ( $val['width'] / $val['height'] ), 1, PHP_ROUND_HALF_DOWN ) ==
+			round( ( float ) ( $requested_size[0] / $requested_size[1]), 1, PHP_ROUND_HALF_DOWN ) )
 		{
 			// Try to find an image size equal to or just slightly larger than what was requested
-			if ($val['width'] >= $requested_size[0]) {
-				$requested_size = array($val['width'], $val['height']);
+			if ( $val['width'] >= $requested_size[0] ) {
+				$requested_size = array( $val['width'], $val['height'] );
 				break;
 			}
 
 			// If we can't find an image size, set the requested size to the largest of the
 			// square sizes available
-			if (end($square_image_sizes) == $square_image_sizes[$key])
-				$requested_size = array($val['width'], $val['height']);
+			if ( end( $square_image_sizes ) == $square_image_sizes[$key] )
+				$requested_size = array( $val['width'], $val['height'] );
 		}
 	}
-	return wp_get_attachment_image_src($avatar_id, $requested_size);
+	return wp_get_attachment_image_src( $avatar_id, $requested_size );
 }
 
-function largo_get_user_avatar_id($user_id) {
-	return get_user_meta($user_id, LARGO_AVATAR_META_NAME, true);
+function largo_get_user_avatar_id( $user_id ) {
+	return get_user_meta( $user_id, LARGO_AVATAR_META_NAME, true );
 }