jarednova / timber

lib/timber-comment.php

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function init($cid) {
 		$comment_data = $cid;
-		if (is_integer($cid)) {
+		if ( is_integer($cid) ) {
 			$comment_data = get_comment($cid);
 		}
 		$this->import($comment_data);
@@ -86,11 +86,11 @@ 
 	 * @return TimberUser
 	 */
 	public function author() {
-		if ($this->user_id) {
+		if ( $this->user_id ) {
 			return new TimberUser($this->user_id);
 		} else {
 			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
+			if ( isset($this->comment_author) && $this->comment_author ) {
 				$author->name = $this->comment_author;
 			} else {
 				$author->name = 'Anonymous';
@@ -114,21 +114,21 @@ 
 	 * @return bool|mixed|string
 	 */
 	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+		if ( !get_option('show_avatars') ) {
 			return false;
 		}
-		if (!is_numeric($size)) {
+		if ( !is_numeric($size) ) {
 			$size = '92';
 		}
 
 		$email = $this->avatar_email();
 		$email_hash = '';
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$email_hash = md5(strtolower(trim($email)));
 		}
 		$host = $this->avatar_host($email_hash);
 		$default = $this->avatar_default($default, $email, $size, $host);
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
@@ -179,9 +179,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
+		$the_date = (string) mysql2date($df, $this->comment_date);
 		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
@@ -204,9 +204,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
+		$the_time = (string) mysql2date($tf, $this->comment_date);
 		return apply_filters('get_comment_time', $the_time, $tf);
 	}
 
@@ -232,14 +232,14 @@ 
 	 * @return mixed
 	 */
 	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
+		if ( $comment_id === null ) {
 			$comment_id = $this->ID;
 		}
 		//Could not find a WP function to fetch all comment meta data, so I made one.
 		apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
 		$comment_metas = get_comment_meta($comment_id);
 		foreach ($comment_metas as &$cm) {
-			if (is_array($cm) && count($cm) == 1) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -254,7 +254,7 @@ 
 	 */
 	protected function get_meta_field($field_name) {
 		$value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ($value === null) {
+		if ( $value === null ) {
 			$value = get_comment_meta($this->ID, $field_name, true);
 		}
 		$value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
@@ -267,9 +267,9 @@ 
 	 * @api
 	 * @return string
 	 */
-	public function reply_link( $reply_text = 'Reply' ) {
+	public function reply_link($reply_text = 'Reply') {
 		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
+			wp_enqueue_script('comment-reply');
 		}
 
 		// Get the comments depth option from the admin panel
@@ -284,7 +284,7 @@ 
 			'max_depth' => $max_depth,
 		);
 
-		return get_comment_reply_link( $args, $this->ID, $this->post_id );
+		return get_comment_reply_link($args, $this->ID, $this->post_id);
 	}
 
 	/* AVATAR Stuff
@@ -295,9 +295,9 @@ 
 	 * @return string
 	 */
 	protected function avatar_email() {
-		$id = (int)$this->user_id;
+		$id = (int) $this->user_id;
 		$user = get_userdata($id);
-		if ($user) {
+		if ( $user ) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -311,10 +311,10 @@ 
 	 * @return string
 	 */
 	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+		if ( is_ssl() ) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if (!empty($email_hash)) {
+			if ( !empty($email_hash) ) {
 				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
@@ -333,28 +333,28 @@ 
 	 * @return string
 	 */
 	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+		if ( substr($default, 0, 1) == '/' ) {
 			$default = home_url() . $default;
 		}
 
-		if (empty($default)) {
+		if ( empty($default) ) {
 			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
+			if ( empty($avatar_default) ) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
-		if ('mystery' == $default) {
+		if ( 'mystery' == $default ) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
+		} else if ( 'blank' == $default ) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
+		} else if ( !empty($email) && 'gravatar_default' == $default ) {
 			$default = '';
-		} else if ('gravatar_default' == $default) {
+		} else if ( 'gravatar_default' == $default ) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
+		} else if ( empty($email) && !strstr($default, 'http://') ) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 		return $default;
@@ -371,7 +371,7 @@ 
 	protected function avatar_out($default, $host, $email_hash, $size) {
 		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode($default);
 		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
+		if ( !empty($rating) ) {
 			$out .= '&r=' . $rating;
 		}
 		return str_replace('&', '&', esc_url($out));

lib/image/timber-image-operation-tojpg.php

Spacing +11 added lines, -11 removed lines

@@ -36,14 +36,14 @@ 
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
 	function run($load_filename, $save_filename) {
-		$input = self::image_create( $load_filename );
-		list( $width, $height ) = getimagesize( $load_filename );
-		$output = imagecreatetruecolor( $width, $height );
-		$c = self::hexrgb( $this->color );
-		$color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
-		imagefilledrectangle( $output, 0, 0, $width, $height, $color );
-		imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
-		imagejpeg( $output, $save_filename );
+		$input = self::image_create($load_filename);
+		list($width, $height) = getimagesize($load_filename);
+		$output = imagecreatetruecolor($width, $height);
+		$c = self::hexrgb($this->color);
+		$color = imagecolorallocate($output, $c['red'], $c['green'], $c['blue']);
+		imagefilledrectangle($output, 0, 0, $width, $height, $color);
+		imagecopy($output, $input, 0, 0, 0, 0, $width, $height);
+		imagejpeg($output, $save_filename);
 		return true;
 	}
 
@@ -52,10 +52,10 @@ 
 	 * @return resource an image identifier representing the image obtained from the given filename
 	 *                  will return the same data type regardless of whether the source is gif or png
 	 */
-	function image_create( $filename, $ext = 'auto' ) {
+	function image_create($filename, $ext = 'auto') {
 		if ( $ext == 'auto' ) {
 			$ext = wp_check_filetype($filename);
-			if (isset($ext['ext'])) {
+			if ( isset($ext['ext']) ) {
 				$ext = $ext['ext'];
 			}
 		}
@@ -69,6 +69,6 @@ 
 		if ( $ext == 'jpg' || $ext == 'jpeg' ) {
 			return imagecreatefromjpeg($filename);
 		}
-		throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
+		throw new InvalidArgumentException('image_create only accepts PNG, GIF and JPGs. File extension was: ' . $ext);
 	}
 }

lib/image/timber-image-operation-letterbox.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
 	 */
 	public function filename($src_filename, $src_extension) {
-		$color = str_replace( '#', '', $this->color );
+		$color = str_replace('#', '', $this->color);
 		$newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
 		$new_name = $newbase . '.' . $src_extension;
 		return $new_name;
@@ -50,12 +50,12 @@ 
 		$w = $this->w;
 		$h = $this->h;
 
-		$bg = imagecreatetruecolor( $w, $h );
-		$c = self::hexrgb( $this->color );
-		$bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
-		imagefill( $bg, 0, 0, $bgColor );
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
+		$bg = imagecreatetruecolor($w, $h);
+		$c = self::hexrgb($this->color);
+		$bgColor = imagecolorallocate($bg, $c['red'], $c['green'], $c['blue']);
+		imagefill($bg, 0, 0, $bgColor);
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
 			$current_size = $image->get_size();
 			$quality = $image->get_quality();
 			$ow = $current_size['width'];
@@ -69,39 +69,39 @@ 
 				$y = 0;
 				$x = $w / 2 - $owt / 2;
 				$oht = $h;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			} else {
 				$w_scale = $w / $ow;
 				$oht = $oh * $w_scale;
 				$x = 0;
 				$y = $h / 2 - $oht / 2;
 				$owt = $w;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			}
-			$result = $image->save( $save_filename );
+			$result = $image->save($save_filename);
 			$func = 'imagecreatefromjpeg';
 			$save_func = 'imagejpeg';
-			$ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
+			$ext = pathinfo($save_filename, PATHINFO_EXTENSION);
 			if ( $ext == 'gif' ) {
 				$func = 'imagecreatefromgif';
 				$save_func = 'imagegif';
 			} else if ( $ext == 'png' ) {
 				$func = 'imagecreatefrompng';
 				$save_func = 'imagepng';
-				if ($quality > 9) {
-					$quality = $quality/10;
+				if ( $quality > 9 ) {
+					$quality = $quality / 10;
 					$quality = round(10 - $quality);
 				}
 			}
-			$image = $func( $save_filename );
-			imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
-			if ($save_func === 'imagegif') {
-				$save_func( $bg, $save_filename );
+			$image = $func($save_filename);
+			imagecopy($bg, $image, $x, $y, 0, 0, $owt, $oht);
+			if ( $save_func === 'imagegif' ) {
+				$save_func($bg, $save_filename);
 			}
-			$save_func( $bg, $save_filename, $quality );
+			$save_func($bg, $save_filename, $quality);
 			return true;
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 		}
 		return false;
 	}