anrw / classy

app/classy/classy-basis.php

Indentation +18 added lines, -18 removed lines

@@ -6,36 +6,36 @@
 
 class ClassyBasis {
 
-    /**
-     * Imports data params into the class instance
-     * 
-     * @param  object/array $data
-     * @return void
-     */
+	/**
+	 * Imports data params into the class instance
+	 * 
+	 * @param  object/array $data
+	 * @return void
+	 */
 	protected function import($data) {
 
-        if ( is_object( $data ) ) {
+		if ( is_object( $data ) ) {
         
-            $data = get_object_vars( $data );
+			$data = get_object_vars( $data );
         
-        }
+		}
 
-        if ( is_array( $data ) ) {
+		if ( is_array( $data ) ) {
             
-            foreach ( $data as $key => $value ) {
+			foreach ( $data as $key => $value ) {
             
-                if ( !empty( $key ) ) {
+				if ( !empty( $key ) ) {
             
-                    $this->$key = $value;
+					$this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
             
-                    $this->$key = $value;
+					$this->$key = $value;
             
-                }
-            }
+				}
+			}
 
-        }
+		}
 
 	}
 

Spacing +6 added lines, -6 removed lines

@@ -14,21 +14,21 @@
      */
 	protected function import($data) {
 
-        if ( is_object( $data ) ) {
+        if (is_object($data)) {
         
-            $data = get_object_vars( $data );
+            $data = get_object_vars($data);
         
         }
 
-        if ( is_array( $data ) ) {
+        if (is_array($data)) {
             
-            foreach ( $data as $key => $value ) {
+            foreach ($data as $key => $value) {
             
-                if ( !empty( $key ) ) {
+                if (!empty($key)) {
             
                     $this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                } else if (!empty($key) && !method_exists($this, $key)) {
             
                     $this->$key = $value;
             

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
             
                     $this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                }
+                else if ( !empty( $key ) && !method_exists($this, $key) ) {
             
                     $this->$key = $value;
             

app/classy/classy-menu.php

Braces +8 added lines, -3 removed lines

@@ -29,7 +29,8 @@ 
 
 			$menu_id = $this->check_menu_id($arg);
 
-		} elseif (is_string($arg)) {
+		}
+		elseif (is_string($arg)) {
 
 			$menu_id = $this->get_menu_id_by_name($arg);
 
@@ -148,11 +149,15 @@ 
 			
 			$menu_id = get_term_by('slug', $slug, 'nav_menu');
 
-			if ($menu_id) return $menu_id;
+			if ($menu_id) {
+				return $menu_id;
+			}
 
 			$menu_id = get_term_by('name', $slug, 'nav_menu');
 			
-			if ($menu_id) return $menu_id;
+			if ($menu_id) {
+				return $menu_id;
+			}
 
 		}
 

app/classy/classy-helper.php

Indentation +27 added lines, -27 removed lines

@@ -245,58 +245,58 @@
 	 */
 	public static function get_archives_title() {
 
-	    $archives_title = '';
+		$archives_title = '';
 
-	    if ( is_category() ) {
+		if ( is_category() ) {
 
-	        $archives_title = single_cat_title( '', false );
+			$archives_title = single_cat_title( '', false );
 	    
-	    } else if ( is_tag() ) {
+		} else if ( is_tag() ) {
 
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
+			$archives_title = 'Tag: ' . single_tag_title( '', false );
 	    
-	    } else if ( is_author() ) {
+		} else if ( is_author() ) {
 
-	        if ( have_posts() ) {
+			if ( have_posts() ) {
 	        
-	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
+				the_post();
+				$archives_title = 'Author: ' . get_the_author();
 	        
-	        }
+			}
 	        
-	        rewind_posts();
+			rewind_posts();
 
-	    } else if ( is_search() ) {
+		} else if ( is_search() ) {
 
-	        $archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
+			$archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
 	    
-	    } else if ( is_archive() ) {
+		} else if ( is_archive() ) {
 	        
-	        if ( is_day() ) {
+			if ( is_day() ) {
 	        
-	            $archives_title = get_the_date();
+				$archives_title = get_the_date();
 	        
-	        } elseif ( is_month() ) {
+			} elseif ( is_month() ) {
 	        
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
+				$archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
 	        
-	        } elseif ( is_year() ) {
+			} elseif ( is_year() ) {
 	        
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
+				$archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
 	        
-	        } else {
+			} else {
 	        
-	            $archives_title = 'Archives';
+				$archives_title = 'Archives';
 	        
-	        }
+			}
 	    
-	    } else {
+		} else {
 	    
-	        $archives_title = 'Archives';
+			$archives_title = 'Archives';
 	    
-	    }
+		}
 
-	    return $archives_title;
+		return $archives_title;
 
 	}
 

Spacing +87 added lines, -87 removed lines

@@ -15,44 +15,44 @@ 
 	 * @param string  $allowed_tags
 	 * @return string
 	 */
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
-		if ( null === $more ) {
-			$more = __( '…' );
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
+		if (null === $more) {
+			$more = __('…');
 		}
 
 		$original_text = $text;
 		$allowed_tag_string = '';
 
-		foreach ( explode( ' ', $allowed_tags  ) as $tag ) {
-			$allowed_tag_string .= '<' . $tag . '>';
+		foreach (explode(' ', $allowed_tags) as $tag) {
+			$allowed_tag_string .= '<'.$tag.'>';
 		}
 
-		$text = strip_tags( $text, $allowed_tag_string );
+		$text = strip_tags($text, $allowed_tag_string);
 
 		/* translators: If your word count is based on single characters (East Asian characters),
 		enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
 
-		if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-			preg_match_all( '/./u', $text, $words_array );
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+		if ('characters' == _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+			preg_match_all('/./u', $text, $words_array);
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
 			$sep = '';
 		} else {
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 			$sep = ' ';
 		}
 
-		if ( count( $words_array ) > $num_words ) {
-			array_pop( $words_array );
-			$text = implode( $sep, $words_array );
-			$text = $text . $more;
+		if (count($words_array) > $num_words) {
+			array_pop($words_array);
+			$text = implode($sep, $words_array);
+			$text = $text.$more;
 		} else {
-			$text = implode( $sep, $words_array );
+			$text = implode($sep, $words_array);
 		}
 		
-		$text = self::close_tags( $text );
+		$text = self::close_tags($text);
 
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 	}
 
 
@@ -62,36 +62,36 @@ 
 	 * @param string  $html
 	 * @return string
 	 */
-	public static function close_tags( $html ) {
+	public static function close_tags($html) {
 		//put all opened tags into an array
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
 
 		$openedtags = $result[1];
 		
 		//put all closed tags into an array
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
 		
 		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
+		$len_opened = count($openedtags);
 		
 		// all tags are closed
-		if ( count( $closedtags ) == $len_opened ) {
+		if (count($closedtags) == $len_opened) {
 			return $html;
 		}
 		
-		$openedtags = array_reverse( $openedtags );
+		$openedtags = array_reverse($openedtags);
 		
 		// close tags
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( !in_array( $openedtags[$i], $closedtags ) ) {
-				$html .= '</' . $openedtags[$i] . '>';
+		for ($i = 0; $i < $len_opened; $i++) {
+			if (!in_array($openedtags[$i], $closedtags)) {
+				$html .= '</'.$openedtags[$i].'>';
 			} else {
-				unset( $closedtags[array_search( $openedtags[$i], $closedtags )] );
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
 			}
 		}
 
-		$html = str_replace(array('</br>','</hr>','</wbr>'), '', $html);
-		$html = str_replace(array('<br>','<hr>','<wbr>'), array('<br />','<hr />','<wbr />'), $html);
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
 		
 		return $html;
 	}
@@ -101,14 +101,14 @@ 
 	 * 
 	 * @param  mixed $arg
 	 */
-	public static function error_log( $arg ) {
-		if ( !WP_DEBUG ) {
+	public static function error_log($arg) {
+		if (!WP_DEBUG) {
 			return;
 		}
-		if ( is_object( $arg ) || is_array( $arg ) ) {
-			$arg = print_r( $arg, true );
+		if (is_object($arg) || is_array($arg)) {
+			$arg = print_r($arg, true);
 		}
-		return error_log( $arg );
+		return error_log($arg);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 * @param string  $args
 	 * @return array
 	 */
-	public static function paginate_links( $args = '' ) {
+	public static function paginate_links($args = '') {
 		$defaults = array(
 			'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
 			'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
@@ -125,43 +125,43 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => true,
-			'prev_text' => __( '&laquo; Previous' ),
-			'next_text' => __( 'Next &raquo;' ),
+			'prev_text' => __('&laquo; Previous'),
+			'next_text' => __('Next &raquo;'),
 			'end_size' => 1,
 			'mid_size' => 2,
 			'type' => 'array',
 			'add_args' => false, // array of query args to add
 			'add_fragment' => ''
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		// Who knows what else people pass in $args
-		$args['total'] = intval( (int)$args['total'] );
-		if ( $args['total'] < 2 ) {
+		$args['total'] = intval((int) $args['total']);
+		if ($args['total'] < 2) {
 			return array();
 		}
-		$args['current'] = (int)$args['current'];
-		$args['end_size'] = 0 < (int)$args['end_size'] ? (int)$args['end_size'] : 1; // Out of bounds?  Make it the default.
-		$args['mid_size'] = 0 <= (int)$args['mid_size'] ? (int)$args['mid_size'] : 2;
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+		$args['current'] = (int) $args['current'];
+		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
+		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
 		$page_links = array();
 		$dots = false;
-		if ( $args['prev_next'] && $args['current'] && 1 < $args['current'] ) {
-			$link = str_replace( '%_%', 2 == $args['current'] ? '' : $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] - 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && 1 < $args['current']) {
+			$link = str_replace('%_%', 2 == $args['current'] ? '' : $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] - 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
 			$link .= $args['add_fragment'];
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 			$page_links[] = array(
 				'class' => 'prev page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['prev_text']
 			);
 		}
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
-			$n_display = number_format_i18n( $n );
-			if ( $n == $args['current'] ) {
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
+			if ($n == $args['current']) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
 					'title' => $n_display,
@@ -171,42 +171,42 @@ 
 				);
 				$dots = true;
 			} else {
-				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
-					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-					$link = str_replace( '%#%', $n, $link );
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
-					if ( $args['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+				if ($args['show_all'] || ($n <= $args['end_size'] || ($args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size']) || $n > $args['total'] - $args['end_size'])) {
+					$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+					$link = str_replace('%#%', $n, $link);
+					$link = trailingslashit($link).ltrim($args['add_fragment'], '/');
+					if ($args['add_args']) {
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
 					}
 					$link = str_replace(' ', '+', $link);
-					$link = untrailingslashit( $link );
+					$link = untrailingslashit($link);
 					$page_links[] = array(
 						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+						'link' => esc_url(apply_filters('paginate_links', $link)),
 						'title' => $n_display,
 						'name' => $n_display,
 						'current' => $args['current'] == $n
 					);
 					$dots = true;
-				} elseif ( $dots && !$args['show_all'] ) {
+				} elseif ($dots && !$args['show_all']) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' )
+						'title' => __('&hellip;')
 					);
 					$dots = false;
 				}
 			}
 		}
-		if ( $args['prev_next'] && $args['current'] && ( $args['current'] < $args['total'] || -1 == $args['total'] ) ) {
-			$link = str_replace( '%_%', $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] + 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && ($args['current'] < $args['total'] || -1 == $args['total'])) {
+			$link = str_replace('%_%', $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] + 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
-			$link = untrailingslashit( trailingslashit( $link ) . $args['add_fragment'] );
+			$link = untrailingslashit(trailingslashit($link).$args['add_fragment']);
 			$page_links[] = array(
 				'class' => 'next page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['next_text']
 			);
 		}
@@ -247,42 +247,42 @@ 
 
 	    $archives_title = '';
 
-	    if ( is_category() ) {
+	    if (is_category()) {
 
-	        $archives_title = single_cat_title( '', false );
+	        $archives_title = single_cat_title('', false);
 	    
-	    } else if ( is_tag() ) {
+	    } else if (is_tag()) {
 
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
+	        $archives_title = 'Tag: '.single_tag_title('', false);
 	    
-	    } else if ( is_author() ) {
+	    } else if (is_author()) {
 
-	        if ( have_posts() ) {
+	        if (have_posts()) {
 	        
 	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
+	            $archives_title = 'Author: '.get_the_author();
 	        
 	        }
 	        
 	        rewind_posts();
 
-	    } else if ( is_search() ) {
+	    } else if (is_search()) {
 
-	        $archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
+	        $archives_title = sprintf(__('Search Results for: %s', 'flotheme'), '<span>'.get_search_query().'</span>');
 	    
-	    } else if ( is_archive() ) {
+	    } else if (is_archive()) {
 	        
-	        if ( is_day() ) {
+	        if (is_day()) {
 	        
 	            $archives_title = get_the_date();
 	        
-	        } elseif ( is_month() ) {
+	        } elseif (is_month()) {
 	        
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
+	            $archives_title = get_the_date(_x('F Y', 'monthly archives date format', 'flotheme'));
 	        
-	        } elseif ( is_year() ) {
+	        } elseif (is_year()) {
 	        
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
+	            $archives_title = get_the_date(_x('Y', 'yearly archives date format', 'flotheme'));
 	        
 	        } else {
 	        

Braces +28 added lines, -14 removed lines

@@ -37,7 +37,8 @@ 
 			preg_match_all( '/./u', $text, $words_array );
 			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
 			$sep = '';
-		} else {
+		}
+		else {
 			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
 			$sep = ' ';
 		}
@@ -46,7 +47,8 @@ 
 			array_pop( $words_array );
 			$text = implode( $sep, $words_array );
 			$text = $text . $more;
-		} else {
+		}
+		else {
 			$text = implode( $sep, $words_array );
 		}
 		
@@ -85,7 +87,8 @@ 
 		for ( $i = 0; $i < $len_opened; $i++ ) {
 			if ( !in_array( $openedtags[$i], $closedtags ) ) {
 				$html .= '</' . $openedtags[$i] . '>';
-			} else {
+			}
+			else {
 				unset( $closedtags[array_search( $openedtags[$i], $closedtags )] );
 			}
 		}
@@ -170,7 +173,8 @@ 
 					'current' => true
 				);
 				$dots = true;
-			} else {
+			}
+			else {
 				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
 					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
 					$link = str_replace( '%#%', $n, $link );
@@ -188,7 +192,8 @@ 
 						'current' => $args['current'] == $n
 					);
 					$dots = true;
-				} elseif ( $dots && !$args['show_all'] ) {
+				}
+				elseif ( $dots && !$args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
 						'title' => __( '&hellip;' )
@@ -227,7 +232,8 @@ 
 			if (strlen($k)) {
 				if (is_array($v)) {
 					$obj->{$k} = self::array_to_object($v); //RECURSION
-				} else {
+				}
+				else {
 					$obj->{$k} = $v;
 				}
 			}
@@ -251,11 +257,13 @@ 
 
 	        $archives_title = single_cat_title( '', false );
 	    
-	    } else if ( is_tag() ) {
+	    }
+	    else if ( is_tag() ) {
 
 	        $archives_title = 'Tag: ' . single_tag_title( '', false );
 	    
-	    } else if ( is_author() ) {
+	    }
+	    else if ( is_author() ) {
 
 	        if ( have_posts() ) {
 	        
@@ -266,31 +274,37 @@ 
 	        
 	        rewind_posts();
 
-	    } else if ( is_search() ) {
+	    }
+	    else if ( is_search() ) {
 
 	        $archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
 	    
-	    } else if ( is_archive() ) {
+	    }
+	    else if ( is_archive() ) {
 	        
 	        if ( is_day() ) {
 	        
 	            $archives_title = get_the_date();
 	        
-	        } elseif ( is_month() ) {
+	        }
+	        elseif ( is_month() ) {
 	        
 	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
 	        
-	        } elseif ( is_year() ) {
+	        }
+	        elseif ( is_year() ) {
 	        
 	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
 	        
-	        } else {
+	        }
+	        else {
 	        
 	            $archives_title = 'Archives';
 	        
 	        }
 	    
-	    } else {
+	    }
+	    else {
 	    
 	        $archives_title = 'Archives';