From 0c6541c8aea6370368aa7c442b2d6a00075fee7c Mon Sep 17 00:00:00 2001
From: Max
Date: Mon, 15 Apr 2019 16:21:28 +0200
Subject: Improves rewrite rules for offers special page.

---
 angebote/inc/functions.php | 26 +++++++++++++++++++++++---
 angebote/inc/template.php  |  7 +++----
 2 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'angebote')

diff --git a/angebote/inc/functions.php b/angebote/inc/functions.php
index 6e5b1bb..6a41abc 100644
--- a/angebote/inc/functions.php
+++ b/angebote/inc/functions.php
@@ -109,9 +109,6 @@ function post_link_includes_taxonomy( $post_link, $id = 0 ){
 		$terms = wp_get_object_terms( $post->ID, 'type' );
 		file_put_contents("/tmp/wp.debug", json_encode($terms));
 		if( $terms ){
-		#	file_put_contents("/tmp/wp.debug", str_replace( 'angebote/' , 'angebote/' . $terms[0]->slug , $post_link ));
-		#	return $post_link;  
-		#	return str_replace( '/angebote/' , '/angebote/' . $terms[0]->slug . '/', $post_link );
 			return str_replace( '%type%' , $terms[0]->slug, $post_link );
 		} else {
 			return str_replace( '%type%' , '', $post_link );
@@ -123,6 +120,12 @@ function post_link_includes_taxonomy( $post_link, $id = 0 ){
 function feed_rewrite( $wp_rewrite ) {
 
 	$feed_rules = array(
+		'feed/angebote/([a-z]{1,})/?'    =>  'index.php?post_type=angebote&feed=rss2&type=$matches[1]',
+		'feed/angebote'    =>  'index.php?post_type=angebote&feed=rss2',
+		'angebote/([a-z]{1,})/feed/?'    =>  'index.php?post_type=angebote&feed=rss2&type=$matches[1]',
+		'angebote/feed'    =>  'index.php?post_type=angebote&feed=rss2',
+
+		/*
 		'feed/angebote/whisky'    =>  'index.php?post_type=angebote&feed=rss2&type=whisky',
 		'feed/angebote/gin'    =>  'index.php?post_type=angebote&feed=rss2&type=gin',
 		'feed/angebote/rum'    =>  'index.php?post_type=angebote&feed=rss2&type=rum',
@@ -133,12 +136,29 @@ function feed_rewrite( $wp_rewrite ) {
 		'angebote/rum/feed'    =>  'index.php?post_type=angebote&feed=rss2&type=rum',
 		'angebote/wodka/feed'    =>  'index.php?post_type=angebote&feed=rss2&type=wodka',
 		'angebote/feed'    =>  'index.php?post_type=angebote&feed=rss2',
+		 */
 	);
 
 	$wp_rewrite->rules = $feed_rules + $wp_rewrite->rules;
+	file_put_contents("/tmp/wp.rewrite", json_encode($wp_rewrite, JSON_PRETTY_PRINT));
 }
 // refresh/flush permalinks in the dashboard if this is changed in any way
 add_filter( 'generate_rewrite_rules', 'feed_rewrite' );
+/**
+ * Fix pagination on archive pages
+ * After adding a rewrite rule, go to Settings > Permalinks and click Save to flush the rules cache
+ */
+function my_pagination_rewrite() {
+    #add_rewrite_rule('angebote/([a-z]{1,})/page/?([0-9]{1,})/?$', 'index.php?post_type=angebote&type=$matched[1]&paged=$matches[2]', 'top');
+    #add_rewrite_rule('angebote/page/?([0-9]{1,})/?$', 'index.php?post_type=angebote&paged=$matches[1]', 'top');
+    #add_rewrite_rule('angebote/whisky/page/?([0-9]{1,})/?$', 'angebote/whisky/?paged=$matches[1]', 'top');
+	
+    #add_rewrite_rule('angebote/whisky/page/?([0-9]{1,})/?$', 'index.php?post_type=angebote&type=whisky&paged=$matches[1]', 'top');
+    add_rewrite_rule('angebote/([a-z]{1,})/page/?([0-9]{1,})/?$', 'index.php?post_type=angebotelist&type=$matches[1]&paged=$matches[2]', 'top');
+    #add_rewrite_rule('angebote/page/?([0-9]{1,})/?$', 'index.php?post_type=angebote&paged=$matches[1]', 'top');
+}
+#add_action('generate_rewrite_rules', 'my_pagination_rewrite');
+add_action('init', 'my_pagination_rewrite');
 
 add_action('init', 'create_offer_post_type');
 add_action('generate_rewrite_rules', 'generate_taxonomy_rewrite_rules');
diff --git a/angebote/inc/template.php b/angebote/inc/template.php
index fd92906..6f1be41 100644
--- a/angebote/inc/template.php
+++ b/angebote/inc/template.php
@@ -66,9 +66,8 @@ function render_offer_template( $atts ) {
 <?php
 	if ( $offer['include_post_link'] ) {
 ?>
-	    <h3 class="card-title"><a class="offer-title" href="<?php echo get_post_permalink( $post ); ?>" title="<?php echo $offer['name']; ?>"><?php echo $offer['name']; ?> <i class="material-icons icon-small" sstyle="font-size: 50%;">
-launch
-</i></a></h3>
+	    <h3 class="card-title"><a class="offer-title" href="<?php echo get_post_permalink( $post ); ?>" title="<?php echo $offer['name']; ?>"><?php echo $offer['name']; ?> 
+</a> ¶</h3>
 <?php
 	} else {
 ?>
@@ -98,7 +97,7 @@ launch
 <?php
 	if ( $offer['include_post_link'] ) {
 ?>
-	    <a href="<?php echo get_post_permalink( $post ); ?>#title" class="btn btn-light">Detailansicht</a>
+	    <a href="<?php echo get_post_permalink( $post ); ?>#title" class="btn btn-light" title="Kommentieren und mehr">Detailansicht</a>
 <?php
 	}
 ?>
-- 
cgit v1.2.3