From 35d3c15d39baf15b3715d44ebdb3bcd9b0f232fd Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Sun, 31 Jul 2011 16:44:13 -0600 Subject: [PATCH] Code cleanup --- inc/roots-actions.php | 57 ++++++++++++++++++++++++---------------- inc/roots-activation.php | 24 +++++++++-------- inc/roots-cleanup.php | 24 +++++++++-------- inc/roots-htaccess.php | 4 +-- inc/roots-widgets.php | 42 +++++++++++------------------ 5 files changed, 77 insertions(+), 74 deletions(-) diff --git a/inc/roots-actions.php b/inc/roots-actions.php index 3004590..bfe02bf 100644 --- a/inc/roots-actions.php +++ b/inc/roots-actions.php @@ -75,25 +75,33 @@ function roots_get_stylesheets() { $styles = ''; - if ($roots_css_framework === 'blueprint') { - $styles .= stylesheet_link_tag('/blueprint/screen.css'); - } elseif ($roots_css_framework === '960gs_12' || $roots_css_framework === '960gs_16') { - $styles .= stylesheet_link_tag('/960/reset.css'); - $styles .= stylesheet_link_tag('/960/text.css', 1); - $styles .= stylesheet_link_tag('/960/960.css', 1); - } elseif ($roots_css_framework === '960gs_24') { - $styles .= stylesheet_link_tag('/960/reset.css'); - $styles .= stylesheet_link_tag('/960/text.css', 1); - $styles .= stylesheet_link_tag('/960/960_24_col.css', 1); - } elseif ($roots_css_framework === '1140') { - $styles .= stylesheet_link_tag('/1140/1140.css'); - } elseif ($roots_css_framework === 'adapt') { - $styles .= stylesheet_link_tag('/adapt/master.css'); - $styles .= "\t\n"; - } elseif ($roots_css_framework === 'less') { - $styles .= stylesheet_link_tag('/less/less.css'); + switch ($roots_css_framework) { + case 'blueprint' : + $styles .= stylesheet_link_tag('/blueprint/screen.css'); + break; + case '960gs_12' : + case '960gs_16' : + $styles .= stylesheet_link_tag('/960/reset.css'); + $styles .= stylesheet_link_tag('/960/text.css', 1); + $styles .= stylesheet_link_tag('/960/960.css', 1); + break; + case '960gs_24' : + $styles .= stylesheet_link_tag('/960/reset.css'); + $styles .= stylesheet_link_tag('/960/text.css', 1); + $styles .= stylesheet_link_tag('/960/960_24_col.css', 1); + break; + case '1140' : + $styles .= stylesheet_link_tag('/1140/1140.css'); + break; + case 'adapt' : + $styles .= stylesheet_link_tag('/adapt/master.css'); + $styles .= "\t\n"; + break; + case 'less' : + $styles .= stylesheet_link_tag('/less/less.css'); + break; } if (class_exists('RGForms')) { @@ -107,10 +115,13 @@ function roots_get_stylesheets() { $styles .= stylesheet_link_tag('/style.css', 1); } - if ($roots_css_framework === 'blueprint') { - $styles .= "\t\n"; - } elseif ($roots_css_framework === '1140') { - $styles .= "\t\n"; + switch ($roots_css_framework) { + case 'blueprint' : + $styles .= "\t\n"; + break; + case '1140' : + $styles .= "\t\n"; + break; } echo $styles; diff --git a/inc/roots-activation.php b/inc/roots-activation.php index 2f10c4b..963c076 100644 --- a/inc/roots-activation.php +++ b/inc/roots-activation.php @@ -3,7 +3,7 @@ // http://foolswisdom.com/wp-activate-theme-actio/ global $pagenow; -if (is_admin() && 'themes.php' === $pagenow && isset( $_GET['activated'])) { +if (is_admin() && $pagenow === 'themes.php' && isset( $_GET['activated'])) { // on theme activation make sure there's a Home page // create it if there isn't and set the Home page menu order to -1 @@ -21,11 +21,12 @@ if (is_admin() && 'themes.php' === $pagenow && isset( $_GET['activated'])) { foreach ($pages_to_create as $new_page_title) { // create post object - $add_default_pages = array(); - $add_default_pages['post_title'] = $new_page_title; - $add_default_pages['post_content'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum consequat, orci ac laoreet cursus, dolor sem luctus lorem, eget consequat magna felis a magna. Aliquam scelerisque condimentum ante, eget facilisis tortor lobortis in. In interdum venenatis justo eget consequat. Morbi commodo rhoncus mi nec pharetra. Aliquam erat volutpat. Mauris non lorem eu dolor hendrerit dapibus. Mauris mollis nisl quis sapien posuere consectetur. Nullam in sapien at nisi ornare bibendum at ut lectus. Pellentesque ut magna mauris. Nam viverra suscipit ligula, sed accumsan enim placerat nec. Cras vitae metus vel dolor ultrices sagittis. Duis venenatis augue sed risus laoreet congue ac ac leo. Donec fermentum accumsan libero sit amet iaculis. Duis tristique dictum enim, ac fringilla risus bibendum in. Nunc ornare, quam sit amet ultricies gravida, tortor mi malesuada urna, quis commodo dui nibh in lacus. Nunc vel tortor mi. Pellentesque vel urna a arcu adipiscing imperdiet vitae sit amet neque. Integer eu lectus et nunc dictum sagittis. Curabitur commodo vulputate fringilla. Sed eleifend, arcu convallis adipiscing congue, dui turpis commodo magna, et vehicula sapien turpis sit amet nisi.'; - $add_default_pages['post_status'] = 'publish'; - $add_default_pages['post_type'] = 'page'; + $add_default_pages = array( + 'post_title' => $new_page_title, + 'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum consequat, orci ac laoreet cursus, dolor sem luctus lorem, eget consequat magna felis a magna. Aliquam scelerisque condimentum ante, eget facilisis tortor lobortis in. In interdum venenatis justo eget consequat. Morbi commodo rhoncus mi nec pharetra. Aliquam erat volutpat. Mauris non lorem eu dolor hendrerit dapibus. Mauris mollis nisl quis sapien posuere consectetur. Nullam in sapien at nisi ornare bibendum at ut lectus. Pellentesque ut magna mauris. Nam viverra suscipit ligula, sed accumsan enim placerat nec. Cras vitae metus vel dolor ultrices sagittis. Duis venenatis augue sed risus laoreet congue ac ac leo. Donec fermentum accumsan libero sit amet iaculis. Duis tristique dictum enim, ac fringilla risus bibendum in. Nunc ornare, quam sit amet ultricies gravida, tortor mi malesuada urna, quis commodo dui nibh in lacus. Nunc vel tortor mi. Pellentesque vel urna a arcu adipiscing imperdiet vitae sit amet neque. Integer eu lectus et nunc dictum sagittis. Curabitur commodo vulputate fringilla. Sed eleifend, arcu convallis adipiscing congue, dui turpis commodo magna, et vehicula sapien turpis sit amet nisi.', + 'post_status' => 'publish', + 'post_type' => 'page' + ); // insert the post into the database $result = wp_insert_post($add_default_pages); @@ -35,13 +36,14 @@ if (is_admin() && 'themes.php' === $pagenow && isset( $_GET['activated'])) { update_option('show_on_front', 'page'); update_option('page_on_front', $home->ID); - $home_menu_order = array(); - $home_menu_order['ID'] = $home->ID; - $home_menu_order['menu_order'] = -1; + $home_menu_order = array( + 'ID' => $home->ID, + 'menu_order' => -1 + ); wp_update_post($home_menu_order); // set the permalink structure - if (get_option('permalink_structure') != '/%year%/%postname%/') { + if (get_option('permalink_structure') !== '/%year%/%postname%/') { update_option('permalink_structure', '/%year%/%postname%/'); } @@ -67,7 +69,7 @@ if (is_admin() && 'themes.php' === $pagenow && isset( $_GET['activated'])) { } if ($roots_nav_theme_mod) { - set_theme_mod('nav_menu_locations', $roots_nav_theme_mod ); + set_theme_mod('nav_menu_locations', $roots_nav_theme_mod); } $primary_nav = wp_get_nav_menu_object('Primary Navigation'); diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php index f7a0a31..2514b9d 100644 --- a/inc/roots-cleanup.php +++ b/inc/roots-cleanup.php @@ -13,9 +13,9 @@ add_action('template_redirect', 'roots_nice_search_redirect'); function roots_search_query($escaped = true) { $query = apply_filters('roots_search_query', get_query_var('s')); if ($escaped) { - $query = esc_attr( $query ); + $query = esc_attr($query); } - return urldecode($query); + return urldecode($query); } add_filter('get_search_query', 'roots_search_query'); @@ -98,16 +98,21 @@ add_filter('the_generator', 'roots_no_generator'); // cleanup wp_head function roots_noindex() { - if (get_option('blog_public') === '0') - echo '', "\n"; + if (get_option('blog_public') === '0') { + echo '', "\n"; + } } function roots_rel_canonical() { - if (!is_singular()) + if (!is_singular()) { return; + } + global $wp_the_query; - if (!$id = $wp_the_query->get_queried_object_id()) + if (!$id = $wp_the_query->get_queried_object_id()) { return; + } + $link = get_permalink($id); echo "\t\n"; } @@ -151,12 +156,9 @@ function roots_head_cleanup() { // deregister l10n.js (new since WordPress 3.1) // why you might want to keep it: http://wordpress.stackexchange.com/questions/5451/what-does-l10n-js-do-in-wordpress-3-1-and-how-do-i-remove-it/5484#5484 - if (!is_admin()) { - wp_deregister_script('l10n'); - } - // don't load jQuery through WordPress since it's linked in header.php if (!is_admin()) { + wp_deregister_script('l10n'); wp_deregister_script('jquery'); wp_register_script('jquery', '', '', '', true); } @@ -396,4 +398,4 @@ function roots_change_mce_options($options) { add_filter('tiny_mce_before_init', 'roots_change_mce_options'); -?> \ No newline at end of file +?> diff --git a/inc/roots-htaccess.php b/inc/roots-htaccess.php index 3eda052..38ae809 100644 --- a/inc/roots-htaccess.php +++ b/inc/roots-htaccess.php @@ -9,8 +9,6 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) { add_action('admin_init', 'roots_htaccess_writable'); - $theme_name = next(explode('/themes/', get_stylesheet_directory())); - // Rewrites DO NOT happen for child themes // rewrite /wp-content/themes/roots/css/ to /css/ // rewrite /wp-content/themes/roots/js/ to /js/ @@ -82,4 +80,4 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) { add_action('mod_rewrite_rules', 'roots_add_h5bp_htaccess'); } -?> \ No newline at end of file +?> diff --git a/inc/roots-widgets.php b/inc/roots-widgets.php index b5ed01d..6cbea93 100644 --- a/inc/roots-widgets.php +++ b/inc/roots-widgets.php @@ -9,16 +9,14 @@ class roots_vcard extends WP_Widget { function widget($args, $instance) { extract($args); - $title = $instance['title']; - $street_address = $instance['street_address']; - $locality = $instance['locality']; - $region = $instance['region']; - $postal_code = $instance['postal_code']; - $tel = $instance['tel']; - $email = $instance['email']; - ?> - - + extract($instance); + + echo $before_widget; + if ($title) { + echo $before_title, $title, $after_title; + } + ?> +


@@ -31,9 +29,8 @@ class roots_vcard extends WP_Widget {

- +

- +

- +

- +

- +

- +

- +

- +