More code cleanups from Mark Jaquith. fixes #1768
git-svn-id: http://svn.automattic.com/wordpress/trunk@2952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
0b735b842f
commit
845917e6ff
|
@ -9,6 +9,7 @@ function get_header() {
|
||||||
load_template( ABSPATH . 'wp-content/themes/default/header.php');
|
load_template( ABSPATH . 'wp-content/themes/default/header.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_footer() {
|
function get_footer() {
|
||||||
if ( file_exists( TEMPLATEPATH . '/footer.php') )
|
if ( file_exists( TEMPLATEPATH . '/footer.php') )
|
||||||
load_template( TEMPLATEPATH . '/footer.php');
|
load_template( TEMPLATEPATH . '/footer.php');
|
||||||
|
@ -16,6 +17,7 @@ function get_footer() {
|
||||||
load_template( ABSPATH . 'wp-content/themes/default/footer.php');
|
load_template( ABSPATH . 'wp-content/themes/default/footer.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_sidebar() {
|
function get_sidebar() {
|
||||||
if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
|
if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
|
||||||
load_template( TEMPLATEPATH . '/sidebar.php');
|
load_template( TEMPLATEPATH . '/sidebar.php');
|
||||||
|
@ -28,35 +30,36 @@ function wp_loginout() {
|
||||||
global $user_ID;
|
global $user_ID;
|
||||||
get_currentuserinfo();
|
get_currentuserinfo();
|
||||||
|
|
||||||
if ('' == $user_ID) :
|
if ('' == $user_ID)
|
||||||
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
|
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
|
||||||
else :
|
else
|
||||||
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
|
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
|
||||||
endif;
|
|
||||||
|
|
||||||
echo apply_filters('loginout', $link);
|
echo apply_filters('loginout', $link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function wp_register( $before = '<li>', $after = '</li>' ) {
|
function wp_register( $before = '<li>', $after = '</li>' ) {
|
||||||
global $user_ID;
|
global $user_ID;
|
||||||
|
|
||||||
get_currentuserinfo();
|
get_currentuserinfo();
|
||||||
|
|
||||||
if ('' == $user_ID && get_settings('users_can_register') ) :
|
if ( '' == $user_ID && get_settings('users_can_register') )
|
||||||
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
|
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
|
||||||
elseif ('' == $user_ID && !get_settings('users_can_register') ) :
|
elseif ( '' == $user_ID && !get_settings('users_can_register') )
|
||||||
$link = '';
|
$link = '';
|
||||||
else :
|
else
|
||||||
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
|
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
|
||||||
endif;
|
|
||||||
|
|
||||||
echo apply_filters('register', $link);
|
echo apply_filters('register', $link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function wp_meta() {
|
function wp_meta() {
|
||||||
do_action('wp_meta');
|
do_action('wp_meta');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function bloginfo($show='') {
|
function bloginfo($show='') {
|
||||||
$info = get_bloginfo($show);
|
$info = get_bloginfo($show);
|
||||||
if ( ! strstr($info, 'url') ) {
|
if ( ! strstr($info, 'url') ) {
|
||||||
|
@ -67,6 +70,7 @@ function bloginfo($show='') {
|
||||||
echo $info;
|
echo $info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_bloginfo($show='') {
|
function get_bloginfo($show='') {
|
||||||
|
|
||||||
switch($show) {
|
switch($show) {
|
||||||
|
@ -131,6 +135,7 @@ function get_bloginfo($show='') {
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function wp_title($sep = '»', $display = true) {
|
function wp_title($sep = '»', $display = true) {
|
||||||
global $wpdb;
|
global $wpdb;
|
||||||
global $m, $year, $monthnum, $day, $category_name, $month, $posts;
|
global $m, $year, $monthnum, $day, $category_name, $month, $posts;
|
||||||
|
@ -141,79 +146,76 @@ function wp_title($sep = '»', $display = true) {
|
||||||
$category_name = get_query_var('category_name');
|
$category_name = get_query_var('category_name');
|
||||||
|
|
||||||
// If there's a category
|
// If there's a category
|
||||||
if(!empty($cat)) {
|
if ( !empty($cat) ) {
|
||||||
if (!stristr($cat,'-')) { // category excluded
|
// category exclusion
|
||||||
|
if ( !stristr($cat,'-') )
|
||||||
$title = get_the_category_by_ID($cat);
|
$title = get_the_category_by_ID($cat);
|
||||||
}
|
}
|
||||||
}
|
if ( !empty($category_name) ) {
|
||||||
if (!empty($category_name)) {
|
if ( stristr($category_name,'/') ) {
|
||||||
if (stristr($category_name,'/')) {
|
|
||||||
$category_name = explode('/',$category_name);
|
$category_name = explode('/',$category_name);
|
||||||
if ($category_name[count($category_name)-1]) {
|
if ( $category_name[count($category_name)-1] )
|
||||||
$category_name = $category_name[count($category_name)-1]; // no trailing slash
|
$category_name = $category_name[count($category_name)-1]; // no trailing slash
|
||||||
} else {
|
else
|
||||||
$category_name = $category_name[count($category_name)-2]; // there was a trailling slash
|
$category_name = $category_name[count($category_name)-2]; // there was a trailling slash
|
||||||
}
|
}
|
||||||
}
|
|
||||||
$title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
|
$title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there's a month
|
// If there's a month
|
||||||
if(!empty($m)) {
|
if ( !empty($m) ) {
|
||||||
$my_year = substr($m, 0, 4);
|
$my_year = substr($m, 0, 4);
|
||||||
$my_month = $month[substr($m, 4, 2)];
|
$my_month = $month[substr($m, 4, 2)];
|
||||||
$title = "$my_year $sep $my_month";
|
$title = "$my_year $sep $my_month";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
if ( !empty($year) ) {
|
||||||
if (!empty($year)) {
|
|
||||||
$title = $year;
|
$title = $year;
|
||||||
if (!empty($monthnum)) {
|
if ( !empty($monthnum) )
|
||||||
$title .= " $sep ".$month[zeroise($monthnum, 2)];
|
$title .= " $sep ".$month[zeroise($monthnum, 2)];
|
||||||
}
|
if ( !empty($day) )
|
||||||
if (!empty($day)) {
|
|
||||||
$title .= " $sep ".zeroise($day, 2);
|
$title .= " $sep ".zeroise($day, 2);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// If there's a post
|
// If there is a post
|
||||||
if (is_single() || is_page()) {
|
if ( is_single() || is_page() ) {
|
||||||
$title = strip_tags($posts[0]->post_title);
|
$title = strip_tags($posts[0]->post_title);
|
||||||
$title = apply_filters('single_post_title', $title);
|
$title = apply_filters('single_post_title', $title);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send it out
|
// Send it out
|
||||||
if ($display && isset($title)) {
|
if ( $display && isset($title) )
|
||||||
echo " $sep $title";
|
echo " $sep $title";
|
||||||
} elseif (!$display && isset($title)) {
|
elseif ( !$display && isset($title) )
|
||||||
return " $sep $title";
|
return " $sep $title";
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function single_post_title($prefix = '', $display = true) {
|
function single_post_title($prefix = '', $display = true) {
|
||||||
global $wpdb;
|
global $wpdb;
|
||||||
$p = get_query_var('p');
|
$p = get_query_var('p');
|
||||||
$name = get_query_var('name');
|
$name = get_query_var('name');
|
||||||
if (intval($p) || '' != $name) {
|
|
||||||
if (!$p) {
|
if ( intval($p) || '' != $name ) {
|
||||||
|
if ( !$p )
|
||||||
$p = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_name = '$name'");
|
$p = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_name = '$name'");
|
||||||
}
|
|
||||||
$post = & get_post($p);
|
$post = & get_post($p);
|
||||||
$title = $post->post_title;
|
$title = $post->post_title;
|
||||||
$title = apply_filters('single_post_title', $title);
|
$title = apply_filters('single_post_title', $title);
|
||||||
if ($display) {
|
if ( $display )
|
||||||
echo $prefix.strip_tags($title);
|
echo $prefix.strip_tags($title);
|
||||||
} else {
|
else
|
||||||
return strip_tags($title);
|
return strip_tags($title);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function single_cat_title($prefix = '', $display = true ) {
|
function single_cat_title($prefix = '', $display = true ) {
|
||||||
$cat = intval( get_query_var('cat') );
|
$cat = intval( get_query_var('cat') );
|
||||||
if( !empty($cat) && !(strtoupper($cat) == 'ALL') ) {
|
if ( !empty($cat) && !(strtoupper($cat) == 'ALL') ) {
|
||||||
$my_cat_name = get_the_category_by_ID($cat);
|
$my_cat_name = get_the_category_by_ID($cat);
|
||||||
if( !empty($my_cat_name) ) {
|
if ( !empty($my_cat_name) ) {
|
||||||
if ($display)
|
if ( $display )
|
||||||
echo $prefix.strip_tags($my_cat_name);
|
echo $prefix.strip_tags($my_cat_name);
|
||||||
else
|
else
|
||||||
return strip_tags($my_cat_name);
|
return strip_tags($my_cat_name);
|
||||||
|
@ -221,58 +223,66 @@ function single_cat_title($prefix = '', $display = true ) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function single_month_title($prefix = '', $display = true ) {
|
function single_month_title($prefix = '', $display = true ) {
|
||||||
global $m, $monthnum, $month, $year;
|
global $m, $monthnum, $month, $year;
|
||||||
if(!empty($monthnum) && !empty($year)) {
|
if ( !empty($monthnum) && !empty($year) ) {
|
||||||
$my_year = $year;
|
$my_year = $year;
|
||||||
$my_month = $month[str_pad($monthnum, 2, '0', STR_PAD_LEFT)];
|
$my_month = $month[str_pad($monthnum, 2, '0', STR_PAD_LEFT)];
|
||||||
} elseif(!empty($m)) {
|
} elseif ( !empty($m) ) {
|
||||||
$my_year = substr($m, 0, 4);
|
$my_year = substr($m, 0, 4);
|
||||||
$my_month = $month[substr($m, 4, 2)];
|
$my_month = $month[substr($m, 4, 2)];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($my_month) && $display) {
|
if ( !empty($my_month) && $display )
|
||||||
echo $prefix . $my_month . $prefix . $my_year;
|
echo $prefix . $my_month . $prefix . $my_year;
|
||||||
} else {
|
else
|
||||||
return $monthnum;
|
return $monthnum;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* link navigation hack by Orien http://icecode.com/ */
|
/* link navigation hack by Orien http://icecode.com/ */
|
||||||
function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
|
function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
|
||||||
$text = wptexturize($text);
|
$text = wptexturize($text);
|
||||||
$title_text = wp_specialchars($text, 1);
|
$title_text = wp_specialchars($text, 1);
|
||||||
|
|
||||||
if ('link' == $format) {
|
if ('link' == $format)
|
||||||
return "\t<link rel='archives' title='$title_text' href='$url' />\n";
|
return "\t<link rel='archives' title='$title_text' href='$url' />\n";
|
||||||
} elseif ('option' == $format) {
|
elseif ('option' == $format)
|
||||||
return "\t<option value='$url'>$before $text $after</option>\n";
|
return "\t<option value='$url'>$before $text $after</option>\n";
|
||||||
} elseif ('html' == $format) {
|
elseif ('html' == $format)
|
||||||
return "\t<li>$before<a href='$url' title='$title_text'>$text</a>$after</li>\n";
|
return "\t<li>$before<a href='$url' title='$title_text'>$text</a>$after</li>\n";
|
||||||
} else { // custom
|
else // custom
|
||||||
return "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
|
return "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function wp_get_archives($args = '') {
|
function wp_get_archives($args = '') {
|
||||||
parse_str($args, $r);
|
parse_str($args, $r);
|
||||||
if (!isset($r['type'])) $r['type'] = '';
|
if ( !isset($r['type']) )
|
||||||
if (!isset($r['limit'])) $r['limit'] = '';
|
$r['type'] = '';
|
||||||
if (!isset($r['format'])) $r['format'] = 'html';
|
if ( !isset($r['limit']) )
|
||||||
if (!isset($r['before'])) $r['before'] = '';
|
$r['limit'] = '';
|
||||||
if (!isset($r['after'])) $r['after'] = '';
|
if ( !isset($r['format']) )
|
||||||
if (!isset($r['show_post_count'])) $r['show_post_count'] = false;
|
$r['format'] = 'html';
|
||||||
|
if ( !isset($r['before']) )
|
||||||
|
$r['before'] = '';
|
||||||
|
if ( !isset($r['after']) )
|
||||||
|
$r['after'] = '';
|
||||||
|
if ( !isset($r['show_post_count']) )
|
||||||
|
$r['show_post_count'] = false;
|
||||||
|
|
||||||
get_archives($r['type'], $r['limit'], $r['format'], $r['before'], $r['after'], $r['show_post_count']);
|
get_archives($r['type'], $r['limit'], $r['format'], $r['before'], $r['after'], $r['show_post_count']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
|
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
|
||||||
global $month, $wpdb;
|
global $month, $wpdb;
|
||||||
|
|
||||||
if ('' == $type) {
|
if ( '' == $type )
|
||||||
$type = 'monthly';
|
$type = 'monthly';
|
||||||
}
|
|
||||||
|
|
||||||
if ('' != $limit) {
|
if ( '' != $limit ) {
|
||||||
$limit = (int) $limit;
|
$limit = (int) $limit;
|
||||||
$limit = ' LIMIT '.$limit;
|
$limit = ' LIMIT '.$limit;
|
||||||
}
|
}
|
||||||
|
@ -289,7 +299,7 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
|
||||||
$archive_week_start_date_format = 'Y/m/d';
|
$archive_week_start_date_format = 'Y/m/d';
|
||||||
$archive_week_end_date_format = 'Y/m/d';
|
$archive_week_end_date_format = 'Y/m/d';
|
||||||
|
|
||||||
if (!$archive_date_format_over_ride) {
|
if ( !$archive_date_format_over_ride ) {
|
||||||
$archive_day_date_format = get_settings('date_format');
|
$archive_day_date_format = get_settings('date_format');
|
||||||
$archive_week_start_date_format = get_settings('date_format');
|
$archive_week_start_date_format = get_settings('date_format');
|
||||||
$archive_week_end_date_format = get_settings('date_format');
|
$archive_week_end_date_format = get_settings('date_format');
|
||||||
|
@ -300,13 +310,13 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
|
||||||
|
|
||||||
$now = current_time('mysql');
|
$now = current_time('mysql');
|
||||||
|
|
||||||
if ('monthly' == $type) {
|
if ( 'monthly' == $type ) {
|
||||||
$arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
|
$arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
|
||||||
if ($arcresults) {
|
if ( $arcresults ) {
|
||||||
$afterafter = $after;
|
$afterafter = $after;
|
||||||
foreach ($arcresults as $arcresult) {
|
foreach ( $arcresults as $arcresult ) {
|
||||||
$url = get_month_link($arcresult->year, $arcresult->month);
|
$url = get_month_link($arcresult->year, $arcresult->month);
|
||||||
if ($show_post_count) {
|
if ( $show_post_count ) {
|
||||||
$text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year);
|
$text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year);
|
||||||
$after = ' ('.$arcresult->posts.')' . $afterafter;
|
$after = ' ('.$arcresult->posts.')' . $afterafter;
|
||||||
} else {
|
} else {
|
||||||
|
@ -315,48 +325,45 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
|
||||||
echo get_archives_link($url, $text, $format, $before, $after);
|
echo get_archives_link($url, $text, $format, $before, $after);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ('daily' == $type) {
|
} elseif ( 'daily' == $type ) {
|
||||||
$arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
$arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
||||||
if ($arcresults) {
|
if ( $arcresults ) {
|
||||||
foreach ($arcresults as $arcresult) {
|
foreach ( $arcresults as $arcresult ) {
|
||||||
$url = get_day_link($arcresult->year, $arcresult->month, $arcresult->dayofmonth);
|
$url = get_day_link($arcresult->year, $arcresult->month, $arcresult->dayofmonth);
|
||||||
$date = sprintf("%d-%02d-%02d 00:00:00", $arcresult->year, $arcresult->month, $arcresult->dayofmonth);
|
$date = sprintf("%d-%02d-%02d 00:00:00", $arcresult->year, $arcresult->month, $arcresult->dayofmonth);
|
||||||
$text = mysql2date($archive_day_date_format, $date);
|
$text = mysql2date($archive_day_date_format, $date);
|
||||||
echo get_archives_link($url, $text, $format, $before, $after);
|
echo get_archives_link($url, $text, $format, $before, $after);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ('weekly' == $type) {
|
} elseif ( 'weekly' == $type ) {
|
||||||
$start_of_week = get_settings('start_of_week');
|
$start_of_week = get_settings('start_of_week');
|
||||||
$arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
$arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
||||||
$arc_w_last = '';
|
$arc_w_last = '';
|
||||||
if ($arcresults) {
|
if ( $arcresults ) {
|
||||||
foreach ($arcresults as $arcresult) {
|
foreach ( $arcresults as $arcresult ) {
|
||||||
if ($arcresult->week != $arc_w_last) {
|
if ( $arcresult->week != $arc_w_last ) {
|
||||||
$arc_year = $arcresult->yr;
|
$arc_year = $arcresult->yr;
|
||||||
$arc_w_last = $arcresult->week;
|
$arc_w_last = $arcresult->week;
|
||||||
$arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
|
$arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
|
||||||
$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
|
$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
|
||||||
$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
|
$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
|
||||||
$url = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?',
|
$url = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?', '=', $arc_year, '&', '=', $arcresult->week);
|
||||||
'=', $arc_year, '&',
|
|
||||||
'=', $arcresult->week);
|
|
||||||
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
|
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
|
||||||
echo get_archives_link($url, $text, $format, $before, $after);
|
echo get_archives_link($url, $text, $format, $before, $after);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ('postbypost' == $type) {
|
} elseif ( 'postbypost' == $type ) {
|
||||||
$arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
$arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
|
||||||
if ($arcresults) {
|
if ( $arcresults ) {
|
||||||
foreach ($arcresults as $arcresult) {
|
foreach ( $arcresults as $arcresult ) {
|
||||||
if ($arcresult->post_date != '0000-00-00 00:00:00') {
|
if ( $arcresult->post_date != '0000-00-00 00:00:00' ) {
|
||||||
$url = get_permalink($arcresult);
|
$url = get_permalink($arcresult);
|
||||||
$arc_title = $arcresult->post_title;
|
$arc_title = $arcresult->post_title;
|
||||||
if ($arc_title) {
|
if ( $arc_title )
|
||||||
$text = strip_tags($arc_title);
|
$text = strip_tags($arc_title);
|
||||||
} else {
|
else
|
||||||
$text = $arcresult->ID;
|
$text = $arcresult->ID;
|
||||||
}
|
|
||||||
echo get_archives_link($url, $text, $format, $before, $after);
|
echo get_archives_link($url, $text, $format, $before, $after);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -364,48 +371,48 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Used in get_calendar
|
// Used in get_calendar
|
||||||
function calendar_week_mod($num) {
|
function calendar_week_mod($num) {
|
||||||
$base = 7;
|
$base = 7;
|
||||||
return ($num - $base*floor($num/$base));
|
return ($num - $base*floor($num/$base));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_calendar($daylength = 1) {
|
function get_calendar($daylength = 1) {
|
||||||
global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $posts;
|
global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $posts;
|
||||||
|
|
||||||
// Quick check. If we have no posts at all, abort!
|
// Quick check. If we have no posts at all, abort!
|
||||||
if (!$posts) {
|
if ( !$posts ) {
|
||||||
$gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
|
$gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
|
||||||
if (!$gotsome)
|
if ( !$gotsome )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($_GET['w'])) {
|
if ( isset($_GET['w']) )
|
||||||
$w = ''.intval($_GET['w']);
|
$w = ''.intval($_GET['w']);
|
||||||
}
|
|
||||||
|
|
||||||
// week_begins = 0 stands for sunday
|
// week_begins = 0 stands for Sunday
|
||||||
$week_begins = intval(get_settings('start_of_week'));
|
$week_begins = intval(get_settings('start_of_week'));
|
||||||
$add_hours = intval(get_settings('gmt_offset'));
|
$add_hours = intval(get_settings('gmt_offset'));
|
||||||
$add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
|
$add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
|
||||||
|
|
||||||
// Let's figure out when we are
|
// Let's figure out when we are
|
||||||
if (!empty($monthnum) && !empty($year)) {
|
if ( !empty($monthnum) && !empty($year) ) {
|
||||||
$thismonth = ''.zeroise(intval($monthnum), 2);
|
$thismonth = ''.zeroise(intval($monthnum), 2);
|
||||||
$thisyear = ''.intval($year);
|
$thisyear = ''.intval($year);
|
||||||
} elseif (!empty($w)) {
|
} elseif ( !empty($w) ) {
|
||||||
// We need to get the month from MySQL
|
// We need to get the month from MySQL
|
||||||
$thisyear = ''.intval(substr($m, 0, 4));
|
$thisyear = ''.intval(substr($m, 0, 4));
|
||||||
$d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
|
$d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
|
||||||
$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
|
$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
|
||||||
} elseif (!empty($m)) {
|
} elseif ( !empty($m) ) {
|
||||||
$calendar = substr($m, 0, 6);
|
$calendar = substr($m, 0, 6);
|
||||||
$thisyear = ''.intval(substr($m, 0, 4));
|
$thisyear = ''.intval(substr($m, 0, 4));
|
||||||
if (strlen($m) < 6) {
|
if ( strlen($m) < 6 )
|
||||||
$thismonth = '01';
|
$thismonth = '01';
|
||||||
} else {
|
else
|
||||||
$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
|
$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
$thisyear = gmdate('Y', current_time('timestamp') + get_settings('gmt_offset') * 3600);
|
$thisyear = gmdate('Y', current_time('timestamp') + get_settings('gmt_offset') * 3600);
|
||||||
$thismonth = gmdate('m', current_time('timestamp') + get_settings('gmt_offset') * 3600);
|
$thismonth = gmdate('m', current_time('timestamp') + get_settings('gmt_offset') * 3600);
|
||||||
|
@ -434,17 +441,16 @@ function get_calendar($daylength = 1) {
|
||||||
<tr>';
|
<tr>';
|
||||||
|
|
||||||
$day_abbrev = $weekday_initial;
|
$day_abbrev = $weekday_initial;
|
||||||
if ($daylength > 1) {
|
if ( $daylength > 1 )
|
||||||
$day_abbrev = $weekday_abbrev;
|
$day_abbrev = $weekday_abbrev;
|
||||||
}
|
|
||||||
|
|
||||||
$myweek = array();
|
$myweek = array();
|
||||||
|
|
||||||
for ($wdcount=0; $wdcount<=6; $wdcount++) {
|
for ( $wdcount=0; $wdcount<=6; $wdcount++ ) {
|
||||||
$myweek[]=$weekday[($wdcount+$week_begins)%7];
|
$myweek[]=$weekday[($wdcount+$week_begins)%7];
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($myweek as $wd) {
|
foreach ( $myweek as $wd ) {
|
||||||
echo "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">" . $day_abbrev[$wd] . '</th>';
|
echo "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">" . $day_abbrev[$wd] . '</th>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -455,7 +461,7 @@ function get_calendar($daylength = 1) {
|
||||||
<tfoot>
|
<tfoot>
|
||||||
<tr>';
|
<tr>';
|
||||||
|
|
||||||
if ($previous) {
|
if ( $previous ) {
|
||||||
echo "\n\t\t".'<td abbr="' . $month[zeroise($previous->month, 2)] . '" colspan="3" id="prev"><a href="' .
|
echo "\n\t\t".'<td abbr="' . $month[zeroise($previous->month, 2)] . '" colspan="3" id="prev"><a href="' .
|
||||||
get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $month[zeroise($previous->month, 2)], date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">« ' . $month_abbrev[$month[zeroise($previous->month, 2)]] . '</a></td>';
|
get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $month[zeroise($previous->month, 2)], date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">« ' . $month_abbrev[$month[zeroise($previous->month, 2)]] . '</a></td>';
|
||||||
} else {
|
} else {
|
||||||
|
@ -464,7 +470,7 @@ function get_calendar($daylength = 1) {
|
||||||
|
|
||||||
echo "\n\t\t".'<td class="pad"> </td>';
|
echo "\n\t\t".'<td class="pad"> </td>';
|
||||||
|
|
||||||
if ($next) {
|
if ( $next ) {
|
||||||
echo "\n\t\t".'<td abbr="' . $month[zeroise($next->month, 2)] . '" colspan="3" id="next"><a href="' .
|
echo "\n\t\t".'<td abbr="' . $month[zeroise($next->month, 2)] . '" colspan="3" id="next"><a href="' .
|
||||||
get_month_link($next->year, $next->month) . '" title="View posts for ' . $month[zeroise($next->month, 2)] . ' ' .
|
get_month_link($next->year, $next->month) . '" title="View posts for ' . $month[zeroise($next->month, 2)] . ' ' .
|
||||||
date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year)) . '">' . $month_abbrev[$month[zeroise($next->month, 2)]] . ' »</a></td>';
|
date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year)) . '">' . $month_abbrev[$month[zeroise($next->month, 2)]] . ' »</a></td>';
|
||||||
|
@ -485,8 +491,8 @@ function get_calendar($daylength = 1) {
|
||||||
AND YEAR(post_date) = $thisyear
|
AND YEAR(post_date) = $thisyear
|
||||||
AND post_status = 'publish'
|
AND post_status = 'publish'
|
||||||
AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
|
AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
|
||||||
if ($dayswithposts) {
|
if ( $dayswithposts ) {
|
||||||
foreach ($dayswithposts as $daywith) {
|
foreach ( $dayswithposts as $daywith ) {
|
||||||
$daywithpost[] = $daywith[0];
|
$daywithpost[] = $daywith[0];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -495,13 +501,10 @@ function get_calendar($daylength = 1) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') ||
|
if ( strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') )
|
||||||
strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') ||
|
|
||||||
strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari')) {
|
|
||||||
$ak_title_separator = "\n";
|
$ak_title_separator = "\n";
|
||||||
} else {
|
else
|
||||||
$ak_title_separator = ', ';
|
$ak_title_separator = ', ';
|
||||||
}
|
|
||||||
|
|
||||||
$ak_titles_for_day = array();
|
$ak_titles_for_day = array();
|
||||||
$ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
|
$ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
|
||||||
|
@ -511,60 +514,59 @@ function get_calendar($daylength = 1) {
|
||||||
."AND post_date < '".current_time('mysql')."' "
|
."AND post_date < '".current_time('mysql')."' "
|
||||||
."AND post_status = 'publish'"
|
."AND post_status = 'publish'"
|
||||||
);
|
);
|
||||||
if ($ak_post_titles) {
|
if ( $ak_post_titles ) {
|
||||||
foreach ($ak_post_titles as $ak_post_title) {
|
foreach ( $ak_post_titles as $ak_post_title ) {
|
||||||
if (empty($ak_titles_for_day['day_'.$ak_post_title->dom])) {
|
if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
|
||||||
$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
|
$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
|
||||||
}
|
if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
|
||||||
if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one
|
|
||||||
$ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '"', wptexturize($ak_post_title->post_title));
|
$ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '"', wptexturize($ak_post_title->post_title));
|
||||||
} else {
|
else
|
||||||
$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '"', wptexturize($ak_post_title->post_title));
|
$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '"', wptexturize($ak_post_title->post_title));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// See how much we should pad in the beginning
|
// See how much we should pad in the beginning
|
||||||
$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
|
$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
|
||||||
if (0 != $pad) echo "\n\t\t".'<td colspan="'.$pad.'" class="pad"> </td>';
|
if ( 0 != $pad )
|
||||||
|
echo "\n\t\t".'<td colspan="'.$pad.'" class="pad"> </td>';
|
||||||
|
|
||||||
$daysinmonth = intval(date('t', $unixmonth));
|
$daysinmonth = intval(date('t', $unixmonth));
|
||||||
for ($day = 1; $day <= $daysinmonth; ++$day) {
|
for ( $day = 1; $day <= $daysinmonth; ++$day ) {
|
||||||
if (isset($newrow) && $newrow)
|
if ( isset($newrow) && $newrow )
|
||||||
echo "\n\t</tr>\n\t<tr>\n\t\t";
|
echo "\n\t</tr>\n\t<tr>\n\t\t";
|
||||||
$newrow = false;
|
$newrow = false;
|
||||||
|
|
||||||
if ($day == gmdate('j', (time() + (get_settings('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_settings('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_settings('gmt_offset') * 3600)))
|
if ( $day == gmdate('j', (time() + (get_settings('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_settings('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_settings('gmt_offset') * 3600)) )
|
||||||
echo '<td id="today">';
|
echo '<td id="today">';
|
||||||
else
|
else
|
||||||
echo '<td>';
|
echo '<td>';
|
||||||
|
|
||||||
if (in_array($day, $daywithpost)) { // any posts today?
|
if ( in_array($day, $daywithpost) ) // any posts today?
|
||||||
echo '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>";
|
echo '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>";
|
||||||
} else {
|
else
|
||||||
echo $day;
|
echo $day;
|
||||||
}
|
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
if (6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins))
|
if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
|
||||||
$newrow = true;
|
$newrow = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
|
$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
|
||||||
if ($pad != 0 && $pad != 7)
|
if ( $pad != 0 && $pad != 7 )
|
||||||
echo "\n\t\t".'<td class="pad" colspan="'.$pad.'"> </td>';
|
echo "\n\t\t".'<td class="pad" colspan="'.$pad.'"> </td>';
|
||||||
|
|
||||||
echo "\n\t</tr>\n\t</tbody>\n\t</table>";
|
echo "\n\t</tr>\n\t</tbody>\n\t</table>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function allowed_tags() {
|
function allowed_tags() {
|
||||||
global $allowedtags;
|
global $allowedtags;
|
||||||
$allowed = '';
|
$allowed = '';
|
||||||
foreach($allowedtags as $tag => $attributes) {
|
foreach ( $allowedtags as $tag => $attributes ) {
|
||||||
$allowed .= '<'.$tag;
|
$allowed .= '<'.$tag;
|
||||||
if (0 < count($attributes)) {
|
if ( 0 < count($attributes) ) {
|
||||||
foreach ($attributes as $attribute => $limits) {
|
foreach ( $attributes as $attribute => $limits ) {
|
||||||
$allowed .= ' '.$attribute.'=""';
|
$allowed .= ' '.$attribute.'=""';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -573,39 +575,42 @@ function allowed_tags() {
|
||||||
return htmlentities($allowed);
|
return htmlentities($allowed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***** Date/Time tags *****/
|
/***** Date/Time tags *****/
|
||||||
|
|
||||||
|
|
||||||
function the_date_xml() {
|
function the_date_xml() {
|
||||||
global $post;
|
global $post;
|
||||||
echo mysql2date('Y-m-d', $post->post_date);
|
echo mysql2date('Y-m-d', $post->post_date);
|
||||||
//echo ""+$post->post_date;
|
//echo ""+$post->post_date;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function the_date($d='', $before='', $after='', $echo = true) {
|
function the_date($d='', $before='', $after='', $echo = true) {
|
||||||
global $id, $post, $day, $previousday, $newday;
|
global $id, $post, $day, $previousday, $newday;
|
||||||
$the_date = '';
|
$the_date = '';
|
||||||
if ($day != $previousday) {
|
if ( $day != $previousday ) {
|
||||||
$the_date .= $before;
|
$the_date .= $before;
|
||||||
if ($d=='') {
|
if ( $d=='' )
|
||||||
$the_date .= mysql2date(get_settings('date_format'), $post->post_date);
|
$the_date .= mysql2date(get_settings('date_format'), $post->post_date);
|
||||||
} else {
|
else
|
||||||
$the_date .= mysql2date($d, $post->post_date);
|
$the_date .= mysql2date($d, $post->post_date);
|
||||||
}
|
|
||||||
$the_date .= $after;
|
$the_date .= $after;
|
||||||
$previousday = $day;
|
$previousday = $day;
|
||||||
}
|
}
|
||||||
$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
|
$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
|
||||||
if ($echo) {
|
if ( $echo )
|
||||||
echo $the_date;
|
echo $the_date;
|
||||||
} else {
|
else
|
||||||
return $the_date;
|
return $the_date;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function the_time( $d = '' ) {
|
function the_time( $d = '' ) {
|
||||||
echo apply_filters('the_time', get_the_time( $d ), $d);
|
echo apply_filters('the_time', get_the_time( $d ), $d);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_the_time( $d = '' ) {
|
function get_the_time( $d = '' ) {
|
||||||
if ( '' == $d )
|
if ( '' == $d )
|
||||||
$the_time = get_post_time(get_settings('time_format'));
|
$the_time = get_post_time(get_settings('time_format'));
|
||||||
|
@ -614,6 +619,7 @@ function get_the_time( $d = '' ) {
|
||||||
return apply_filters('get_the_time', $the_time, $d);
|
return apply_filters('get_the_time', $the_time, $d);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_post_time( $d = 'U', $gmt = false ) { // returns timestamp
|
function get_post_time( $d = 'U', $gmt = false ) { // returns timestamp
|
||||||
global $post;
|
global $post;
|
||||||
if ( $gmt )
|
if ( $gmt )
|
||||||
|
@ -625,6 +631,7 @@ function get_post_time( $d = 'U', $gmt = false ) { // returns timestamp
|
||||||
return apply_filters('get_the_time', $time, $d, $gmt);
|
return apply_filters('get_the_time', $time, $d, $gmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function the_weekday() {
|
function the_weekday() {
|
||||||
global $weekday, $id, $post;
|
global $weekday, $id, $post;
|
||||||
$the_weekday = $weekday[mysql2date('w', $post->post_date)];
|
$the_weekday = $weekday[mysql2date('w', $post->post_date)];
|
||||||
|
@ -632,10 +639,11 @@ function the_weekday() {
|
||||||
echo $the_weekday;
|
echo $the_weekday;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function the_weekday_date($before='',$after='') {
|
function the_weekday_date($before='',$after='') {
|
||||||
global $weekday, $id, $post, $day, $previousweekday;
|
global $weekday, $id, $post, $day, $previousweekday;
|
||||||
$the_weekday_date = '';
|
$the_weekday_date = '';
|
||||||
if ($day != $previousweekday) {
|
if ( $day != $previousweekday ) {
|
||||||
$the_weekday_date .= $before;
|
$the_weekday_date .= $before;
|
||||||
$the_weekday_date .= $weekday[mysql2date('w', $post->post_date)];
|
$the_weekday_date .= $weekday[mysql2date('w', $post->post_date)];
|
||||||
$the_weekday_date .= $after;
|
$the_weekday_date .= $after;
|
||||||
|
|
|
@ -1,27 +1,31 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
function the_permalink() {
|
function the_permalink() {
|
||||||
echo apply_filters('the_permalink', get_permalink());
|
echo apply_filters('the_permalink', get_permalink());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function permalink_link() { // For backwards compatibility
|
function permalink_link() { // For backwards compatibility
|
||||||
echo apply_filters('the_permalink', get_permalink());
|
echo apply_filters('the_permalink', get_permalink());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function permalink_anchor($mode = 'id') {
|
function permalink_anchor($mode = 'id') {
|
||||||
global $id, $post;
|
global $post;
|
||||||
switch(strtolower($mode)) {
|
switch ( strtolower($mode) ) {
|
||||||
case 'title':
|
case 'title':
|
||||||
$title = sanitize_title($post->post_title) . '-' . $id;
|
$title = sanitize_title($post->post_title) . '-' . $id;
|
||||||
echo '<a id="'.$title.'"></a>';
|
echo '<a id="'.$title.'"></a>';
|
||||||
break;
|
break;
|
||||||
case 'id':
|
case 'id':
|
||||||
default:
|
default:
|
||||||
echo '<a id="post-'.$id.'"></a>';
|
echo '<a id="post-' . $post->ID . '"></a>';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function get_permalink($id = 0) {
|
function get_permalink($id = 0) {
|
||||||
$rewritecode = array(
|
$rewritecode = array(
|
||||||
'%year%',
|
'%year%',
|
||||||
|
@ -37,21 +41,21 @@ function get_permalink($id = 0) {
|
||||||
'%pagename%'
|
'%pagename%'
|
||||||
);
|
);
|
||||||
|
|
||||||
$post = & get_post($id);
|
$post = &get_post($id);
|
||||||
if ($post->post_status == 'static') {
|
if ( $post->post_status == 'static' )
|
||||||
return get_page_link($post->ID);
|
return get_page_link($post->ID);
|
||||||
}
|
|
||||||
|
|
||||||
$permalink = get_settings('permalink_structure');
|
$permalink = get_settings('permalink_structure');
|
||||||
|
|
||||||
if ('' != $permalink && 'draft' != $post->post_status) {
|
if ( '' != $permalink && 'draft' != $post->post_status ) {
|
||||||
$unixtime = strtotime($post->post_date);
|
$unixtime = strtotime($post->post_date);
|
||||||
|
|
||||||
$category = '';
|
$category = '';
|
||||||
if (strstr($permalink, '%category%')) {
|
if ( strstr($permalink, '%category%') ) {
|
||||||
$cats = get_the_category($post->ID);
|
$cats = get_the_category($post->ID);
|
||||||
$category = $cats[0]->category_nicename;
|
$category = $cats[0]->category_nicename;
|
||||||
if ($parent=$cats[0]->category_parent) $category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
|
if ( $parent=$cats[0]->category_parent )
|
||||||
|
$category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
|
||||||
}
|
}
|
||||||
|
|
||||||
$authordata = get_userdata($post->post_author);
|
$authordata = get_userdata($post->post_author);
|
||||||
|
@ -80,13 +84,12 @@ function get_permalink($id = 0) {
|
||||||
function get_page_link($id = false) {
|
function get_page_link($id = false) {
|
||||||
global $post, $wp_rewrite;
|
global $post, $wp_rewrite;
|
||||||
|
|
||||||
if (! $id) {
|
if ( !$id )
|
||||||
$id = $post->ID;
|
$id = $post->ID;
|
||||||
}
|
|
||||||
|
|
||||||
$pagestruct = $wp_rewrite->get_page_permastruct();
|
$pagestruct = $wp_rewrite->get_page_permastruct();
|
||||||
|
|
||||||
if ('' != $pagestruct) {
|
if ( '' != $pagestruct ) {
|
||||||
$link = get_page_uri($id);
|
$link = get_page_uri($id);
|
||||||
$link = str_replace('%pagename%', $link, $pagestruct);
|
$link = str_replace('%pagename%', $link, $pagestruct);
|
||||||
$link = get_settings('home') . "/$link/";
|
$link = get_settings('home') . "/$link/";
|
||||||
|
@ -99,9 +102,10 @@ function get_page_link($id = false) {
|
||||||
|
|
||||||
function get_year_link($year) {
|
function get_year_link($year) {
|
||||||
global $wp_rewrite;
|
global $wp_rewrite;
|
||||||
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
if ( !$year )
|
||||||
|
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
||||||
$yearlink = $wp_rewrite->get_year_permastruct();
|
$yearlink = $wp_rewrite->get_year_permastruct();
|
||||||
if (!empty($yearlink)) {
|
if ( !empty($yearlink) ) {
|
||||||
$yearlink = str_replace('%year%', $year, $yearlink);
|
$yearlink = str_replace('%year%', $year, $yearlink);
|
||||||
return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
|
return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
|
||||||
} else {
|
} else {
|
||||||
|
@ -111,10 +115,12 @@ function get_year_link($year) {
|
||||||
|
|
||||||
function get_month_link($year, $month) {
|
function get_month_link($year, $month) {
|
||||||
global $wp_rewrite;
|
global $wp_rewrite;
|
||||||
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
if ( !$year )
|
||||||
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
|
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
||||||
|
if ( !$month )
|
||||||
|
$month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
|
||||||
$monthlink = $wp_rewrite->get_month_permastruct();
|
$monthlink = $wp_rewrite->get_month_permastruct();
|
||||||
if (!empty($monthlink)) {
|
if ( !empty($monthlink) ) {
|
||||||
$monthlink = str_replace('%year%', $year, $monthlink);
|
$monthlink = str_replace('%year%', $year, $monthlink);
|
||||||
$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
|
$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
|
||||||
return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
|
return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
|
||||||
|
@ -125,12 +131,15 @@ function get_month_link($year, $month) {
|
||||||
|
|
||||||
function get_day_link($year, $month, $day) {
|
function get_day_link($year, $month, $day) {
|
||||||
global $wp_rewrite;
|
global $wp_rewrite;
|
||||||
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
if ( !$year )
|
||||||
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
|
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
|
||||||
if (!$day) $day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
|
if ( !$month )
|
||||||
|
$month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
|
||||||
|
if ( !$day )
|
||||||
|
$day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
|
||||||
|
|
||||||
$daylink = $wp_rewrite->get_day_permastruct();
|
$daylink = $wp_rewrite->get_day_permastruct();
|
||||||
if (!empty($daylink)) {
|
if ( !empty($daylink) ) {
|
||||||
$daylink = str_replace('%year%', $year, $daylink);
|
$daylink = str_replace('%year%', $year, $daylink);
|
||||||
$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
|
$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
|
||||||
$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
|
$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
|
||||||
|
@ -147,7 +156,7 @@ function get_feed_link($feed='rss2') {
|
||||||
$comment_feed_url = $feed_url;
|
$comment_feed_url = $feed_url;
|
||||||
|
|
||||||
$permalink = $wp_rewrite->get_feed_permastruct();
|
$permalink = $wp_rewrite->get_feed_permastruct();
|
||||||
if ('' != $permalink) {
|
if ( '' != $permalink ) {
|
||||||
if ( false !== strpos($feed, 'comments_') ) {
|
if ( false !== strpos($feed, 'comments_') ) {
|
||||||
$feed = str_replace('comments_', '', $feed);
|
$feed = str_replace('comments_', '', $feed);
|
||||||
$permalink = $wp_rewrite->get_comment_feed_permastruct();
|
$permalink = $wp_rewrite->get_comment_feed_permastruct();
|
||||||
|
@ -174,9 +183,8 @@ function edit_post_link($link = 'Edit This', $before = '', $after = '') {
|
||||||
|
|
||||||
get_currentuserinfo();
|
get_currentuserinfo();
|
||||||
|
|
||||||
if (!user_can_edit_post($user_ID, $post->ID)) {
|
if ( !user_can_edit_post($user_ID, $post->ID) )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
|
$location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
|
||||||
echo $before . "<a href=\"$location\">$link</a>" . $after;
|
echo $before . "<a href=\"$location\">$link</a>" . $after;
|
||||||
|
@ -187,9 +195,8 @@ function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
|
||||||
|
|
||||||
get_currentuserinfo();
|
get_currentuserinfo();
|
||||||
|
|
||||||
if (!user_can_edit_post_comments($user_ID, $post->ID)) {
|
if ( !user_can_edit_post_comments($user_ID, $post->ID) )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&comment=$comment->comment_ID";
|
$location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&comment=$comment->comment_ID";
|
||||||
echo $before . "<a href='$location'>$link</a>" . $after;
|
echo $before . "<a href='$location'>$link</a>" . $after;
|
||||||
|
@ -200,27 +207,26 @@ function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
|
||||||
function get_previous_post($in_same_cat = false, $excluded_categories = '') {
|
function get_previous_post($in_same_cat = false, $excluded_categories = '') {
|
||||||
global $post, $wpdb;
|
global $post, $wpdb;
|
||||||
|
|
||||||
if(! is_single()) {
|
if ( !is_single() )
|
||||||
return null;
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
$current_post_date = $post->post_date;
|
$current_post_date = $post->post_date;
|
||||||
|
|
||||||
$join = '';
|
$join = '';
|
||||||
if ($in_same_cat) {
|
if ( $in_same_cat ) {
|
||||||
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
|
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
|
||||||
$cat_array = get_the_category($post->ID);
|
$cat_array = get_the_category($post->ID);
|
||||||
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID);
|
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID);
|
||||||
for ($i = 1; $i < (count($cat_array)); $i++) {
|
for ( $i = 1; $i < (count($cat_array)); $i++ ) {
|
||||||
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID);
|
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID);
|
||||||
}
|
}
|
||||||
$join .= ')';
|
$join .= ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_exclude_cats = '';
|
$sql_exclude_cats = '';
|
||||||
if (!empty($excluded_categories)) {
|
if ( !empty($excluded_categories) ) {
|
||||||
$blah = explode('and', $excluded_categories);
|
$blah = explode('and', $excluded_categories);
|
||||||
foreach($blah as $category) {
|
foreach ( $blah as $category ) {
|
||||||
$category = intval($category);
|
$category = intval($category);
|
||||||
$sql_exclude_cats .= " AND post_category != $category";
|
$sql_exclude_cats .= " AND post_category != $category";
|
||||||
}
|
}
|
||||||
|
@ -232,27 +238,26 @@ function get_previous_post($in_same_cat = false, $excluded_categories = '') {
|
||||||
function get_next_post($in_same_cat = false, $excluded_categories = '') {
|
function get_next_post($in_same_cat = false, $excluded_categories = '') {
|
||||||
global $post, $wpdb;
|
global $post, $wpdb;
|
||||||
|
|
||||||
if(! is_single()) {
|
if ( !is_single() )
|
||||||
return null;
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
$current_post_date = $post->post_date;
|
$current_post_date = $post->post_date;
|
||||||
|
|
||||||
$join = '';
|
$join = '';
|
||||||
if ($in_same_cat) {
|
if ( $in_same_cat ) {
|
||||||
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
|
$join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id ";
|
||||||
$cat_array = get_the_category($post->ID);
|
$cat_array = get_the_category($post->ID);
|
||||||
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID);
|
$join .= ' AND (category_id = ' . intval($cat_array[0]->cat_ID);
|
||||||
for ($i = 1; $i < (count($cat_array)); $i++) {
|
for ( $i = 1; $i < (count($cat_array)); $i++ ) {
|
||||||
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID);
|
$join .= ' OR category_id = ' . intval($cat_array[$i]->cat_ID);
|
||||||
}
|
}
|
||||||
$join .= ')';
|
$join .= ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_exclude_cats = '';
|
$sql_exclude_cats = '';
|
||||||
if (!empty($excluded_categories)) {
|
if ( !empty($excluded_categories) ) {
|
||||||
$blah = explode('and', $excluded_categories);
|
$blah = explode('and', $excluded_categories);
|
||||||
foreach($blah as $category) {
|
foreach ( $blah as $category ) {
|
||||||
$category = intval($category);
|
$category = intval($category);
|
||||||
$sql_exclude_cats .= " AND post_category != $category";
|
$sql_exclude_cats .= " AND post_category != $category";
|
||||||
}
|
}
|
||||||
|
@ -263,21 +268,17 @@ function get_next_post($in_same_cat = false, $excluded_categories = '') {
|
||||||
return @$wpdb->get_row("SELECT ID,post_title FROM $wpdb->posts $join WHERE post_date > '$current_post_date' AND post_date < '$now' AND post_status = 'publish' $sqlcat $sql_exclude_cats AND ID != $post->ID ORDER BY post_date ASC LIMIT 1");
|
return @$wpdb->get_row("SELECT ID,post_title FROM $wpdb->posts $join WHERE post_date > '$current_post_date' AND post_date < '$now' AND post_status = 'publish' $sqlcat $sql_exclude_cats AND ID != $post->ID ORDER BY post_date ASC LIMIT 1");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function previous_post_link($format='« %link', $link='%title', $in_same_cat = false, $excluded_categories = '') {
|
function previous_post_link($format='« %link', $link='%title', $in_same_cat = false, $excluded_categories = '') {
|
||||||
$post = get_previous_post($in_same_cat, $excluded_categories);
|
$post = get_previous_post($in_same_cat, $excluded_categories);
|
||||||
|
|
||||||
if(! $post) {
|
if ( !$post )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$title = apply_filters('the_title', $post->post_title, $post);
|
$title = apply_filters('the_title', $post->post_title, $post);
|
||||||
|
|
||||||
$string = '<a href="'.get_permalink($post->ID).'">';
|
$string = '<a href="'.get_permalink($post->ID).'">';
|
||||||
|
|
||||||
$link = str_replace('%title', $title, $link);
|
$link = str_replace('%title', $title, $link);
|
||||||
|
|
||||||
$link = $string . $link . '</a>';
|
$link = $string . $link . '</a>';
|
||||||
|
|
||||||
$format = str_replace('%link', $link, $format);
|
$format = str_replace('%link', $link, $format);
|
||||||
|
|
||||||
echo $format;
|
echo $format;
|
||||||
|
@ -286,23 +287,19 @@ function previous_post_link($format='« %link', $link='%title', $in_same_ca
|
||||||
function next_post_link($format='%link »', $link='%title', $in_same_cat = false, $excluded_categories = '') {
|
function next_post_link($format='%link »', $link='%title', $in_same_cat = false, $excluded_categories = '') {
|
||||||
$post = get_next_post($in_same_cat, $excluded_categories);
|
$post = get_next_post($in_same_cat, $excluded_categories);
|
||||||
|
|
||||||
if(! $post) {
|
if ( !$post )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$title = apply_filters('the_title', $post->post_title, $post);
|
$title = apply_filters('the_title', $post->post_title, $post);
|
||||||
|
|
||||||
$string = '<a href="'.get_permalink($post->ID).'">';
|
$string = '<a href="'.get_permalink($post->ID).'">';
|
||||||
|
|
||||||
$link = str_replace('%title', $title, $link);
|
$link = str_replace('%title', $title, $link);
|
||||||
|
|
||||||
$link = $string . $link . '</a>';
|
$link = $string . $link . '</a>';
|
||||||
|
|
||||||
$format = str_replace('%link', $link, $format);
|
$format = str_replace('%link', $link, $format);
|
||||||
|
|
||||||
echo $format;
|
echo $format;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Deprecated. Use previous_post_link().
|
// Deprecated. Use previous_post_link().
|
||||||
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
|
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
|
||||||
|
|
||||||
|
@ -313,14 +310,12 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $
|
||||||
|
|
||||||
$post = get_previous_post($in_same_cat, $excluded_categories);
|
$post = get_previous_post($in_same_cat, $excluded_categories);
|
||||||
|
|
||||||
if(! $post) {
|
if ( !$post )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
|
$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
|
||||||
if ($title == 'yes') {
|
if ( 'yes' == $title )
|
||||||
$string .= apply_filters('the_title', $post->post_title, $post);
|
$string .= apply_filters('the_title', $post->post_title, $post);
|
||||||
}
|
|
||||||
$string .= '</a>';
|
$string .= '</a>';
|
||||||
$format = str_replace('%', $string, $format);
|
$format = str_replace('%', $string, $format);
|
||||||
echo $format;
|
echo $format;
|
||||||
|
@ -336,14 +331,12 @@ function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat=
|
||||||
|
|
||||||
$post = get_next_post($in_same_cat, $excluded_categories);
|
$post = get_next_post($in_same_cat, $excluded_categories);
|
||||||
|
|
||||||
if(! $post) {
|
if ( !$post )
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$string = '<a href="'.get_permalink($post->ID).'">'.$next;
|
$string = '<a href="'.get_permalink($post->ID).'">'.$next;
|
||||||
if ($title=='yes') {
|
if ( 'yes' == $title )
|
||||||
$string .= apply_filters('the_title', $post->post_title, $nextpost);
|
$string .= apply_filters('the_title', $post->post_title, $nextpost);
|
||||||
}
|
|
||||||
$string .= '</a>';
|
$string .= '</a>';
|
||||||
$format = str_replace('%', $string, $format);
|
$format = str_replace('%', $string, $format);
|
||||||
echo $format;
|
echo $format;
|
||||||
|
@ -370,11 +363,11 @@ function get_pagenum_link($pagenum = 1) {
|
||||||
$index = preg_replace('|^/+|', '', $index);
|
$index = preg_replace('|^/+|', '', $index);
|
||||||
|
|
||||||
// if we already have a QUERY style page string
|
// if we already have a QUERY style page string
|
||||||
if( stristr( $qstr, $page_querystring ) ) {
|
if ( stristr( $qstr, $page_querystring ) ) {
|
||||||
$replacement = "$page_querystring=$pagenum";
|
$replacement = "$page_querystring=$pagenum";
|
||||||
$qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
|
$qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
|
||||||
// if we already have a mod_rewrite style page string
|
// if we already have a mod_rewrite style page string
|
||||||
} elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ){
|
} elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ) {
|
||||||
$permalink = 1;
|
$permalink = 1;
|
||||||
$qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr);
|
$qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr);
|
||||||
|
|
||||||
|
@ -383,23 +376,22 @@ function get_pagenum_link($pagenum = 1) {
|
||||||
} else {
|
} else {
|
||||||
// we need to know the way queries are being written
|
// we need to know the way queries are being written
|
||||||
// if there's a querystring_start (a "?" usually), it's definitely not mod_rewritten
|
// if there's a querystring_start (a "?" usually), it's definitely not mod_rewritten
|
||||||
if ( stristr( $qstr, '?' ) ){
|
if ( stristr( $qstr, '?' ) ) {
|
||||||
// so append the query string (using &, since we already have ?)
|
// so append the query string (using &, since we already have ?)
|
||||||
$qstr .= '&' . $page_querystring . '=' . $pagenum;
|
$qstr .= '&' . $page_querystring . '=' . $pagenum;
|
||||||
// otherwise, it could be rewritten, OR just the default index ...
|
// otherwise, it could be rewritten, OR just the default index ...
|
||||||
} elseif( '' != get_settings('permalink_structure') && ! is_admin()) {
|
} elseif( '' != get_settings('permalink_structure') && ! is_admin() ) {
|
||||||
$permalink = 1;
|
$permalink = 1;
|
||||||
$index = $wp_rewrite->index;
|
$index = $wp_rewrite->index;
|
||||||
// If it's not a path info permalink structure, trim the index.
|
// If it's not a path info permalink structure, trim the index.
|
||||||
if (! $wp_rewrite->using_index_permalinks()) {
|
if ( !$wp_rewrite->using_index_permalinks() ) {
|
||||||
$qstr = preg_replace("#/*" . $index . "/*#", '/', $qstr);
|
$qstr = preg_replace("#/*" . $index . "/*#", '/', $qstr);
|
||||||
} else {
|
} else {
|
||||||
// If using path info style permalinks, make sure the index is in
|
// If using path info style permalinks, make sure the index is in
|
||||||
// the URI.
|
// the URI.
|
||||||
if (strpos($qstr, $index) === false) {
|
if ( strpos($qstr, $index) === false )
|
||||||
$qstr = '/' . $index . $qstr;
|
$qstr = '/' . $index . $qstr;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$qstr = trailingslashit($qstr) . $page_modstring . $pagenum;
|
$qstr = trailingslashit($qstr) . $page_modstring . $pagenum;
|
||||||
} else {
|
} else {
|
||||||
|
@ -408,11 +400,12 @@ function get_pagenum_link($pagenum = 1) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$qstr = preg_replace('|^/+|', '', $qstr);
|
$qstr = preg_replace('|^/+|', '', $qstr);
|
||||||
if ($permalink) $qstr = trailingslashit($qstr);
|
if ( $permalink )
|
||||||
|
$qstr = trailingslashit($qstr);
|
||||||
$qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
|
$qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
|
||||||
|
|
||||||
// showing /page/1/ or ?paged=1 is redundant
|
// showing /page/1/ or ?paged=1 is redundant
|
||||||
if ($pagenum === 1) {
|
if ( 1 === $pagenum ) {
|
||||||
$qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style
|
$qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style
|
||||||
$qstr = remove_query_arg('paged', $qstr); // for query style
|
$qstr = remove_query_arg('paged', $qstr); // for query style
|
||||||
}
|
}
|
||||||
|
@ -422,18 +415,18 @@ function get_pagenum_link($pagenum = 1) {
|
||||||
function next_posts($max_page = 0) { // original by cfactor at cooltux.org
|
function next_posts($max_page = 0) { // original by cfactor at cooltux.org
|
||||||
global $paged, $pagenow;
|
global $paged, $pagenow;
|
||||||
|
|
||||||
if (! is_single()) {
|
if ( !is_single() ) {
|
||||||
if (!$paged) $paged = 1;
|
if ( !$paged )
|
||||||
|
$paged = 1;
|
||||||
$nextpage = intval($paged) + 1;
|
$nextpage = intval($paged) + 1;
|
||||||
if (!$max_page || $max_page >= $nextpage) {
|
if ( !$max_page || $max_page >= $nextpage )
|
||||||
echo get_pagenum_link($nextpage);
|
echo get_pagenum_link($nextpage);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function next_posts_link($label='Next Page »', $max_page=0) {
|
function next_posts_link($label='Next Page »', $max_page=0) {
|
||||||
global $paged, $result, $request, $posts_per_page, $wpdb, $max_num_pages;
|
global $paged, $result, $request, $posts_per_page, $wpdb, $max_num_pages;
|
||||||
if (!$max_page) {
|
if ( !$max_page ) {
|
||||||
if ( isset($max_num_pages) ) {
|
if ( isset($max_num_pages) ) {
|
||||||
$max_page = $max_num_pages;
|
$max_page = $max_num_pages;
|
||||||
} else {
|
} else {
|
||||||
|
@ -443,10 +436,10 @@ function next_posts_link($label='Next Page »', $max_page=0) {
|
||||||
$max_page = $max_num_pages = ceil($numposts / $posts_per_page);
|
$max_page = $max_num_pages = ceil($numposts / $posts_per_page);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!$paged)
|
if ( !$paged )
|
||||||
$paged = 1;
|
$paged = 1;
|
||||||
$nextpage = intval($paged) + 1;
|
$nextpage = intval($paged) + 1;
|
||||||
if ((! is_single()) && (empty($paged) || $nextpage <= $max_page)) {
|
if ( (! is_single()) && (empty($paged) || $nextpage <= $max_page) ) {
|
||||||
echo '<a href="';
|
echo '<a href="';
|
||||||
next_posts($max_page);
|
next_posts($max_page);
|
||||||
echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $label) .'</a>';
|
echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $label) .'</a>';
|
||||||
|
@ -455,18 +448,20 @@ function next_posts_link($label='Next Page »', $max_page=0) {
|
||||||
|
|
||||||
|
|
||||||
function previous_posts() { // original by cfactor at cooltux.org
|
function previous_posts() { // original by cfactor at cooltux.org
|
||||||
global $_SERVER, $paged, $pagenow;
|
global $paged, $pagenow;
|
||||||
|
|
||||||
if (! is_single()) {
|
if ( !is_single() ) {
|
||||||
$nextpage = intval($paged) - 1;
|
$nextpage = intval($paged) - 1;
|
||||||
if ($nextpage < 1) $nextpage = 1;
|
if ( $nextpage < 1 )
|
||||||
|
$nextpage = 1;
|
||||||
echo get_pagenum_link($nextpage);
|
echo get_pagenum_link($nextpage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function previous_posts_link($label='« Previous Page') {
|
function previous_posts_link($label='« Previous Page') {
|
||||||
global $paged;
|
global $paged;
|
||||||
if ((! is_single()) && ($paged > 1) ) {
|
if ( (!is_single()) && ($paged > 1) ) {
|
||||||
echo '<a href="';
|
echo '<a href="';
|
||||||
previous_posts();
|
previous_posts();
|
||||||
echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $label) .'</a>';
|
echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $label) .'</a>';
|
||||||
|
@ -475,10 +470,10 @@ function previous_posts_link($label='« Previous Page') {
|
||||||
|
|
||||||
function posts_nav_link($sep=' — ', $prelabel='« Previous Page', $nxtlabel='Next Page »') {
|
function posts_nav_link($sep=' — ', $prelabel='« Previous Page', $nxtlabel='Next Page »') {
|
||||||
global $request, $posts_per_page, $wpdb, $max_num_pages;
|
global $request, $posts_per_page, $wpdb, $max_num_pages;
|
||||||
if (! is_single()) {
|
if ( !is_single() ) {
|
||||||
|
|
||||||
if (get_query_var('what_to_show') == 'posts') {
|
if ( 'posts' == get_query_var('what_to_show') ) {
|
||||||
if ( ! isset($max_num_pages) ) {
|
if ( !isset($max_num_pages) ) {
|
||||||
preg_match('#FROM\s(.*)\sGROUP BY#siU', $request, $matches);
|
preg_match('#FROM\s(.*)\sGROUP BY#siU', $request, $matches);
|
||||||
$fromwhere = $matches[1];
|
$fromwhere = $matches[1];
|
||||||
$numposts = $wpdb->get_var("SELECT COUNT(DISTINCT ID) FROM $fromwhere");
|
$numposts = $wpdb->get_var("SELECT COUNT(DISTINCT ID) FROM $fromwhere");
|
||||||
|
@ -488,7 +483,7 @@ function posts_nav_link($sep=' — ', $prelabel='« Previous Page', $nx
|
||||||
$max_num_pages = 999999;
|
$max_num_pages = 999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($max_num_pages > 1) {
|
if ( $max_num_pages > 1 ) {
|
||||||
previous_posts_link($prelabel);
|
previous_posts_link($prelabel);
|
||||||
echo preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $sep);
|
echo preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $sep);
|
||||||
next_posts_link($nxtlabel, $max_page);
|
next_posts_link($nxtlabel, $max_page);
|
||||||
|
|
Loading…
Reference in New Issue