anrw / classy

app/classy/classy.php

Spacing +50 added lines, -50 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public static function get_instance() {
 		
-		if ( null === self::$single_instance ) {
+		if (null === self::$single_instance) {
 		
 			self::$single_instance = new self();
 		
@@ -66,11 +66,11 @@ 
 	 * @param  string
 	 * @param  string
 	 */
-	private function define( $name, $value ) {
+	private function define($name, $value) {
 		
-		if ( !defined($name) ) {
+		if (!defined($name)) {
 			
-			define( $name, $value );
+			define($name, $value);
 
 		}
 
@@ -86,13 +86,13 @@ 
 
 		$theme = wp_get_theme();
 
-		$this->define( 'THEME', $theme->template );
-		$this->define( 'THEME_NAME', $theme->get('Name') );
-		$this->define( 'THEME_PATH', get_template_directory() . '/' );
-		$this->define( 'THEME_DIR', get_template_directory_uri() . '/' );
-		$this->define( 'THEME_VERSION', $theme->get('Version') );
-		$this->define( 'THEME_FRAMEWORK_PATH', THEME_PATH . 'app/' );
-		$this->define( 'THEME_FRAMEWORK_DIR', THEME_DIR . 'app/' );
+		$this->define('THEME', $theme->template);
+		$this->define('THEME_NAME', $theme->get('Name'));
+		$this->define('THEME_PATH', get_template_directory().'/');
+		$this->define('THEME_DIR', get_template_directory_uri().'/');
+		$this->define('THEME_VERSION', $theme->get('Version'));
+		$this->define('THEME_FRAMEWORK_PATH', THEME_PATH.'app/');
+		$this->define('THEME_FRAMEWORK_DIR', THEME_DIR.'app/');
 
 	}
 
@@ -101,40 +101,40 @@ 
 	 */
 	private function include_core_files() {
 
-		require_once THEME_PATH . 'vendor/autoload.php';
+		require_once THEME_PATH.'vendor/autoload.php';
 
 		// Basis Class
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-basis.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-basis.php';
 
 		// Hierarchy
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-hierarchy.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-hierarchy.php';
 
 		// Theme Config
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-config.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-config.php';
 	
 		// Scope
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-scope.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-scope.php';
 
 		// View Loader
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-view.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-view.php';
 
 		// Helper functions
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-helper.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-helper.php';
 
 		// Query Helper
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-query-helper.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-query-helper.php';
 
 		// Menu
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu.php';
 
 		// Menu Item
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu-item.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu-item.php';
 
 		// Comment
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-comment.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-comment.php';
 
 		// Appearance
-		require_once THEME_FRAMEWORK_PATH . 'appearance.php';
+		require_once THEME_FRAMEWORK_PATH.'appearance.php';
 
 	}
 
@@ -143,11 +143,11 @@ 
 	 */
 	private function include_models() {
 
-		$files = (array) glob( THEME_FRAMEWORK_PATH . '/models/*.php' );
+		$files = (array) glob(THEME_FRAMEWORK_PATH.'/models/*.php');
 
-		foreach ( $files as $filename ) {
+		foreach ($files as $filename) {
 
-			if ( !empty($filename) ) {
+			if (!empty($filename)) {
 
 				require_once $filename;
 
@@ -220,8 +220,8 @@ 
 	 */
 	public static function render($view = null, $data = null) {
 		
-		$views = THEME_PATH . ClassyView::$folder;
-		$cache = WP_CONTENT_DIR . '/viewcache';
+		$views = THEME_PATH.ClassyView::$folder;
+		$cache = WP_CONTENT_DIR.'/viewcache';
 		$common_scope = ClassyScope::get_common_scope();
 
 		if ($view !== null && is_string($view)) {
@@ -285,7 +285,7 @@ 
 				
 					$_return[] = new ClassyPost($post);
 				
-				} elseif($return_type == 'id') {
+				} elseif ($return_type == 'id') {
 
 					$_return[] = $post->id;
 
@@ -313,7 +313,7 @@ 
 
 		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset($posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 
@@ -323,58 +323,58 @@ 
 	 * @param array   $prefs
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		
-		if ( $wp_rewrite->using_permalinks() ) {
+		if ($wp_rewrite->using_permalinks()) {
 			
-			$url = explode( '?', get_pagenum_link( 0 ) );
+			$url = explode('?', get_pagenum_link(0));
 			
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			if (isset($url[1])) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]).'%_%';
 
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
 		$args['prev_next'] = false;
 		
-		if ( is_int( $prefs ) ) {
+		if (is_int($prefs)) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 
 		$data = array();
-		$data['pages'] = ClassyHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = ClassyHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		
-		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+		if ($next) {
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
 
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		
-		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+		if ($prev) {
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		
-		if ( $paged < 2 ) {
+		if ($paged < 2) {
 			$data['prev'] = null;
 		}
 		

Braces +15 added lines, -7 removed lines

@@ -190,7 +190,9 @@ 
 
 		$vars = ClassyConfig::get_vars();
 
-		if (isset($vars[$name])) return $vars[$name];
+		if (isset($vars[$name])) {
+			return $vars[$name];
+		}
 
 		return false;
 
@@ -230,13 +232,15 @@ 
 
 				$scope = array_merge($common_scope, $data);
 
-			} else {
+			}
+			else {
 
 				$scope = $common_scope;
 
 			}
 
-		} else {
+		}
+		else {
 
 			$view = ClassyView::get_view();
 
@@ -285,11 +289,13 @@ 
 				
 					$_return[] = new ClassyPost($post);
 				
-				} elseif($return_type == 'id') {
+				}
+				elseif($return_type == 'id') {
 
 					$_return[] = $post->id;
 
-				} else {
+				}
+				else {
 
 					$_return[] = $post;
 
@@ -344,7 +350,8 @@ 
 			$args['format'] = 'page/%#%';
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
 
-		} else {
+		}
+		else {
 			$big = 999999999;
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
 		}
@@ -356,7 +363,8 @@ 
 		
 		if ( is_int( $prefs ) ) {
 			$args['mid_size'] = $prefs - 2;
-		} else {
+		}
+		else {
 			$args = array_merge( $args, $prefs );
 		}
 

app/models/classy-post.php

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,8 @@ 
 		if (is_integer($post)) {
 			$this->ID = $post;
 			$this->init();
-		} elseif (is_a($post, 'WP_Post')) {
+		}
+		elseif (is_a($post, 'WP_Post')) {
 			$this->import($post);
 		}
 	}
@@ -259,7 +260,8 @@ 
 			if ( $force ) {
 				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
 				$trimmed = true;
-			} else {
+			}
+			else {
 				$text = $this->post_excerpt;
 			}
 
@@ -319,7 +321,8 @@ 
 			
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore_matches[1]) . '</a>';
-			} elseif ( $readmore ) {
+			}
+			elseif ( $readmore ) {
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
 			}