Changeset 3627752

Timestamp:

07/29/2026 11:20:46 PM (3 months ago)

Author:

wpflamingojoe

Message:

Release 1.9.6: connect als Standard-Zahlweise, Text-Anpassungen auf der Einstellungsseite

Location:

sell-ads

Files:

• tags/1.9.6 (copied) (copied from sell-ads/trunk )
• tags/1.9.6/css/style.css (copied) (copied from sell-ads/trunk/css/style.css ) (1 diff)
• tags/1.9.6/inc/ajax.php (modified) (1 diff)
• tags/1.9.6/inc/campaign_fields.php (copied) (copied from sell-ads/trunk/inc/campaign_fields.php ) (16 diffs)
• tags/1.9.6/inc/checkout.php (copied) (copied from sell-ads/trunk/inc/checkout.php ) (3 diffs)
• tags/1.9.6/inc/connect.php (copied) (copied from sell-ads/trunk/inc/connect.php ) (2 diffs)
• tags/1.9.6/inc/helper.php (modified) (4 diffs)
• tags/1.9.6/inc/hooks.php (modified) (2 diffs)
• tags/1.9.6/inc/notify.php (copied) (copied from sell-ads/trunk/inc/notify.php )
• tags/1.9.6/inc/page/confirm.php (copied) (copied from sell-ads/trunk/inc/page/confirm.php ) (3 diffs)
• tags/1.9.6/inc/page/img (deleted)
• tags/1.9.6/inc/page/style.css (copied) (copied from sell-ads/trunk/inc/page/style.css ) (7 diffs)
• tags/1.9.6/inc/page/wp-sap.js (copied) (copied from sell-ads/trunk/inc/page/wp-sap.js )
• tags/1.9.6/inc/settings.php (copied) (copied from sell-ads/trunk/inc/settings.php ) (11 diffs)
• tags/1.9.6/inc/shortcode.php (copied) (copied from sell-ads/trunk/inc/shortcode.php ) (3 diffs)
• tags/1.9.6/inc/stripe.php (modified) (2 diffs)
• tags/1.9.6/readme.txt (copied) (copied from sell-ads/trunk/readme.txt ) (4 diffs)
• tags/1.9.6/wp-sap.php (copied) (copied from sell-ads/trunk/wp-sap.php ) (4 diffs)
• trunk/css/style.css (modified) (1 diff)
• trunk/inc/ajax.php (modified) (1 diff)
• trunk/inc/campaign_fields.php (modified) (16 diffs)
• trunk/inc/checkout.php (modified) (3 diffs)
• trunk/inc/connect.php (modified) (2 diffs)
• trunk/inc/helper.php (modified) (4 diffs)
• trunk/inc/hooks.php (modified) (2 diffs)
• trunk/inc/page/confirm.php (modified) (3 diffs)
• trunk/inc/page/style.css (modified) (7 diffs)
• trunk/inc/settings.php (modified) (11 diffs)
• trunk/inc/shortcode.php (modified) (3 diffs)
• trunk/inc/stripe.php (modified) (2 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/wp-sap.php (modified) (4 diffs)

sell-ads/tags/1.9.6/css/style.css

@@ -26 +26 @@
 }
 
+/* Freistehende, abgerundete Karte auf hellem Grund (SS1) statt des frueheren
+   kantigen Vollbreiten-Bandes. Der Radius stand bis 1.8.2 per !important auf 0
+   und musste hier aktiv ueberschrieben werden - jetzt traegt die Box Ecken und
+   einen weichen Schatten selbst. width:100% bleibt: die Karte fuellt die Breite
+   ihres Widgets/Containers, hebt sich aber durch Radius und Schatten ab. */
 .wpsap_ads_plugin_ads_box {
     width: 100%;
     box-sizing: border-box;
-    background-color: var(--wpsap-canvas, #f0f1f2);
-    border-radius: 0 !important;
+    background-color: #F2F3F5;
+    /* border-radius: 14px; */
+    /* box-shadow: var(--wpsap-shadow, 0 1px 3px rgba(0, 0, 0, .08)); */
     text-align: center;
     display: flex;

sell-ads/tags/1.9.6/inc/ajax.php

@@ -84 +84 @@
         update_post_meta($order_id,'order_image',$data['url']);
         update_post_meta($order_id,'order_url',$site_url);
+        // Attachment-ID mitfuehren, damit das Motiv beim Ablehnen/Kuendigen/
+        // Ablaufen restlos aus der Mediathek entfernt werden kann
+        // (wpsap_delete_order_media() in inc/helper.php).
+        update_post_meta($order_id,'wpsap_order_image_id',$image);
     }
     else {

sell-ads/tags/1.9.6/inc/campaign_fields.php

@@ -16 +16 @@
  function wpsap_campaign_metaboxes_html(){
     global $post;
+    // Keine Prefill-Defaults: leere Felder bleiben leer, damit im Frontend nur
+    // erscheint, was der Betreiber aktiv eingetragen hat.
     $campaign_title = get_post_meta($post->ID, "wpsap_campaign_title",true);
-    if(empty($campaign_title)){
-        $campaign_title = 'This Advertising space is for sale';
-    }
 
     $campaign_name = get_the_title($post->ID);
@@ -27 +26 @@
 
     $button_text = get_post_meta($post->ID, "wpsap_button_text",true);
-    if(empty($button_text)){
-        $button_text = 'Buy';
-    }
 
     // Ohne dieses Feld schlug die Nonce-Pruefung beim Speichern immer fehl
@@ -53 +49 @@
   <span class="tooltiptext">This title is used to advertise your ad space.</span>
 </div>
-            <input type="text" name="wpsap_campaign_title" class="regular-text" value="<?php echo esc_attr($campaign_title); ?>" required>
+            <input type="text" name="wpsap_campaign_title" class="regular-text" value="<?php echo esc_attr($campaign_title); ?>">
             </td>
          </tr>
@@ -68 +64 @@
          </tr>
 
+         <?php $currency = strtoupper(wpsap_stripe_currency()); ?>
          <tr>
-            <td><h4>Monthly Price ($)</h4></td>
+            <td><h4>Monthly Price (<?php echo esc_html($currency); ?>)</h4></td>
             <td>
             <div class="tooltip"><span class="dashicons dashicons-info"></span>
-  <span class="tooltiptext">This is the monthly price in US dollars for which you want to rent out your ad space.</span>
+  <span class="tooltiptext">This is the monthly price in <?php echo esc_html($currency); ?> for which you want to rent out your ad space.</span>
 </div>
             <input type="number" step="0.01" min="0" name="wpsap_campaign_price" class="regular-text" value="<?php echo esc_attr(get_post_meta($post->ID, "wpsap_campaign_price",true)); ?>" required>
@@ -194 +191 @@
     $columns['title'] = __( 'Campaign', "wpsap");
     $columns['price'] = __( 'Price', "wpsap");
-   
+    // Info-Icon mit CSS-Tooltip: erklaert die zwei gezaehlten Ereignisse. Der
+    // native title-Tooltip erschien nicht zuverlaessig, deshalb dieselbe
+    // .tooltiptext-Mechanik wie in der Metabox. Das noetige CSS steht - auf die
+    // Liste gescoped - im admin_footer (wpsap_campaign_copy_field()). WordPress
+    // gibt das Spalten-Label als HTML aus, daher ohne eigenes Enqueue.
+    // Icon und Text stehen in getrennten Spans: nur das Icon traegt die
+    // dashicons-Klasse, sonst wuerde der Tooltip-Text in der Icon-Schrift
+    // gerendert.
+    $columns['clicks'] = __( 'Clicks', "wpsap")
+        . ' <span class="wpsap-th-tip" tabindex="0">'
+        . '<span class="dashicons dashicons-info"></span>'
+        . '<span class="wpsap-th-tiptext">'
+        . esc_html__('Total clicks for this ad slot: clicks on the “Buy” button (before the slot is sold) plus outbound clicks on the published ad.','wpsap_ads_plugin')
+        . '</span></span>';
     $columns['pdate'] = __( 'Date', "wpsap");
     $columns['php'] = __( 'PHP', "wpsap");
@@ -211 +221 @@
             echo  esc_html(get_post_meta($post_id, "wpsap_campaign_price",true).' '.strtoupper(wpsap_stripe_currency())." per month");
             break;
+        case 'clicks' :
+            // Zaehler wird an zwei Stellen hochgezaehlt: beim /goto-Redirect
+            // (inc/hooks.php) und beim Buy-Button-Klick (wpsap_start_checkout,
+            // inc/checkout.php).
+            // Als Link auf die Kampagne ausgegeben, damit die Zahl - wie in der
+            // Vorlage - klickbar ist und in WP-Blau erscheint.
+            $clicks = (int) get_post_meta($post_id, "wpsap_click_count",true);
+            $edit_link = get_edit_post_link($post_id);
+            if($edit_link){
+                echo '<a href="'.esc_url($edit_link).'">'.esc_html($clicks).'</a>';
+            } else {
+                echo esc_html($clicks);
+            }
+            break;
         case 'php' :
-            echo  esc_html(wpsap_plugin_php_function($post_id));
+            // Bewusst ohne esc_html(): wpsap_plugin_php_function() liefert das
+            // fertige Kopier-Feld und escapt seinen dynamischen Wert selbst.
+            echo  wpsap_plugin_php_function($post_id);
             break;
         case 'shortcode' :
-            echo  esc_html(wpsap_shortcode_input($post_id));
+            echo  wpsap_shortcode_input($post_id);
             break;
 
@@ -230 +256 @@
     $columns['order'] = __( 'Order', "wpsap");
     $columns['campaign'] = __( 'Campaign', "wpsap");
-    $columns['pdate'] = __( 'Date', "wpsap");
+    $columns['pdate'] = __( 'Order Date', "wpsap");
     $columns['status'] = __( 'Status', "wpsap");
-    $columns['billing'] = __( 'Billing', "wpsap");
     $columns['resources'] = __( 'Resources', "wpsap");
     $columns['link'] = __( 'Link', "wpsap");
@@ -251 +276 @@
             // entstanden sind - die Spalte Total zeigt trotzdem einen Betrag.
             if(get_post_meta($post_id,'wpsap_test_order',true) === 'yes'){
-                echo '<br/><small><span style="color:#996800;">'.esc_html__('Test order — not paid','wpsap_ads_plugin').'</span></small>';
+                echo '<br/><small><span style="color:#996800;">'.esc_html__('Test order','wpsap_ads_plugin').'</span></small>';
             }
             break;
@@ -268 +293 @@
                 $final_dates = wpsap_order_days_left($post_id);
                 if($final_dates > 0){
+                    // Ablaufdatum = Bestelldatum + 14 Tage, dieselbe Frist wie
+                    // in wpsap_order_days_left().
+                    $placed = get_post_time('U',true,$post_id);
+                    $expires = $placed ? $placed + 14 * DAY_IN_SECONDS : time() + $final_dates * DAY_IN_SECONDS;
                     echo '<strong>Pending</strong>';
-                     echo '<br/><small><span>('.esc_html($final_dates).' days until expiration)</span></small>';
+                     echo '<br/><small><span>(Request expires on '.esc_html(wp_date(get_option('date_format'),$expires)).')</span></small>';
                 }
                 else {
@@ -291 +320 @@
                    echo "<span style='color:#ff0000;'>Rejected</span>";
                }
+               else if($current_status == 'expired'){
+                   $on = (int) get_post_meta($post_id, "wpsap_expired_on",true);
+                   if(!$on){
+                       $placed = get_post_time('U',true,$post_id);
+                       $on = $placed ? $placed + 14 * DAY_IN_SECONDS : 0;
+                   }
+                   echo "<span style='color:#ff0000;'>Expired</span>";
+                   if($on){
+                       echo "<br/><small>(on ".esc_html(wp_date(get_option('date_format'),$on)).")</small>";
+                   }
+               }
                else {
                     echo esc_html($current_status); 
@@ -297 +337 @@
             }
             break;
-        case 'billing' :
-            echo  esc_html(get_post_meta($post_id, "order_email",true));
-             break;
         case 'resources' :
-            $url = get_post_meta($post_id, "order_url",true);
-            echo  '<a target="_blank" href="'.esc_url(get_post_meta($post_id, "order_image",true)).'"><img style="max-width:120px;" src="'.esc_url(get_post_meta($post_id, "order_image",true)).'"></a>';
+            // Nach Reject/Cancel/Expired ist das Motiv geloescht (order_image
+            // leer) - dann kein kaputtes <img> ausgeben.
+            $image = get_post_meta($post_id, "order_image",true);
+            if($image){
+                echo  '<a target="_blank" href="'.esc_url($image).'"><img style="max-width:120px;" src="'.esc_url($image).'"></a>';
+            } else {
+                echo '&mdash;';
+            }
             break;
         case 'link' :
             $url = get_post_meta($post_id, "order_url",true);
-            echo  '<a href="'.esc_url($url).'">'.esc_url($url).'</a>';
+            if($url){
+                echo  '<a href="'.esc_url($url).'">'.esc_url($url).'</a>';
+            } else {
+                echo '&mdash;';
+            }
             break;
         case 'total' :
             $status = get_post_meta($post_id, "wpsap_order_status",true);
             if($status == "accepted"){
-                echo "<small>You have confirmed the advertising partnership. Now you need to publish the advertisement. Make sure that the ad is displayed correctly and that the product link works. If there are any errors, you should contact the buyer immediately. If the buyer does not cancel within the next 14 days, the first transaction will be executed. The monthly payment will remain until someone cancels.</small>";
+                echo "<small>You have confirmed the advertising partnership, and the first payment was charged when you accepted. Please publish the advertisement now: make sure it displays correctly and that the product link works, and contact the buyer right away if anything is wrong. The monthly payment continues until the subscription is cancelled &mdash; either by you here, or by the buyer from their own Stripe billing portal, which they can reach through the link on their order confirmation page.</small>";
             }
             else {
@@ -320 +367 @@
                     $currency = wpsap_stripe_currency();
                 }
-                echo esc_html(number_format_i18n($total,2).' '.strtoupper($currency));
+                echo esc_html(number_format_i18n($total,2).' '.strtoupper($currency).' per month');
             }
             break;
@@ -334 +381 @@
                 echo 'This subscription was cancelled by the buyer.';
             }
+            elseif($status == 'expired'){
+                // Nach 14 Tagen ohne Annahme ueber wpsap_expire_ads() beendet -
+                // das Abo stand noch im Trial, es wurde also nichts berechnet.
+                echo 'This request expired unanswered. No payment was charged.';
+            }
             elseif($status != "accepted" && $status != "published"){
-            echo '<a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Reject</a> | <a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button accept_ads">Accept</a>';
+            echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button button-primary accept_ads">Accept</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Reject</a>';
             }
 
@@ -343 +395 @@
              }
              else {
-               echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button button-primary accept_ads">Unpublish</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Cancel</a>';
+               echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button accept_ads">Unpublish</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Cancel</a>';
              }
             }
@@ -356 +408 @@
     if(isset($_GET['post_type'])){
         if(sanitize_text_field($_GET['post_type']) == 'ads_order'){
-    ?> 
+    ?>
     <style>
 .tablenav.top {
@@ -363 +415 @@
 </style>
 
-<?php 
-        }
-    }
+<?php
+        }
+    }
+}
+
+
+// Kopier-Verhalten und Optik der PHP-/Shortcode-Felder in der Kampagnenliste.
+add_action('admin_footer','wpsap_campaign_copy_field');
+function wpsap_campaign_copy_field(){
+    if(!isset($_GET['post_type']) || sanitize_text_field(wp_unslash($_GET['post_type'])) !== 'ads_campaign'){
+        return;
+    }
+    ?>
+<style>
+.wpsap-copy { display: inline-flex; align-items: center; gap: 6px; max-width: 100%; }
+/* Weisses, schreibgeschuetztes Feld mit dezentem Rahmen - wie in der Vorlage
+   (kein grauer Fuellton). Erhoehte Spezifitaet (span + input.klasse), weil WP
+   readonly-Felder sonst grau einfaerbt (input[readonly]). */
+.wpsap-copy input.wpsap-copy__input { width: 150px; max-width: 100%; background: #fff; color: #3c434a; }
+/* Randloses Kopier-Icon statt umrandetem Button: die Vorlage zeigt nur das
+   schlichte Dokument-Symbol ohne Button-Rahmen (die WP-.button-Klasse ist im
+   Markup deshalb entfernt). */
+.wpsap-copy__btn { display: inline-flex; align-items: center; justify-content: center; background: none; border: none; box-shadow: none; outline: none; padding: 0 2px; min-height: 0; color: #50575e; cursor: pointer; }
+.wpsap-copy__btn:hover { color: #2271b1; background: none; box-shadow: none; }
+.wpsap-copy__btn:focus { background: none; box-shadow: none; outline: none; }
+.wpsap-copy__btn .dashicons { width: 18px; height: 18px; font-size: 18px; }
+.wpsap-copy__btn.is-copied { color: #46b450; }
+
+/* Info-Tooltip im Spaltenkopf "Clicks". Aufbau wie die Metabox-Tooltips, aber
+   eigene Klassen, damit nichts mit anderen Admin-Styles kollidiert. */
+.wpsap-th-tip { position: relative; display: inline-flex; align-items: center; vertical-align: middle; margin-top: -2px; cursor: help; color: #787c82; }
+.wpsap-th-tip .dashicons-info { font-size: 16px; width: 16px; height: 16px; line-height: 16px; }
+.wpsap-th-tip .wpsap-th-tiptext {
+    visibility: hidden; opacity: 0; transition: opacity .1s ease;
+    position: absolute; z-index: 100; top: 150%; left: 50%; transform: translateX(-50%);
+    width: 240px; padding: 8px 10px; border-radius: 4px;
+    background: #1d2327; color: #fff;
+    font: 400 12px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    text-align: left; white-space: normal; font-weight: 400; text-transform: none;
+}
+.wpsap-th-tip:hover .wpsap-th-tiptext,
+.wpsap-th-tip:focus .wpsap-th-tiptext,
+.wpsap-th-tip:focus-within .wpsap-th-tiptext { visibility: visible; opacity: 1; }
+</style>
+<script>
+jQuery(function($){
+    $(document).on('click','.wpsap-copy__btn',function(){
+        var $btn = $(this);
+        var $input = $btn.closest('.wpsap-copy').find('.wpsap-copy__input');
+        var text = $input.val();
+
+        var done = function(){
+            $btn.addClass('is-copied');
+            setTimeout(function(){ $btn.removeClass('is-copied'); },1200);
+        };
+
+        if(navigator.clipboard && navigator.clipboard.writeText){
+            navigator.clipboard.writeText(text).then(done, function(){
+                $input.trigger('select'); document.execCommand('copy'); done();
+            });
+        } else {
+            $input.trigger('select'); document.execCommand('copy'); done();
+        }
+    });
+});
+</script>
+    <?php
+}
+
+
+// Doppelte Bestaetigung fuer Reject/Cancel: beide Buttons loesen dieselbe
+// irreversible Aktion aus (Stripe-Abo kuendigen). Ein eigenes Modal faengt den
+// Klick ab und verlangt, dass der Betreiber das Aktionswort tippt, bevor der
+// bereits nonce-gesicherte Link geoeffnet wird. Reiner Frontend-Schutz - der
+// Serverpfad in wpsap_job_status() bleibt unveraendert.
+add_action('admin_footer','wpsap_order_reject_confirm');
+function wpsap_order_reject_confirm(){
+    if(!isset($_GET['post_type']) || sanitize_text_field(wp_unslash($_GET['post_type'])) !== 'ads_order'){
+        return;
+    }
+    ?>
+<style>
+#wpsap-reject-modal { position: fixed; inset: 0; z-index: 100000; display: none; }
+#wpsap-reject-modal.is-open { display: block; }
+#wpsap-reject-modal .wpsap-reject-backdrop { position: absolute; inset: 0; background: rgba(0,0,0,0.5); }
+#wpsap-reject-modal .wpsap-reject-box { position: relative; max-width: 420px; margin: 12vh auto 0; background: #fff; border-radius: 4px; box-shadow: 0 6px 30px rgba(0,0,0,0.3); padding: 24px; }
+#wpsap-reject-modal .wpsap-reject-title { display: flex; align-items: center; gap: 8px; margin: 0 0 12px; font-size: 18px; font-weight: 600; color: #b32d2e; }
+#wpsap-reject-modal .wpsap-reject-text { margin: 0 0 16px; color: #3c434a; line-height: 1.5; }
+#wpsap-reject-modal .wpsap-reject-label { display: block; margin: 0 0 6px; font-weight: 600; color: #3c434a; }
+#wpsap-reject-modal .wpsap-reject-input { width: 100%; box-sizing: border-box; margin: 0 0 16px; }
+#wpsap-reject-modal .wpsap-reject-actions { display: flex; justify-content: flex-end; gap: 8px; }
+#wpsap-reject-modal .wpsap-reject-confirm { background: #b32d2e; border-color: #b32d2e; color: #fff; }
+#wpsap-reject-modal .wpsap-reject-confirm:hover:not(:disabled) { background: #9e2423; border-color: #9e2423; color: #fff; }
+#wpsap-reject-modal .wpsap-reject-confirm:disabled { opacity: 0.5; cursor: not-allowed; }
+</style>
+<div id="wpsap-reject-modal" role="dialog" aria-modal="true" aria-labelledby="wpsap-reject-title">
+    <div class="wpsap-reject-backdrop"></div>
+    <div class="wpsap-reject-box">
+        <h2 id="wpsap-reject-title" class="wpsap-reject-title"><span class="dashicons dashicons-warning"></span><span class="wpsap-reject-heading">Reject this ad?</span></h2>
+        <p class="wpsap-reject-text">This permanently cancels the buyer&#8217;s active Stripe subscription. This action cannot be undone.</p>
+        <label class="wpsap-reject-label" for="wpsap-reject-word">Type <strong class="wpsap-reject-word">REJECT</strong> to confirm:</label>
+        <input type="text" id="wpsap-reject-word" class="wpsap-reject-input regular-text" autocomplete="off" autocapitalize="characters" spellcheck="false">
+        <div class="wpsap-reject-actions">
+            <button type="button" class="button wpsap-reject-cancel">Close</button>
+            <button type="button" class="button wpsap-reject-confirm" disabled>Confirm</button>
+        </div>
+    </div>
+</div>
+<script>
+jQuery(function($){
+    var $modal   = $('#wpsap-reject-modal');
+    var $input   = $('#wpsap-reject-word');
+    var $confirm = $modal.find('.wpsap-reject-confirm');
+    var targetHref = '';
+    var expectedWord = 'REJECT';
+
+    function closeModal(){
+        $modal.removeClass('is-open');
+        targetHref = '';
+        $input.val('');
+        $confirm.prop('disabled', true);
+    }
+
+    // Reject und Cancel teilen die Klasse .reject_ads; der Wortlaut folgt dem
+    // Text des tatsaechlich geklickten Links (Reject oder Cancel).
+    $(document).on('click','.reject_ads',function(e){
+        e.preventDefault();
+        targetHref = $(this).attr('href');
+        var label = $.trim($(this).text()) || 'Reject';
+        expectedWord = label.toUpperCase();
+        $modal.find('.wpsap-reject-heading').text(label + ' this ad?');
+        $modal.find('.wpsap-reject-word').text(expectedWord);
+        $input.val('');
+        $confirm.prop('disabled', true);
+        $modal.addClass('is-open');
+        $input.trigger('focus');
+    });
+
+    $input.on('input',function(){
+        $confirm.prop('disabled', $.trim($input.val()).toUpperCase() !== expectedWord);
+    });
+
+    $confirm.on('click',function(){
+        if($confirm.prop('disabled') || !targetHref){ return; }
+        window.location.href = targetHref;
+    });
+
+    $modal.find('.wpsap-reject-cancel, .wpsap-reject-backdrop').on('click', closeModal);
+
+    $(document).on('keydown',function(e){
+        if(e.key === 'Escape' && $modal.hasClass('is-open')){ closeModal(); }
+    });
+});
+</script>
+    <?php
 }
 

sell-ads/tags/1.9.6/inc/checkout.php

@@ -183 +183 @@
     }
 
+    // Buy-Button-Klick zaehlen - derselbe Zaehler wie der /goto-Redirect
+    // (inc/hooks.php), damit die Spalte "Clicks" beide Ereignisse summiert.
+    // Selbst-Klicks eingeloggter Redakteure verfaelschen die Statistik nicht.
+    if(get_post_type($campaign_id) === 'ads_campaign'
+        && !(is_user_logged_in() && current_user_can('edit_posts'))){
+        $count = (int) get_post_meta($campaign_id,'wpsap_click_count',true);
+        update_post_meta($campaign_id,'wpsap_click_count',$count + 1);
+    }
+
     // Testmodus: die Zahlungsseite entfaellt ersatzlos. Die Bestellung
     // entsteht hier statt aus einer bezahlten Stripe-Session, danach geht es
@@ -326 +335 @@
 
 /**
- * Taeglicher Lauf: Bestellungen, die 14 Tage unbeantwortet blieben,
- * werden abgelehnt und das Abo beendet. Frueher passierte das mitten
- * im Rendern der Bestellliste.
+ * Taeglicher Lauf: Bestellungen, die 14 Tage unbeantwortet blieben, laufen ab
+ * (Status "expired") und das Abo wird beendet - weil es noch im Trial steht,
+ * ohne Belastung. Frueher passierte das mitten im Rendern der Bestellliste.
  */
 add_action('wpsap_expire_pending_orders','wpsap_expire_pending_orders');
@@ -348 +357 @@
     foreach($orders as $order_id){
         if(wpsap_order_days_left($order_id) <= 0){
-            wpsap_reject_ads($order_id);
+            wpsap_expire_ads($order_id);
         }
     }

sell-ads/tags/1.9.6/inc/connect.php

@@ -20 +20 @@
 
 function wpsap_payment_mode(){
-    $mode = get_option('wpsap_payment_mode','own_key');
-    return in_array($mode,array('own_key','connect'),true) ? $mode : 'own_key';
+    $mode = get_option('wpsap_payment_mode','connect');
+    return in_array($mode,array('own_key','connect'),true) ? $mode : 'connect';
 }
 
@@ -326 +326 @@
 }
 
+function wpsap_connect_end_trial($subscription_id){
+    return wpsap_connect_request('POST','v1/subscription/end-trial',array('subscription_id' => $subscription_id));
+}
+
 function wpsap_connect_portal_url($customer_id,$return_url){
     $session = wpsap_connect_request('POST','v1/portal',array(

sell-ads/tags/1.9.6/inc/helper.php

@@ -2 +2 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
+/**
+ * Baut das kopierbare Feld fuer die PHP-Einbindung einer Kampagne.
+ *
+ * Rueckgabe ist fertiges HTML und wird in der Spalte direkt ausgegeben -
+ * frueher lag ein esc_html() darum, das aus dem <input> sichtbaren Rohtext
+ * machte. Escapt wird deshalb nur noch der dynamische Wert selbst.
+ */
 function wpsap_plugin_php_function($content){
-
-    $html = '<input type="text" readonly value="<?php echo wpsap_show('.esc_attr($content).'); ?>">';
-    return $html;
-
+    $id    = absint($content);
+    $value = '<?php echo wpsap_show('.$id.'); ?>';
+    return wpsap_copy_field($value);
 }
 
+/**
+ * Baut das kopierbare Feld fuer die Shortcode-Einbindung einer Kampagne.
+ */
 function wpsap_shortcode_input($content){
-    $html = '<input type="text" readonly value="[wpsap_ads id='.esc_attr($content).']">';
-    return $html;
+    $id    = absint($content);
+    $value = '[wpsap_ads id='.$id.']';
+    return wpsap_copy_field($value);
+}
+
+/**
+ * Gemeinsames Markup fuer die Kopier-Felder der Kampagnenliste: ein
+ * schreibgeschuetztes Eingabefeld mit Betrag daneben ein Kopier-Button.
+ * Der zugehoerige Klick-Handler liegt im admin_footer der Liste
+ * (inc/campaign_fields.php).
+ */
+function wpsap_copy_field($value){
+    return '<span class="wpsap-copy">'
+        .'<input type="text" class="wpsap-copy__input" readonly value="'.esc_attr($value).'">'
+        .'<button type="button" class="wpsap-copy__btn" title="'.esc_attr__('Copy','wpsap_ads_plugin').'">'
+        .'<span class="dashicons dashicons-admin-page"></span>'
+        .'</button>'
+        .'</span>';
 }
 
@@ -43 +68 @@
 
 /**
+ * Entfernt Motiv und Ziellink einer endgueltig toten Bestellung restlos:
+ * das Attachment aus der Mediathek (Datei inkl. resized Varianten, ohne
+ * Papierkorb) sowie die Meta order_image/order_url. Jedes Motiv gehoert zu
+ * genau einer Bestellung, deshalb ist das harte Loeschen unbedenklich.
+ *
+ * Die Attachment-ID steht seit dem Upload in wpsap_order_image_id; fuer
+ * Bestandsbestellungen ohne dieses Meta wird sie aus der gespeicherten URL
+ * aufgeloest.
+ */
+function wpsap_delete_order_media($order_id){
+    $attachment_id = (int) get_post_meta($order_id,'wpsap_order_image_id',true);
+    if(!$attachment_id){
+        $image_url = get_post_meta($order_id,'order_image',true);
+        if($image_url){
+            $attachment_id = attachment_url_to_postid($image_url);
+        }
+    }
+
+    if($attachment_id && get_post_type($attachment_id) === 'attachment'){
+        wp_delete_attachment($attachment_id,true);
+    }
+
+    delete_post_meta($order_id,'order_image');
+    delete_post_meta($order_id,'order_url');
+    delete_post_meta($order_id,'wpsap_order_image_id');
+}
+
+/**
  * Ablehnen heisst: das Abo bei Stripe beenden. Der lokale Status wird erst
  * danach gesetzt - frueher lief es umgekehrt, wodurch Plugin und Stripe
@@ -62 +115 @@
     ) );
 
+    // Erst nach dem gesicherten Statuswechsel: Motiv und Link sind jetzt tot.
+    wpsap_delete_order_media($order_id);
+
+    return true;
+}
+
+/**
+ * Ablauf einer unbeantworteten Bestellung nach 14 Tagen. Wie das Ablehnen
+ * beendet es das Abo bei Stripe - weil das noch im Trial steht, entsteht dabei
+ * keine Rechnung, der Kaeufer wird also nicht belastet. Getrennt von
+ * wpsap_reject_ads(), damit der Zustand in der Liste als "Expired" (statt
+ * "Rejected") erkennbar bleibt und das Ablaufdatum festgehalten wird.
+ */
+function wpsap_expire_ads($order_id){
+    $subscription_id = get_post_meta($order_id,'wpsap_subscription_id',true);
+    if($subscription_id){
+        $result = wpsap_stripe_cancel_subscription($subscription_id);
+        if(is_wp_error($result)){
+            return $result;
+        }
+    }
+
+    // Ablaufdatum = Bestelldatum + 14 Tage, dieselbe Frist wie in
+    // wpsap_order_days_left(). Festgehalten, damit die Liste "Expired on <Tag>"
+    // zeigen kann, ohne es jedes Mal neu herzuleiten.
+    $placed  = get_post_time('U',true,$order_id);
+    $expires = $placed ? $placed + 14 * DAY_IN_SECONDS : time();
+    update_post_meta($order_id,'wpsap_expired_on',$expires);
+
+    update_post_meta($order_id,"wpsap_order_status",'expired');
+    wp_update_post( array(
+        'ID'          => $order_id,
+        'post_status' => 'rejected',
+    ) );
+
+    // Wie beim Ablehnen: Motiv und Link sind mit dem Ablauf tot.
+    wpsap_delete_order_media($order_id);
+
     return true;
 }
@@ -80 +171 @@
             return new WP_Error('wpsap_subscription_gone',__('This subscription is no longer active at Stripe.','wpsap_ads_plugin'));
         }
+
+        // Erst mit der Annahme wird belastet: das Abo lief bis hierher im Trial
+        // (siehe wpsap_stripe_build_checkout). Das Beenden des Trials stellt die
+        // erste Rechnung sofort aus.
+        $charged = wpsap_stripe_end_trial($subscription_id);
+        if(is_wp_error($charged)){
+            return $charged;
+        }
     }
 

sell-ads/tags/1.9.6/inc/hooks.php

@@ -144 +144 @@
         }
 
-        $order_date = get_the_date( 'l F j, Y',$order_id);
-        $expected_date = date('l F j, Y',strtotime($order_date."+ 7days"));
-
+        // Die Datumsangaben der Bestaetigungstabelle berechnet confirm.php
+        // selbst aus dem Bestellzeitpunkt - hier ist nichts vorzubereiten.
         require WPSAP_Plugin_Path.'inc/page/confirm.php';
         die();
@@ -229 +228 @@
 // neu registriert - die alte Registrierung ueberschrieb ihn global fuer
 // alle Post-Types.
+
+
+/* --------------------------------------------------------------------------
+ * Klick-Tracking ueber /goto/<slug>
+ *
+ * Die veroeffentlichte Anzeige verlinkt nicht mehr direkt auf die Zielseite,
+ * sondern ueber diesen Endpoint (inc/shortcode.php). Er zaehlt den Klick auf
+ * der Kampagne (wpsap_click_count) und leitet dann zur Zielseite weiter. Der
+ * Zaehler erscheint in der Spalte "Clicks" der Kampagnenliste.
+ * ------------------------------------------------------------------------- */
+
+add_filter('query_vars','wpsap_goto_query_var');
+function wpsap_goto_query_var($vars){
+    $vars[] = 'wpsap_goto';
+    return $vars;
+}
+
+add_action('init','wpsap_goto_rewrite');
+function wpsap_goto_rewrite(){
+    add_rewrite_rule('^goto/([^/]+)/?$','index.php?wpsap_goto=$matches[1]','top');
+
+    // Beim reinen Plugin-Update laeuft der Aktivierungshook nicht - ohne
+    // diesen Guard griffe die Rewrite-Rule auf cybie.de erst nach manuellem
+    // Neu-Speichern der Permalinks. Der Flush erfolgt genau einmal je Version.
+    if(get_option('wpsap_rewrite_version') !== WPSAP_Version){
+        flush_rewrite_rules(false);
+        update_option('wpsap_rewrite_version',WPSAP_Version);
+    }
+}
+
+add_action('template_redirect','wpsap_handle_goto');
+function wpsap_handle_goto(){
+    $slug = get_query_var('wpsap_goto');
+    if($slug === '' || $slug === null){
+        return;
+    }
+
+    $home = home_url('/');
+
+    // Slug -> Kampagne. Numerischer Wert wird als ID behandelt, sonst ueber
+    // den post_name aufgeloest. Der CPT ist nicht oeffentlich, get_page_by_path
+    // findet ihn trotzdem, weil der Post-Type explizit uebergeben wird.
+    $campaign = null;
+    if(ctype_digit((string) $slug)){
+        $maybe = get_post(absint($slug));
+        if($maybe && $maybe->post_type === 'ads_campaign'){
+            $campaign = $maybe;
+        }
+    }
+    if(!$campaign){
+        $campaign = get_page_by_path(sanitize_title($slug),OBJECT,'ads_campaign');
+    }
+
+    if(!$campaign){
+        nocache_headers();
+        wp_redirect($home,302);
+        exit;
+    }
+
+    // Zielseite = URL der aktuell veroeffentlichten Anzeige dieses Slots.
+    $target = '';
+    foreach(wpsap_get_active_ads($campaign->ID) as $ad){
+        $url = get_post_meta($ad->ID,'order_url',true);
+        if(!empty($url)){
+            $target = $url;
+            break;
+        }
+    }
+
+    if(empty($target)){
+        nocache_headers();
+        wp_redirect($home,302);
+        exit;
+    }
+
+    // Selbst-Klicks von Redakteuren verfaelschen die Statistik nicht.
+    if(!(is_user_logged_in() && current_user_can('edit_posts'))){
+        $count = (int) get_post_meta($campaign->ID,'wpsap_click_count',true);
+        update_post_meta($campaign->ID,'wpsap_click_count',$count + 1);
+    }
+
+    nocache_headers();
+    // Ziel ist eine fremde Domain - wp_safe_redirect() wuerde das blocken.
+    wp_redirect(esc_url_raw($target),302);
+    exit;
+}

sell-ads/tags/1.9.6/inc/page/confirm.php

@@ -43 +43 @@
 // Fuer die Seitenspalte: beide Zahlungswege legen diese Felder an -
 // wpsap_sync_order_from_session() ebenso wie wpsap_create_test_order().
-$wpsap_place_id = (int) get_post_meta($order_id,'wpsap_place_id',true);
-$wpsap_campaign_label = '';
-if($wpsap_place_id){
-    $wpsap_campaign_label = (string) get_post_meta($wpsap_place_id,'wpsap_campaign_title',true);
-    if($wpsap_campaign_label === ''){
-        $wpsap_campaign_label = (string) get_the_title($wpsap_place_id);
-    }
-}
-
 $wpsap_price_label = '';
 $wpsap_order_total = (int) get_post_meta($order_id,'order_total',true);
@@ -58 +49 @@
     $wpsap_price_label = number_format_i18n($wpsap_order_total / 100,2).' '.strtoupper((string) get_post_meta($order_id,'wpsap_currency',true));
 }
+
+// Datumsangaben der Bestaetigungstabelle. Bezugspunkt ist der Zeitpunkt der
+// Bestellung; wp_date() wendet die WP-Zeitzone an. Der Kaeufer-Flow ist
+// durchgaengig englisch, deshalb erzwingt switch_to_locale('en_US') englische
+// Monatsnamen auch auf einer de_DE-Site. Das Billing-Datum ist eine
+// Anzeige-Schaetzung fuer den Kaeufer (Prueffrist bis 14 Tage + ein Abo-Monat) -
+// Stripe bucht im Abo technisch bereits beim Checkout.
+$wpsap_order_ts = get_post_timestamp($order_id);
+$wpsap_switched_locale = switch_to_locale('en_US');
+$wpsap_submitted_date = $wpsap_order_ts ? wp_date('F j, Y',$wpsap_order_ts) : '';
+$wpsap_billing_date = $wpsap_order_ts ? wp_date('F j, Y',strtotime('+14 days +1 month',$wpsap_order_ts)) : '';
+if($wpsap_switched_locale){ restore_previous_locale(); }
 
 // Solange Bild oder Link fehlen, steht der Kaeufer noch im Upload-Schritt.
@@ -85 +88 @@
 <?php } ?>
 
-    <div class="wpsap-flow__grid">
-
-        <aside class="wpsap-flow__aside">
-            <div class="wpsap-flow__site"><?php echo esc_html(get_bloginfo('name')); ?></div>
-
-            <?php if($wpsap_campaign_label !== '' || $wpsap_price_label !== ''){ ?>
-            <div class="wpsap-flow__facts">
-                <?php if($wpsap_campaign_label !== ''){ ?>
-                <div class="wpsap-flow__fact">
-                    <span class="wpsap-flow__fact-label"><?php esc_html_e('Ad space','wpsap_ads_plugin'); ?></span>
-                    <span class="wpsap-flow__fact-value"><?php echo esc_html($wpsap_campaign_label); ?></span>
-                </div>
-                <?php } ?>
-                <?php if($wpsap_price_label !== ''){ ?>
-                <div class="wpsap-flow__fact">
-                    <span class="wpsap-flow__fact-label"><?php esc_html_e('Per month','wpsap_ads_plugin'); ?></span>
-                    <span class="wpsap-flow__fact-value"><?php echo esc_html($wpsap_price_label); ?></span>
-                </div>
-                <?php } ?>
-            </div>
+    <?php /* Schritt 1: Upload - einspaltig zentriert. Bewusst NICHT im
+             Zwei-Spalten-Grid: die Aside gehoert erst auf die Bestaetigung.
+             Sichtbar bzw. verborgen nur ueber display:none - der gezeigte
+             Zustand kommt aus dem Stylesheet, damit wp-sap.js ihn per
+             .hide()/.show() korrekt umschalten kann. */ ?>
+    <section class="upload_ads_area" <?php if($wpsap_step_done){ echo 'style="display:none"'; } ?>>
+        <div class="wpsap-single">
+
+            <h1 class="wpsap-step__title">Upload your Ad</h1>
+
+            <p class="wpsap-step__lead">Attention: Make sure that you upload your desired advertising image (JPG, PNG, GIF) in the preferred resolution (up to max. 10 MB) and add the correct link to your offer.</p>
+
+            <?php if(trim($note_on_upload_page) !== ''){ ?>
+            <div class="wpsap-note"><?php echo esc_html($note_on_upload_page); ?></div>
             <?php } ?>
 
-            <?php if(trim($note_on_thanks_page) !== ''){ ?>
-            <div class="wpsap-flow__aside-note"><?php echo esc_html($note_on_thanks_page); ?></div>
-            <?php } ?>
-
-            <p class="wpsap-flow__copyright">Copyright <?php echo esc_html(get_bloginfo('name')); ?></p>
-        </aside>
-
-        <div class="wpsap-flow__main">
-
-            <section class="upload_ads_area" style="<?php echo $wpsap_step_done ? 'display:none' : 'display:block'; ?>">
-
-                <h1 class="wpsap-step__title">Upload your Ad</h1>
-                <p class="wpsap-step__lead">Attention: Make sure that you upload your desired advertising image (JPG, PNG, GIF) in the preferred resolution (up to max. 10 MB) and add the correct link to your offer.</p>
-
-                <?php if(trim($note_on_upload_page) !== ''){ ?>
-                <div class="wpsap-note"><?php echo esc_html($note_on_upload_page); ?></div>
-                <?php } ?>
-
-                <?php /* Nimmt die Meldungen auf, fuer die wp-sap.js bis 1.8.0
-                         alert() aufrief. */ ?>
-                <div class="wpsap-alert" id="wpsap_form_error" role="alert"></div>
-
-                <form action="" id="wp_sap_form" method="post" enctype="multipart/form-data" class="wpsap-card">
-                    <div class="file-area">
-                        <input type="hidden" name="action" value="wpsap_upload_image">
-                        <input type="hidden" name="security" id="wpsap_security" value="">
-                        <?php /* Die Bestellung wird serverseitig ueber die Session-ID
-                                 aufgeloest. Eine mitgeschickte order_id waere im Browser
-                                 frei aenderbar. */ ?>
-                        <input type="hidden" name="session" value="<?php echo esc_attr($session_id); ?>">
-                        <input type="file" name="image" id="images" accept="image/*" required="required">
-                        <div class="file-dummy">
-                            <?php if($image_uploaded){ ?>
-                            <div class="default">
-                                <img src="<?php echo esc_url($image_uploaded); ?>" alt="">
-                                <h6>Click on the image to change it</h6>
-                            </div>
-                            <?php } else { ?>
-                            <div class="default">
-                                <span class="wpsap-drop__icon" aria-hidden="true">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><path d="M21 15l-5-5L5 21"/></svg>
-                                </span>
-                                <h6>Drop image here or click to upload</h6>
-                            </div>
-                            <?php } ?>
-                            <div class="success" id="image_uploaded_area">
-                                <h5>Image Uploading....</h5>
-                            </div>
+            <?php /* Nimmt die Meldungen auf, fuer die wp-sap.js bis 1.8.0
+                     alert() aufrief. */ ?>
+            <div class="wpsap-alert" id="wpsap_form_error" role="alert"></div>
+
+            <form action="" id="wp_sap_form" method="post" enctype="multipart/form-data" class="wpsap-card">
+                <div class="file-area">
+                    <input type="hidden" name="action" value="wpsap_upload_image">
+                    <input type="hidden" name="security" id="wpsap_security" value="">
+                    <?php /* Die Bestellung wird serverseitig ueber die Session-ID
+                             aufgeloest. Eine mitgeschickte order_id waere im Browser
+                             frei aenderbar. */ ?>
+                    <input type="hidden" name="session" value="<?php echo esc_attr($session_id); ?>">
+                    <input type="file" name="image" id="images" accept="image/*" required="required">
+                    <div class="file-dummy">
+                        <?php if($image_uploaded){ ?>
+                        <div class="default">
+                            <img src="<?php echo esc_url($image_uploaded); ?>" alt="">
+                            <h6>Click on the image to change it</h6>
+                        </div>
+                        <?php } else { ?>
+                        <div class="default">
+                            <span class="wpsap-drop__icon" aria-hidden="true">
+                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><path d="M21 15l-5-5L5 21"/></svg>
+                            </span>
+                            <h6>Drop image here or click to upload</h6>
+                        </div>
+                        <?php } ?>
+                        <div class="success" id="image_uploaded_area">
+                            <h5>Image Uploading....</h5>
                         </div>
                     </div>
-
-                    <div class="wpsap-field">
-                        <input type="submit" value="Upload image" id="hidden_upload_image_btn" style="display:none;">
-                        <button type="button" id="upload_image_btn" class="wpsap-btn wpsap-btn--secondary">Upload image</button>
-                    </div>
-
-                    <div class="wpsap-field">
-                        <label class="wpsap-field__label" for="site_url">Link to your offer</label>
-                        <input type="text" id="site_url" name="site_url" value="<?php echo esc_url($link_added); ?>" placeholder="Paste your product link here...">
-                    </div>
-                </form>
-
+                </div>
+
+                <div class="wpsap-field">
+                    <input type="submit" value="Upload image" id="hidden_upload_image_btn" style="display:none;">
+                    <?php /* Der Upload-Button ist bewusst blau (SS3) und damit von
+                             der schwarzen Primaeraktion "Next" unterscheidbar. */ ?>
+                    <button type="button" id="upload_image_btn" class="wpsap-btn wpsap-btn--upload">Upload image</button>
+                </div>
+
+                <div class="wpsap-field">
+                    <label class="wpsap-field__label" for="site_url">Link to your offer</label>
+                    <input type="text" id="site_url" name="site_url" value="<?php echo esc_url($link_added); ?>" placeholder="Paste your product link here...">
+                </div>
+            </form>
+
+            <?php if($terms || $cencel || $cencel_policy){ ?>
+            <ul class="wpsap-links">
+                <?php if($terms){ ?>
+                <li><a href="<?php echo esc_url(get_the_permalink($terms)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($terms)); ?></a></li>
+                <?php } ?>
                 <?php if($cencel){ ?>
-                <ul class="wpsap-links">
-                    <li><a href="<?php echo esc_url(get_the_permalink($cencel)); ?>"><?php echo esc_html(get_the_title($cencel)); ?></a></li>
-                </ul>
+                <li><a href="<?php echo esc_url(get_the_permalink($cencel)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($cencel)); ?></a></li>
                 <?php } ?>
-
-                <div class="wpsap-actions">
-                    <input type="hidden" id="ads_image" value="<?php echo esc_url($image_uploaded); ?>">
-                    <button type="button" class="btn next wpsap-btn wpsap-btn--primary">Next</button>
-                </div>
-
-            </section>
-
-            <section class="purchased_area" style="<?php echo $wpsap_step_done ? 'display:block' : 'display:none'; ?>">
-
-                <h1 class="wpsap-step__title">Your order has been placed</h1>
-                <?php /* Kein Erstattungsversprechen: wpsap_reject_ads() kuendigt
-                         das Abo bei Stripe, mehr nicht. Bis 1.8.1 stand hier
-                         "you will automatically get your money back" - das
-                         loeste der Code nie ein. */ ?>
-                <p class="wpsap-step__lead">The advertisement has been successfully sent to the website owner. It may take up to 14 days for the ad to be reviewed and accepted. If your request is rejected or stays unanswered, your subscription is cancelled automatically and you will not be charged again. If your ad has been accepted, your advertising partnership will remain active until you or the website owner cancel it.</p>
-
-                <table>
-                    <tbody>
-                        <tr>
-                            <th scope="row">Start date</th>
-                            <td>After the website owner accept your ads.</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">End date</th>
-                            <td>Until someone quits</td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                <div class="link_input_desc_area">
-                    <div class="input-group">
-                        <?php /* Fuehrt in das Billing Portal von Stripe - dort kann der Kaeufer
-                                 selbst kuendigen und seine Rechnungen einsehen. */ ?>
-                        <input id="foo" type="text" class="link_copied_button" readonly value="<?php echo esc_url(add_query_arg(array('action' => 'wpsap_billing_portal','session' => $session_id),admin_url('admin-post.php'))); ?>">
-                        <span class="input-group-button">
-                            <button class="wpsap_ads_copy_btn" type="button" data-clipboard-target="#foo" title="Copy to clipboard" aria-label="Copy to clipboard">
-                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
-                            </button>
-                        </span>
-                    </div>
-
-                    <div class="wpsap-copy-hint">
-                        <span class="wpsap-copy-hint__icon" aria-hidden="true">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg>
-                        </span>
-                        <p>Save this link. With this link you can cancel your monthly advertising space rental in the future. If you want to cancel, you can use this link or simply ask the website owner directly.</p>
-                    </div>
-                </div>
-
-                <?php if($cencel_policy || $terms){ ?>
-                <ul class="wpsap-links">
-                    <?php if($cencel_policy){ ?>
-                    <li><a href="<?php echo esc_url(get_the_permalink($cencel_policy)); ?>"><?php echo esc_html(get_the_title($cencel_policy)); ?></a></li>
-                    <?php } ?>
-                    <?php if($terms){ ?>
-                    <li><a href="<?php echo esc_url(get_the_permalink($terms)); ?>"><?php echo esc_html(get_the_title($terms)); ?></a></li>
-                    <?php } ?>
-                </ul>
+                <?php if($cencel_policy){ ?>
+                <li><a href="<?php echo esc_url(get_the_permalink($cencel_policy)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($cencel_policy)); ?></a></li>
                 <?php } ?>
-
-                <div class="wpsap-actions">
-                    <button type="button" class="btn_back wpsap-btn wpsap-btn--quiet">Back</button>
-                    <button type="button" class="btn_finish wpsap-btn wpsap-btn--primary" data-link="<?php echo esc_url(get_site_url()); ?>">Finish</button>
-                </div>
-
-            </section>
+            </ul>
+            <?php } ?>
+
+            <div class="wpsap-actions">
+                <input type="hidden" id="ads_image" value="<?php echo esc_url($image_uploaded); ?>">
+                <button type="button" class="btn next wpsap-btn wpsap-btn--primary">Next</button>
+            </div>
 
         </div>
-    </div>
+    </section>
+
+    <?php /* Schritt 2: Bestaetigung - einspaltig, zentriert wie der
+             Upload-Schritt. Die frueher linke Aside (Logo, Fakten, Copyright)
+             wurde bewusst entfernt; nur .wpsap-flow__main traegt den Inhalt. */ ?>
+    <section class="purchased_area" <?php if(!$wpsap_step_done){ echo 'style="display:none"'; } ?>>
+
+        <div class="wpsap-flow__main">
+
+            <span class="wpsap-badge" aria-hidden="true">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z"/><path d="m9 12 2 2 4-4"/></svg>
+            </span>
+
+            <h1 class="wpsap-step__title">Your order has been placed</h1>
+            <?php /* Kein Erstattungsversprechen: wpsap_reject_ads() kuendigt
+                     das Abo bei Stripe, mehr nicht. Bis 1.8.1 stand hier
+                     "you will automatically get your money back" - das
+                     loeste der Code nie ein. */ ?>
+            <p class="wpsap-step__lead">The advertisement has been successfully sent to the website owner. It may take up to 14 days for the ad to be reviewed and approved. If your request is rejected or remains unanswered, your subscription will be cancelled automatically, and you will not be charged. If your ad is approved, your advertising partnership will remain active until you or the website owner cancels it.</p>
+
+            <?php /* Stand bis 1.8.3 in der linken Aside. Die Notiz ist optional
+                     konfigurierbar und darf mit der entfernten Spalte nicht
+                     verschwinden - sie sitzt jetzt hier im Hauptbereich. */ ?>
+            <?php if(trim($note_on_thanks_page) !== ''){ ?>
+            <div class="wpsap-note"><?php echo esc_html($note_on_thanks_page); ?></div>
+            <?php } ?>
+
+            <table>
+                <tbody>
+                    <tr>
+                        <th scope="row">Offer Submitted</th>
+                        <td><?php echo esc_html($wpsap_submitted_date); ?></td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Expected start date</th>
+                        <td>Waiting for website owner to review (Maximum 14 days)</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">End date</th>
+                        <td>Until you or website owner cancels</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Billing date</th>
+                        <td><?php echo esc_html($wpsap_billing_date); ?></td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <div class="link_input_desc_area">
+                <div class="input-group">
+                    <?php /* Fuehrt in das Billing Portal von Stripe - dort kann der Kaeufer
+                             selbst kuendigen und seine Rechnungen einsehen. */ ?>
+                    <input id="foo" type="text" class="link_copied_button" readonly value="<?php echo esc_url(add_query_arg(array('action' => 'wpsap_billing_portal','session' => $session_id),admin_url('admin-post.php'))); ?>">
+                    <span class="input-group-button">
+                        <button class="wpsap_ads_copy_btn" type="button" data-clipboard-target="#foo" title="Copy to clipboard" aria-label="Copy to clipboard">
+                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
+                        </button>
+                    </span>
+                </div>
+
+                <div class="wpsap-copy-hint">
+                    <span class="wpsap-copy-hint__icon" aria-hidden="true">
+                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg>
+                    </span>
+                    <p>Please save this link. You can use it at any time to manage your subscription or cancel your monthly advertising space rental. If you wish to cancel, simply use this link or contact the website owner directly.</p>
+                </div>
+            </div>
+
+            <div class="wpsap-actions">
+                <button type="button" class="btn_back wpsap-btn wpsap-btn--quiet">Back</button>
+                <button type="button" class="btn_finish wpsap-btn wpsap-btn--primary" data-link="<?php echo esc_url(get_site_url()); ?>">Finish</button>
+            </div>
+
+        </div>
+    </section>
+
 </div>
 

sell-ads/tags/1.9.6/inc/page/style.css

@@ -107 +107 @@
 
 /* ==========================================================================
-   Zweispaltiger Rahmen
+   Rahmen: Upload einspaltig (SS3), Bestaetigung zweispaltig (SS4)
    ========================================================================== */
 
@@ -120 +120 @@
 }
 
-.wpsap-flow__grid {
+/* Die Bestaetigung ist einspaltig (die frueher linke Aside mit Logo, Fakten
+   und Copyright ist entfernt). flex:1 1 auto fuellt die Resthoehe unter dem
+   Flex-#wpsap-flow - das tat vorher .wpsap-flow__grid. */
+.purchased_area {
     flex: 1 1 auto;
-    display: grid;
-    grid-template-columns: minmax(240px, 320px) 1fr;
-    align-items: stretch;
-}
-
-.wpsap-flow__aside {
-    background-color: var(--wpsap-canvas-soft, #fafafa);
-    border-right: 1px solid var(--wpsap-line, #dcdfe3);
-    padding: 2.5rem 1.75rem;
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
+}
+
+/* Bleibt fuer den Upload-Schritt (Marken-Text als Logo-Fallback). */
 #wpsap-flow .wpsap-flow__site {
     font-size: 22px;
@@ -144 +136 @@
 }
 
-.wpsap-flow__facts {
+/* Bestaetigung: Inhalt zentriert mit fester Maximalbreite (SS4). Die
+   Blanket-Regel gibt jedem direkten Kind dieselbe Breite, damit Badge, Titel,
+   Tabelle und Aktionszeile buendig uebereinanderstehen. */
+.wpsap-flow__main {
+    padding: 3rem 1.75rem;
     display: flex;
     flex-direction: column;
-    gap: .75rem;
-}
-
-.wpsap-flow__fact {
-    display: flex;
-    flex-direction: column;
-    gap: .15rem;
-}
-
-#wpsap-flow .wpsap-flow__fact-label {
-    font-size: 12px;
+    align-items: center;
+    text-align: center;
+}
+
+.wpsap-flow__main > * {
+    width: 100%;
+    max-width: 520px;
+}
+
+/* Schritt 1 ist einspaltig und ohne Aside. wp-sap.js schaltet die Sichtbarkeit
+   per .hide()/.show(); der gezeigte Zustand kommt aus dem Stylesheet, das
+   Markup setzt inline nur display:none fuer den verborgenen Schritt - so
+   ueberschreibt keine Inline-Regel das Grid der Bestaetigung. */
+.upload_ads_area {
+    flex: 1 1 auto;
+    padding: 3rem 1.25rem;
+}
+
+.wpsap-single {
+    width: 100%;
+    max-width: 560px;
+    margin: 0 auto;
+}
+
+/* Nur der Kopfbereich des Upload-Schritts ist zentriert; Karte und Felder
+   darunter bleiben linksbuendig. */
+.wpsap-single > .wpsap-flow__brand,
+.wpsap-single > .wpsap-step__title,
+.wpsap-single > .wpsap-step__subtitle,
+.wpsap-single > .wpsap-step__lead {
+    text-align: center;
+}
+
+.wpsap-single > .wpsap-flow__brand {
+    margin-bottom: 1.5rem;
+}
+
+.upload_ads_area .wpsap-links {
+    justify-content: center;
+}
+
+
+/* ==========================================================================
+   Logo, Untertitel und Erfolgs-Badge
+   ========================================================================== */
+
+/* Logo (get_custom_logo) oben im Upload-Schritt bzw. in der Aside. In der
+   Aside bleibt es linksbuendig wie die uebrigen Angaben. */
+#wpsap-flow .wpsap-flow__brand img,
+#wpsap-flow .custom-logo {
+    display: inline-block;
+    width: auto;
+    height: auto;
+    max-height: 52px;
+}
+
+#wpsap-flow .wpsap-step__subtitle {
+    font-size: 16px;
     font-weight: 600;
-    letter-spacing: .04em;
-    text-transform: uppercase;
-    color: var(--wpsap-muted, #6b7280);
-}
-
-#wpsap-flow .wpsap-flow__fact-value {
-    font-size: 16px;
-    font-weight: 500;
-    color: var(--wpsap-ink, #161616);
-    overflow-wrap: anywhere;
-}
-
-#wpsap-flow .wpsap-flow__aside-note {
-    font-size: 14px;
-    line-height: 1.55;
+    line-height: 1.35;
     color: var(--wpsap-ink-soft, #4a4a4a);
-    white-space: pre-line;
-}
-
-/* Schiebt das Copyright ans untere Ende, ohne es dort festzunageln -
-   bei viel Inhalt rutscht es einfach mit. */
-#wpsap-flow .wpsap-flow__copyright {
-    margin-top: auto;
-    padding-top: 1.5rem;
-    font-size: 13px;
-    color: var(--wpsap-muted, #6b7280);
-}
-
-.wpsap-flow__main {
-    padding: 2.5rem 1.75rem 3rem;
+    margin: 0 0 1rem 0;
+}
+
+/* Siegel mit Haken ueber dem Titel der Bestaetigung (SS4). */
+.wpsap-badge {
     display: flex;
     justify-content: center;
-}
-
-/* Die beiden Schritte behalten ihre Bestandsklassen: inc/page/wp-sap.js
-   blendet sie ueber .hide()/.show() um und setzt dabei display:block. */
-.upload_ads_area,
-.purchased_area {
-    width: 100%;
-    max-width: 640px;
+    color: var(--wpsap-ink, #161616);
+    margin-bottom: 1rem;
+}
+
+#wpsap-flow .wpsap-badge svg {
+    display: block;
+    width: 64px;
+    height: 64px;
 }
 
@@ -331 +351 @@
 }
 
+/* Blauer Upload-Button (SS3) - hebt das Hochladen von der schwarzen
+   Primaeraktion "Next" ab. Fuellt die Breite der Karte. */
+#wpsap-flow .wpsap-btn--upload {
+    width: 100%;
+    background-color: #337ab6;
+    border-color: #337ab6;
+    color: #fff;
+}
+
+#wpsap-flow .wpsap-btn--upload:hover {
+    background-color: #2b6698;
+    border-color: #2b6698;
+}
+
 #wpsap-flow .wpsap-btn[disabled] {
     opacity: .6;
@@ -507 +541 @@
     text-align: left;
     vertical-align: top;
+    /* Beide Spalten identisch: schwarze Schrift auf weissem Grund. Explizit
+       gesetzt, damit kein Theme-CSS auf der Bestaetigungsseite durchschlaegt. */
+    color: #000;
+    background-color: #fff;
 }
 
 #wpsap-flow .purchased_area th {
     width: 40%;
-    font-weight: 600;
-    color: var(--wpsap-ink, #161616);
-    background-color: var(--wpsap-canvas-soft, #fafafa);
 }
 
@@ -521 +556 @@
     border-radius: var(--wpsap-radius-sm, 5px);
     padding: 1rem;
+    /* Der Hauptbereich zentriert seinen Inhalt (SS4); Feld und Hinweis bleiben
+       darin aber linksbuendig. */
+    text-align: left;
 }
 
@@ -604 +642 @@
     }
 
-    .wpsap-flow__grid {
-        grid-template-columns: 1fr;
-    }
-
-    .wpsap-flow__aside {
-        border-right: 0;
-        border-bottom: 1px solid var(--wpsap-line, #dcdfe3);
-        padding: 1.75rem 1.25rem;
-        gap: 1.25rem;
-    }
-
-    /* Gestapelt gehoert das Copyright unter den Inhalt der Spalte,
-       nicht ans Ende eines nicht mehr vorhandenen Streifens. */
-    #wpsap-flow .wpsap-flow__copyright {
-        margin-top: 0;
-        padding-top: 0;
-    }
-
     .wpsap-flow__main {
         padding: 1.75rem 1.25rem 2.5rem;

sell-ads/tags/1.9.6/inc/settings.php

@@ -94 +94 @@
                         <?php $this->wpsap_notify_callback(); ?>
 
-                        <details class="wpsap-more">
-                                <summary><?php esc_html_e( 'Pages and texts','wpsap_ads_plugin' ); ?></summary>
+                        <h2 class="wpsap-step"><?php esc_html_e( 'Pages and texts','wpsap_ads_plugin' ); ?></h2>
                                 <table class="form-table" role="presentation">
                                         <tr>
-                                                <th scope="row"><label for="terms_condtions_0"><?php esc_html_e( 'Terms of Service','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="terms_condtions_0"><?php esc_html_e( 'Terms of Service (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_terms_condtions_0_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="template_cencel_subscription_1"><?php esc_html_e( 'Uploading Policy','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="template_cencel_subscription_1"><?php esc_html_e( 'Uploading Policy (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_template_cencel_subscription_1_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="template_cencel_policy_1"><?php esc_html_e( 'Cancel Policy','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="template_cencel_policy_1"><?php esc_html_e( 'Cancel Policy (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_template_cencel_policy_1_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="notification_2"><?php esc_html_e( 'Note for the buyer','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="notification_2"><?php esc_html_e( 'Note for the buyer (Shown on the Stripe payment page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_notification_2_callback(); ?></td>
                                         </tr>
@@ -122 +121 @@
                                         </tr>
                                 </table>
-                        </details>
 
                         <?php submit_button(); ?>
@@ -142 +140 @@
                         border: 1px solid #dcdcde;
                         border-left: 4px solid #2271b1;
-                }
-                .wpsap-settings .wpsap-more {
-                        margin-top: 32px;
-                        padding-top: 8px;
-                        border-top: 1px solid #dcdcde;
-                }
-                .wpsap-settings .wpsap-more > summary {
-                        cursor: pointer;
-                        font-size: 1.15em;
-                        font-weight: 600;
-                        padding: 8px 0;
                 }
                 </style>
@@ -241 +228 @@
                 $status = wpsap_connect_account_status();
                 ?>
-                <p>Payments run through the Sell Ads platform at <code>sellads.cybie.de</code>.
+                <p>Payments run through our SellAds platform.
                 Your advertisers pay into your own Stripe account. No API key and no webhook setup needed.</p>
 
@@ -330 +317 @@
                 </p>
                 <p class="description">Stripe cannot change this later, so please pick the country your business is registered in.</p>
-                <p class="description">
-                        <a href="https://sellads.cybie.de/terms.html" target="_blank" rel="noopener noreferrer">Terms of service</a>
-                        &middot;
-                        <a href="https://sellads.cybie.de/privacy.html" target="_blank" rel="noopener noreferrer">Privacy policy</a>
-                </p>
                 <?php
         }
@@ -505 +487 @@
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_test_mode" value="live" <?php checked( 'live', $mode ); ?>>
-                        Live &mdash; buyers pay through Stripe
+                        Live
                 </label>
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_test_mode" value="test" <?php checked( 'test', $mode ); ?>>
-                        Test mode &mdash; walk through the plugin without setting up Stripe
+                        Test mode
                 </label>
                 <p class="description">
@@ -519 +501 @@
                 if ( wpsap_test_mode() ) {
                         echo '<p class="notice notice-warning inline" style="padding:8px 12px;margin:8px 0 0;">'
-                                . '<strong>Test mode is on.</strong> Visitors can place orders without paying, and the ad space says so.'
+                                . '<strong>Test mode is on.</strong> Visitors can place orders without paying.'
                                 . '</p>';
                 }
@@ -529 +511 @@
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_payment_mode" value="connect" <?php checked( 'connect', $mode ); ?>>
-                        Connect with Stripe &mdash; one click, nothing to set up
+                        Connect with Stripe Express &mdash; Suggestion for Beginners
                 </label>
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_payment_mode" value="own_key" <?php checked( 'own_key', $mode ); ?>>
-                        Use my own Stripe key &mdash; you add the key and the webhook yourself
+                        Use my own Stripe key &mdash; Suggestion for Advanced Users
                 </label>
                 <?php
@@ -627 +609 @@
         public function wpsap_terms_condtions_0_callback() {
                 ?> <select name="wpsap_option_name[terms_condtions_0]" id="terms_condtions_0">
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['terms_condtions_0'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['terms_condtions_0'] ) && $this->wpsap_options['terms_condtions_0'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>
@@ -637 +620 @@
         public function wpsap_template_cencel_subscription_1_callback() {
                 ?> <select name="wpsap_option_name[template_cencel_subscription_1]" id="template_cencel_subscription_1">
-                        
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['template_cencel_subscription_1'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['template_cencel_subscription_1'] ) && $this->wpsap_options['template_cencel_subscription_1'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>
@@ -647 +630 @@
                 public function wpsap_template_cencel_policy_1_callback() {
                 ?> <select name="wpsap_option_name[template_cencel_policy_1]" id="template_cencel_policy_1">
-                        
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['template_cencel_policy_1'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['template_cencel_policy_1'] ) && $this->wpsap_options['template_cencel_policy_1'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>

sell-ads/tags/1.9.6/inc/shortcode.php

@@ -8 +8 @@
     $price = get_post_meta($id,"wpsap_campaign_price",true);
     $button_text = get_post_meta($id, "wpsap_button_text",true);
-    if(empty($title)){
-        $title = __('This Ad Space is for Sale','wpsap_ads_plugin');
-    }
+    // Kein Default-Titel: der Platz zeigt einen Titel nur, wenn der Betreiber
+    // ihn aktiv gesetzt hat (Ausgabe unten bedingt).
     if(empty($button_text)){
         $button_text = __('Buy','wpsap_ads_plugin');
@@ -27 +26 @@
     <div class="wpsap_ads_plugin_ads_box">
         <div class="wpsap_ads_plugin_ads_box_container">
+        <?php if((string) $title !== ''){ ?>
         <div class="wpsap_ads_plugin_ads_box_title"><?php echo esc_html($title); ?></div>
+        <?php } ?>
         <form class="wpsap_ads_plugin_ads_box_form" method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
             <input type="hidden" name="action" value="wpsap_start_checkout">
@@ -48 +49 @@
     }
     else {
+        // Klicks auf die veroeffentlichte Anzeige laufen ueber /goto/<slug>,
+        // damit der Zaehler der Kampagne hochlaeuft (inc/hooks.php) - derselbe
+        // Zaehler, den auch der Buy-Button-Klick erhoeht (inc/checkout.php).
+        // Fallback auf die ID, falls der Slug (post_name) leer ist.
+        $slug = get_post_field('post_name',$id);
+        if(empty($slug)){
+            $slug = $id;
+        }
+        // user_trailingslashit() richtet sich nach der Permalink-Struktur der
+        // Seite. Ohne das haengt WordPress bei Trailing-Slash-Permalinks erst
+        // einen 301 an, bevor der Redirect greift - ein unnoetiger Hop auf
+        // jedem Anzeigenklick.
+        $goto_url = home_url(user_trailingslashit('goto/'.$slug));
         foreach($activer_orders as $ad){
-            $url = get_post_meta($ad->ID, "order_url",true);
-         ?> 
+         ?>
     <div class="wpsap_ads_plugin_ads_box">
         <div class="wpsap_ads_plugin_ads_box_container">
-        <a href="<?php echo esc_attr($url); ?>" target="_blank" rel="noopener noreferrer nofollow"><img style="max-width:100%;" src="<?php echo esc_attr(get_post_meta($ad->ID, "order_image",true)); ?>"></a>
+        <a href="<?php echo esc_url($goto_url); ?>" target="_blank" rel="noopener noreferrer nofollow"><img style="max-width:100%;" src="<?php echo esc_attr(get_post_meta($ad->ID, "order_image",true)); ?>"></a>
         </div>
     </div>

sell-ads/tags/1.9.6/inc/stripe.php

@@ -157 +157 @@
         ),
         'subscription_data'    => array(
+            // Waehrend der Pruefungsfrist wird nicht belastet: das Abo startet
+            // im Trial, die erste Rechnung entsteht erst, wenn der Betreiber die
+            // Bestellung annimmt (wpsap_stripe_end_trial) - oder gar nicht, wenn
+            // sie nach 14 Tagen ablaeuft und das Abo vorher gekuendigt wird.
+            // 16 statt 14 Tage: der Ablauf-Cron laeuft nur taeglich, der Puffer
+            // stellt sicher, dass die Kuendigung immer vor dem Trial-Ende greift.
+            'trial_period_days' => 16,
             'metadata' => array(
                 'wpsap_place_id' => (string) $campaign_id,
@@ -210 +217 @@
     }
     return wpsap_stripe_request('DELETE','subscriptions/'.rawurlencode($subscription_id));
+}
+
+/**
+ * Beendet den Trial eines Abos sofort. Dadurch stellt Stripe die erste
+ * Rechnung unmittelbar aus. Aufgerufen beim Annehmen einer Bestellung: erst
+ * dann - nicht schon beim Checkout - soll der Kaeufer belastet werden.
+ */
+function wpsap_stripe_end_trial($subscription_id){
+    $subscription_id = sanitize_text_field($subscription_id);
+    if(empty($subscription_id)){
+        return new WP_Error('wpsap_no_subscription',__('No subscription stored for this order.','wpsap_ads_plugin'));
+    }
+    if(wpsap_connect_is_active()){
+        return wpsap_connect_end_trial($subscription_id);
+    }
+    return wpsap_stripe_request('POST','subscriptions/'.rawurlencode($subscription_id),array('trial_end' => 'now'));
 }
 

sell-ads/tags/1.9.6/readme.txt

@@ -5 +5 @@
 Tested up to: 7.0
 Requires PHP: 7.0
-Stable tag: 1.8.2
+Stable tag: 1.9.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -241 +241 @@
 If you want to fill unsold inventory automatically, you want an ad network, not this. This plugin
 does nothing until a real advertiser buys a real space from you. If you need impression counting,
-click tracking, geo-targeting or A/B rotation, this plugin has none of it on purpose: an ad here is
-an image and a link, and that is the entire point. And if you would rather never speak to an
+geo-targeting or A/B rotation, this plugin has none of it on purpose: an ad here is an image and a
+link, and that is the entire point. It does count clicks — first-party, on your own server, with no
+cookies and no third-party script — but that is as far as the measuring goes. And if you would rather never speak to an
 advertiser, be aware that even though the purchase itself is automatic, you are the one who decides
 what runs on your site.
@@ -402 +403 @@
 
 == Changelog ==
+
+= 1.9.0 =
+* New: the campaign list shows a "Clicks" column again, counting how often each ad space was clicked. Published ads now link through a first-party /goto/<slug> redirect on your own domain that counts the click and forwards the visitor to the advertiser — no cookies and no third-party script are involved, and clicks from logged-in editors are not counted.
+* Fixed: the "PHP" and "Shortcode" columns showed their raw HTML instead of a usable field. They are copyable input fields again, each with a copy button.
+
+= 1.8.4 =
+* The confirmation step is now a single centred column, matching the upload step. The left column that repeated your site name, the ad space and the monthly price has been removed; the confirmation badge, the summary table and the cancellation link stay.
+
+= 1.8.3 =
+* The buyer flow was reworked to match the intended design. The ad space now shows as a rounded card instead of a square band.
+* The upload step is a single centred column again, with your site logo on top, the ad space name below the heading, and a clearly separated blue upload button. Your terms and refund pages are linked right there.
+* The confirmation step keeps its two columns and now opens with a confirmation badge and a four-row summary: when the request was submitted, the expected review window, that the partnership runs until either side cancels, and the expected first billing date.
+* Uses your WordPress site logo (Appearance → Customize) on both pages when one is set, otherwise your site name.
 
 = 1.8.2 =
@@ -456 +470 @@
 == Upgrade Notice ==
 
+= 1.9.0 =
+The campaign list has a Clicks column again and published ads are counted through a first-party /goto redirect on your own domain. The PHP and Shortcode columns are copyable fields again. No reconfiguration needed; the redirect rule is registered automatically on update.
+
+= 1.8.4 =
+The confirmation page after upload is now a single centred column; the left sidebar with the site name and price has been removed. No reconfiguration needed.
+
+= 1.8.3 =
+Visual update to the pages buyers see. The ad space is a rounded card, the upload step is a single centred column with your site logo, and the confirmation shows a badge and a clear date summary. No reconfiguration needed.
+
 = 1.8.2 =
 Documentation only — the plugin code is identical to 1.8.1. The description now covers pricing, placement and finding your first advertiser.

sell-ads/tags/1.9.6/wp-sap.php

@@ -5 +5 @@
  * Plugin URI:        https://cybie.de
  * Description:       The easiest way to sell adspace on your WordPress Website
- * Version:           1.8.2
+ * Version:           1.9.6
  * Requires at least: 6.0
  * Requires PHP:      7.0
@@ -17 +17 @@
 
 
-define("WPSAP_Version",'1.8.2');
+define("WPSAP_Version",'1.9.6');
 define('WPSAP_Plugin_Path',plugin_dir_path( __FILE__ ));
 define('WPSAP_Plugin_Dir',plugin_dir_url( __FILE__ ));
@@ -81 +81 @@
         wp_schedule_event(time() + HOUR_IN_SECONDS,'daily','wpsap_expire_pending_orders');
     }
+
+    // Damit /goto/<slug> sofort nach der Aktivierung greift, muss die
+    // Rewrite-Rule bekannt sein und einmal geflusht werden. Die laufende
+    // Absicherung uebernimmt der Versions-Guard in wpsap_goto_rewrite().
+    wpsap_goto_rewrite();
+    flush_rewrite_rules();
 }
 
@@ -86 +92 @@
 function wpsap_deactivate(){
     wp_clear_scheduled_hook('wpsap_expire_pending_orders');
+
+    // Die /goto-Rewrite-Rule wird ohne aktives Plugin nicht mehr registriert -
+    // der Flush raeumt sie aus den gespeicherten Regeln. Beim naechsten
+    // Aktivieren sorgt der Versions-Guard fuer die Neuanlage.
+    delete_option('wpsap_rewrite_version');
+    flush_rewrite_rules();
 }
 

sell-ads/trunk/css/style.css

@@ -26 +26 @@
 }
 
+/* Freistehende, abgerundete Karte auf hellem Grund (SS1) statt des frueheren
+   kantigen Vollbreiten-Bandes. Der Radius stand bis 1.8.2 per !important auf 0
+   und musste hier aktiv ueberschrieben werden - jetzt traegt die Box Ecken und
+   einen weichen Schatten selbst. width:100% bleibt: die Karte fuellt die Breite
+   ihres Widgets/Containers, hebt sich aber durch Radius und Schatten ab. */
 .wpsap_ads_plugin_ads_box {
     width: 100%;
     box-sizing: border-box;
-    background-color: var(--wpsap-canvas, #f0f1f2);
-    border-radius: 0 !important;
+    background-color: #F2F3F5;
+    /* border-radius: 14px; */
+    /* box-shadow: var(--wpsap-shadow, 0 1px 3px rgba(0, 0, 0, .08)); */
     text-align: center;
     display: flex;

sell-ads/trunk/inc/ajax.php

@@ -84 +84 @@
         update_post_meta($order_id,'order_image',$data['url']);
         update_post_meta($order_id,'order_url',$site_url);
+        // Attachment-ID mitfuehren, damit das Motiv beim Ablehnen/Kuendigen/
+        // Ablaufen restlos aus der Mediathek entfernt werden kann
+        // (wpsap_delete_order_media() in inc/helper.php).
+        update_post_meta($order_id,'wpsap_order_image_id',$image);
     }
     else {

sell-ads/trunk/inc/campaign_fields.php

@@ -16 +16 @@
  function wpsap_campaign_metaboxes_html(){
     global $post;
+    // Keine Prefill-Defaults: leere Felder bleiben leer, damit im Frontend nur
+    // erscheint, was der Betreiber aktiv eingetragen hat.
     $campaign_title = get_post_meta($post->ID, "wpsap_campaign_title",true);
-    if(empty($campaign_title)){
-        $campaign_title = 'This Advertising space is for sale';
-    }
 
     $campaign_name = get_the_title($post->ID);
@@ -27 +26 @@
 
     $button_text = get_post_meta($post->ID, "wpsap_button_text",true);
-    if(empty($button_text)){
-        $button_text = 'Buy';
-    }
 
     // Ohne dieses Feld schlug die Nonce-Pruefung beim Speichern immer fehl
@@ -53 +49 @@
   <span class="tooltiptext">This title is used to advertise your ad space.</span>
 </div>
-            <input type="text" name="wpsap_campaign_title" class="regular-text" value="<?php echo esc_attr($campaign_title); ?>" required>
+            <input type="text" name="wpsap_campaign_title" class="regular-text" value="<?php echo esc_attr($campaign_title); ?>">
             </td>
          </tr>
@@ -68 +64 @@
          </tr>
 
+         <?php $currency = strtoupper(wpsap_stripe_currency()); ?>
          <tr>
-            <td><h4>Monthly Price ($)</h4></td>
+            <td><h4>Monthly Price (<?php echo esc_html($currency); ?>)</h4></td>
             <td>
             <div class="tooltip"><span class="dashicons dashicons-info"></span>
-  <span class="tooltiptext">This is the monthly price in US dollars for which you want to rent out your ad space.</span>
+  <span class="tooltiptext">This is the monthly price in <?php echo esc_html($currency); ?> for which you want to rent out your ad space.</span>
 </div>
             <input type="number" step="0.01" min="0" name="wpsap_campaign_price" class="regular-text" value="<?php echo esc_attr(get_post_meta($post->ID, "wpsap_campaign_price",true)); ?>" required>
@@ -194 +191 @@
     $columns['title'] = __( 'Campaign', "wpsap");
     $columns['price'] = __( 'Price', "wpsap");
-   
+    // Info-Icon mit CSS-Tooltip: erklaert die zwei gezaehlten Ereignisse. Der
+    // native title-Tooltip erschien nicht zuverlaessig, deshalb dieselbe
+    // .tooltiptext-Mechanik wie in der Metabox. Das noetige CSS steht - auf die
+    // Liste gescoped - im admin_footer (wpsap_campaign_copy_field()). WordPress
+    // gibt das Spalten-Label als HTML aus, daher ohne eigenes Enqueue.
+    // Icon und Text stehen in getrennten Spans: nur das Icon traegt die
+    // dashicons-Klasse, sonst wuerde der Tooltip-Text in der Icon-Schrift
+    // gerendert.
+    $columns['clicks'] = __( 'Clicks', "wpsap")
+        . ' <span class="wpsap-th-tip" tabindex="0">'
+        . '<span class="dashicons dashicons-info"></span>'
+        . '<span class="wpsap-th-tiptext">'
+        . esc_html__('Total clicks for this ad slot: clicks on the “Buy” button (before the slot is sold) plus outbound clicks on the published ad.','wpsap_ads_plugin')
+        . '</span></span>';
     $columns['pdate'] = __( 'Date', "wpsap");
     $columns['php'] = __( 'PHP', "wpsap");
@@ -211 +221 @@
             echo  esc_html(get_post_meta($post_id, "wpsap_campaign_price",true).' '.strtoupper(wpsap_stripe_currency())." per month");
             break;
+        case 'clicks' :
+            // Zaehler wird an zwei Stellen hochgezaehlt: beim /goto-Redirect
+            // (inc/hooks.php) und beim Buy-Button-Klick (wpsap_start_checkout,
+            // inc/checkout.php).
+            // Als Link auf die Kampagne ausgegeben, damit die Zahl - wie in der
+            // Vorlage - klickbar ist und in WP-Blau erscheint.
+            $clicks = (int) get_post_meta($post_id, "wpsap_click_count",true);
+            $edit_link = get_edit_post_link($post_id);
+            if($edit_link){
+                echo '<a href="'.esc_url($edit_link).'">'.esc_html($clicks).'</a>';
+            } else {
+                echo esc_html($clicks);
+            }
+            break;
         case 'php' :
-            echo  esc_html(wpsap_plugin_php_function($post_id));
+            // Bewusst ohne esc_html(): wpsap_plugin_php_function() liefert das
+            // fertige Kopier-Feld und escapt seinen dynamischen Wert selbst.
+            echo  wpsap_plugin_php_function($post_id);
             break;
         case 'shortcode' :
-            echo  esc_html(wpsap_shortcode_input($post_id));
+            echo  wpsap_shortcode_input($post_id);
             break;
 
@@ -230 +256 @@
     $columns['order'] = __( 'Order', "wpsap");
     $columns['campaign'] = __( 'Campaign', "wpsap");
-    $columns['pdate'] = __( 'Date', "wpsap");
+    $columns['pdate'] = __( 'Order Date', "wpsap");
     $columns['status'] = __( 'Status', "wpsap");
-    $columns['billing'] = __( 'Billing', "wpsap");
     $columns['resources'] = __( 'Resources', "wpsap");
     $columns['link'] = __( 'Link', "wpsap");
@@ -251 +276 @@
             // entstanden sind - die Spalte Total zeigt trotzdem einen Betrag.
             if(get_post_meta($post_id,'wpsap_test_order',true) === 'yes'){
-                echo '<br/><small><span style="color:#996800;">'.esc_html__('Test order — not paid','wpsap_ads_plugin').'</span></small>';
+                echo '<br/><small><span style="color:#996800;">'.esc_html__('Test order','wpsap_ads_plugin').'</span></small>';
             }
             break;
@@ -268 +293 @@
                 $final_dates = wpsap_order_days_left($post_id);
                 if($final_dates > 0){
+                    // Ablaufdatum = Bestelldatum + 14 Tage, dieselbe Frist wie
+                    // in wpsap_order_days_left().
+                    $placed = get_post_time('U',true,$post_id);
+                    $expires = $placed ? $placed + 14 * DAY_IN_SECONDS : time() + $final_dates * DAY_IN_SECONDS;
                     echo '<strong>Pending</strong>';
-                     echo '<br/><small><span>('.esc_html($final_dates).' days until expiration)</span></small>';
+                     echo '<br/><small><span>(Request expires on '.esc_html(wp_date(get_option('date_format'),$expires)).')</span></small>';
                 }
                 else {
@@ -291 +320 @@
                    echo "<span style='color:#ff0000;'>Rejected</span>";
                }
+               else if($current_status == 'expired'){
+                   $on = (int) get_post_meta($post_id, "wpsap_expired_on",true);
+                   if(!$on){
+                       $placed = get_post_time('U',true,$post_id);
+                       $on = $placed ? $placed + 14 * DAY_IN_SECONDS : 0;
+                   }
+                   echo "<span style='color:#ff0000;'>Expired</span>";
+                   if($on){
+                       echo "<br/><small>(on ".esc_html(wp_date(get_option('date_format'),$on)).")</small>";
+                   }
+               }
                else {
                     echo esc_html($current_status); 
@@ -297 +337 @@
             }
             break;
-        case 'billing' :
-            echo  esc_html(get_post_meta($post_id, "order_email",true));
-             break;
         case 'resources' :
-            $url = get_post_meta($post_id, "order_url",true);
-            echo  '<a target="_blank" href="'.esc_url(get_post_meta($post_id, "order_image",true)).'"><img style="max-width:120px;" src="'.esc_url(get_post_meta($post_id, "order_image",true)).'"></a>';
+            // Nach Reject/Cancel/Expired ist das Motiv geloescht (order_image
+            // leer) - dann kein kaputtes <img> ausgeben.
+            $image = get_post_meta($post_id, "order_image",true);
+            if($image){
+                echo  '<a target="_blank" href="'.esc_url($image).'"><img style="max-width:120px;" src="'.esc_url($image).'"></a>';
+            } else {
+                echo '&mdash;';
+            }
             break;
         case 'link' :
             $url = get_post_meta($post_id, "order_url",true);
-            echo  '<a href="'.esc_url($url).'">'.esc_url($url).'</a>';
+            if($url){
+                echo  '<a href="'.esc_url($url).'">'.esc_url($url).'</a>';
+            } else {
+                echo '&mdash;';
+            }
             break;
         case 'total' :
             $status = get_post_meta($post_id, "wpsap_order_status",true);
             if($status == "accepted"){
-                echo "<small>You have confirmed the advertising partnership. Now you need to publish the advertisement. Make sure that the ad is displayed correctly and that the product link works. If there are any errors, you should contact the buyer immediately. If the buyer does not cancel within the next 14 days, the first transaction will be executed. The monthly payment will remain until someone cancels.</small>";
+                echo "<small>You have confirmed the advertising partnership, and the first payment was charged when you accepted. Please publish the advertisement now: make sure it displays correctly and that the product link works, and contact the buyer right away if anything is wrong. The monthly payment continues until the subscription is cancelled &mdash; either by you here, or by the buyer from their own Stripe billing portal, which they can reach through the link on their order confirmation page.</small>";
             }
             else {
@@ -320 +367 @@
                     $currency = wpsap_stripe_currency();
                 }
-                echo esc_html(number_format_i18n($total,2).' '.strtoupper($currency));
+                echo esc_html(number_format_i18n($total,2).' '.strtoupper($currency).' per month');
             }
             break;
@@ -334 +381 @@
                 echo 'This subscription was cancelled by the buyer.';
             }
+            elseif($status == 'expired'){
+                // Nach 14 Tagen ohne Annahme ueber wpsap_expire_ads() beendet -
+                // das Abo stand noch im Trial, es wurde also nichts berechnet.
+                echo 'This request expired unanswered. No payment was charged.';
+            }
             elseif($status != "accepted" && $status != "published"){
-            echo '<a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Reject</a> | <a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button accept_ads">Accept</a>';
+            echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button button-primary accept_ads">Accept</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Reject</a>';
             }
 
@@ -343 +395 @@
              }
              else {
-               echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button button-primary accept_ads">Unpublish</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Cancel</a>';
+               echo '<a href="'.esc_url(wpsap_order_action_url('accept',$post_id)).'" class="button accept_ads">Unpublish</a> | <a href="'.esc_url(wpsap_order_action_url('reject',$post_id)).'" class="button reject_ads">Cancel</a>';
              }
             }
@@ -356 +408 @@
     if(isset($_GET['post_type'])){
         if(sanitize_text_field($_GET['post_type']) == 'ads_order'){
-    ?> 
+    ?>
     <style>
 .tablenav.top {
@@ -363 +415 @@
 </style>
 
-<?php 
-        }
-    }
+<?php
+        }
+    }
+}
+
+
+// Kopier-Verhalten und Optik der PHP-/Shortcode-Felder in der Kampagnenliste.
+add_action('admin_footer','wpsap_campaign_copy_field');
+function wpsap_campaign_copy_field(){
+    if(!isset($_GET['post_type']) || sanitize_text_field(wp_unslash($_GET['post_type'])) !== 'ads_campaign'){
+        return;
+    }
+    ?>
+<style>
+.wpsap-copy { display: inline-flex; align-items: center; gap: 6px; max-width: 100%; }
+/* Weisses, schreibgeschuetztes Feld mit dezentem Rahmen - wie in der Vorlage
+   (kein grauer Fuellton). Erhoehte Spezifitaet (span + input.klasse), weil WP
+   readonly-Felder sonst grau einfaerbt (input[readonly]). */
+.wpsap-copy input.wpsap-copy__input { width: 150px; max-width: 100%; background: #fff; color: #3c434a; }
+/* Randloses Kopier-Icon statt umrandetem Button: die Vorlage zeigt nur das
+   schlichte Dokument-Symbol ohne Button-Rahmen (die WP-.button-Klasse ist im
+   Markup deshalb entfernt). */
+.wpsap-copy__btn { display: inline-flex; align-items: center; justify-content: center; background: none; border: none; box-shadow: none; outline: none; padding: 0 2px; min-height: 0; color: #50575e; cursor: pointer; }
+.wpsap-copy__btn:hover { color: #2271b1; background: none; box-shadow: none; }
+.wpsap-copy__btn:focus { background: none; box-shadow: none; outline: none; }
+.wpsap-copy__btn .dashicons { width: 18px; height: 18px; font-size: 18px; }
+.wpsap-copy__btn.is-copied { color: #46b450; }
+
+/* Info-Tooltip im Spaltenkopf "Clicks". Aufbau wie die Metabox-Tooltips, aber
+   eigene Klassen, damit nichts mit anderen Admin-Styles kollidiert. */
+.wpsap-th-tip { position: relative; display: inline-flex; align-items: center; vertical-align: middle; margin-top: -2px; cursor: help; color: #787c82; }
+.wpsap-th-tip .dashicons-info { font-size: 16px; width: 16px; height: 16px; line-height: 16px; }
+.wpsap-th-tip .wpsap-th-tiptext {
+    visibility: hidden; opacity: 0; transition: opacity .1s ease;
+    position: absolute; z-index: 100; top: 150%; left: 50%; transform: translateX(-50%);
+    width: 240px; padding: 8px 10px; border-radius: 4px;
+    background: #1d2327; color: #fff;
+    font: 400 12px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    text-align: left; white-space: normal; font-weight: 400; text-transform: none;
+}
+.wpsap-th-tip:hover .wpsap-th-tiptext,
+.wpsap-th-tip:focus .wpsap-th-tiptext,
+.wpsap-th-tip:focus-within .wpsap-th-tiptext { visibility: visible; opacity: 1; }
+</style>
+<script>
+jQuery(function($){
+    $(document).on('click','.wpsap-copy__btn',function(){
+        var $btn = $(this);
+        var $input = $btn.closest('.wpsap-copy').find('.wpsap-copy__input');
+        var text = $input.val();
+
+        var done = function(){
+            $btn.addClass('is-copied');
+            setTimeout(function(){ $btn.removeClass('is-copied'); },1200);
+        };
+
+        if(navigator.clipboard && navigator.clipboard.writeText){
+            navigator.clipboard.writeText(text).then(done, function(){
+                $input.trigger('select'); document.execCommand('copy'); done();
+            });
+        } else {
+            $input.trigger('select'); document.execCommand('copy'); done();
+        }
+    });
+});
+</script>
+    <?php
+}
+
+
+// Doppelte Bestaetigung fuer Reject/Cancel: beide Buttons loesen dieselbe
+// irreversible Aktion aus (Stripe-Abo kuendigen). Ein eigenes Modal faengt den
+// Klick ab und verlangt, dass der Betreiber das Aktionswort tippt, bevor der
+// bereits nonce-gesicherte Link geoeffnet wird. Reiner Frontend-Schutz - der
+// Serverpfad in wpsap_job_status() bleibt unveraendert.
+add_action('admin_footer','wpsap_order_reject_confirm');
+function wpsap_order_reject_confirm(){
+    if(!isset($_GET['post_type']) || sanitize_text_field(wp_unslash($_GET['post_type'])) !== 'ads_order'){
+        return;
+    }
+    ?>
+<style>
+#wpsap-reject-modal { position: fixed; inset: 0; z-index: 100000; display: none; }
+#wpsap-reject-modal.is-open { display: block; }
+#wpsap-reject-modal .wpsap-reject-backdrop { position: absolute; inset: 0; background: rgba(0,0,0,0.5); }
+#wpsap-reject-modal .wpsap-reject-box { position: relative; max-width: 420px; margin: 12vh auto 0; background: #fff; border-radius: 4px; box-shadow: 0 6px 30px rgba(0,0,0,0.3); padding: 24px; }
+#wpsap-reject-modal .wpsap-reject-title { display: flex; align-items: center; gap: 8px; margin: 0 0 12px; font-size: 18px; font-weight: 600; color: #b32d2e; }
+#wpsap-reject-modal .wpsap-reject-text { margin: 0 0 16px; color: #3c434a; line-height: 1.5; }
+#wpsap-reject-modal .wpsap-reject-label { display: block; margin: 0 0 6px; font-weight: 600; color: #3c434a; }
+#wpsap-reject-modal .wpsap-reject-input { width: 100%; box-sizing: border-box; margin: 0 0 16px; }
+#wpsap-reject-modal .wpsap-reject-actions { display: flex; justify-content: flex-end; gap: 8px; }
+#wpsap-reject-modal .wpsap-reject-confirm { background: #b32d2e; border-color: #b32d2e; color: #fff; }
+#wpsap-reject-modal .wpsap-reject-confirm:hover:not(:disabled) { background: #9e2423; border-color: #9e2423; color: #fff; }
+#wpsap-reject-modal .wpsap-reject-confirm:disabled { opacity: 0.5; cursor: not-allowed; }
+</style>
+<div id="wpsap-reject-modal" role="dialog" aria-modal="true" aria-labelledby="wpsap-reject-title">
+    <div class="wpsap-reject-backdrop"></div>
+    <div class="wpsap-reject-box">
+        <h2 id="wpsap-reject-title" class="wpsap-reject-title"><span class="dashicons dashicons-warning"></span><span class="wpsap-reject-heading">Reject this ad?</span></h2>
+        <p class="wpsap-reject-text">This permanently cancels the buyer&#8217;s active Stripe subscription. This action cannot be undone.</p>
+        <label class="wpsap-reject-label" for="wpsap-reject-word">Type <strong class="wpsap-reject-word">REJECT</strong> to confirm:</label>
+        <input type="text" id="wpsap-reject-word" class="wpsap-reject-input regular-text" autocomplete="off" autocapitalize="characters" spellcheck="false">
+        <div class="wpsap-reject-actions">
+            <button type="button" class="button wpsap-reject-cancel">Close</button>
+            <button type="button" class="button wpsap-reject-confirm" disabled>Confirm</button>
+        </div>
+    </div>
+</div>
+<script>
+jQuery(function($){
+    var $modal   = $('#wpsap-reject-modal');
+    var $input   = $('#wpsap-reject-word');
+    var $confirm = $modal.find('.wpsap-reject-confirm');
+    var targetHref = '';
+    var expectedWord = 'REJECT';
+
+    function closeModal(){
+        $modal.removeClass('is-open');
+        targetHref = '';
+        $input.val('');
+        $confirm.prop('disabled', true);
+    }
+
+    // Reject und Cancel teilen die Klasse .reject_ads; der Wortlaut folgt dem
+    // Text des tatsaechlich geklickten Links (Reject oder Cancel).
+    $(document).on('click','.reject_ads',function(e){
+        e.preventDefault();
+        targetHref = $(this).attr('href');
+        var label = $.trim($(this).text()) || 'Reject';
+        expectedWord = label.toUpperCase();
+        $modal.find('.wpsap-reject-heading').text(label + ' this ad?');
+        $modal.find('.wpsap-reject-word').text(expectedWord);
+        $input.val('');
+        $confirm.prop('disabled', true);
+        $modal.addClass('is-open');
+        $input.trigger('focus');
+    });
+
+    $input.on('input',function(){
+        $confirm.prop('disabled', $.trim($input.val()).toUpperCase() !== expectedWord);
+    });
+
+    $confirm.on('click',function(){
+        if($confirm.prop('disabled') || !targetHref){ return; }
+        window.location.href = targetHref;
+    });
+
+    $modal.find('.wpsap-reject-cancel, .wpsap-reject-backdrop').on('click', closeModal);
+
+    $(document).on('keydown',function(e){
+        if(e.key === 'Escape' && $modal.hasClass('is-open')){ closeModal(); }
+    });
+});
+</script>
+    <?php
 }
 

sell-ads/trunk/inc/checkout.php

@@ -183 +183 @@
     }
 
+    // Buy-Button-Klick zaehlen - derselbe Zaehler wie der /goto-Redirect
+    // (inc/hooks.php), damit die Spalte "Clicks" beide Ereignisse summiert.
+    // Selbst-Klicks eingeloggter Redakteure verfaelschen die Statistik nicht.
+    if(get_post_type($campaign_id) === 'ads_campaign'
+        && !(is_user_logged_in() && current_user_can('edit_posts'))){
+        $count = (int) get_post_meta($campaign_id,'wpsap_click_count',true);
+        update_post_meta($campaign_id,'wpsap_click_count',$count + 1);
+    }
+
     // Testmodus: die Zahlungsseite entfaellt ersatzlos. Die Bestellung
     // entsteht hier statt aus einer bezahlten Stripe-Session, danach geht es
@@ -326 +335 @@
 
 /**
- * Taeglicher Lauf: Bestellungen, die 14 Tage unbeantwortet blieben,
- * werden abgelehnt und das Abo beendet. Frueher passierte das mitten
- * im Rendern der Bestellliste.
+ * Taeglicher Lauf: Bestellungen, die 14 Tage unbeantwortet blieben, laufen ab
+ * (Status "expired") und das Abo wird beendet - weil es noch im Trial steht,
+ * ohne Belastung. Frueher passierte das mitten im Rendern der Bestellliste.
  */
 add_action('wpsap_expire_pending_orders','wpsap_expire_pending_orders');
@@ -348 +357 @@
     foreach($orders as $order_id){
         if(wpsap_order_days_left($order_id) <= 0){
-            wpsap_reject_ads($order_id);
+            wpsap_expire_ads($order_id);
         }
     }

sell-ads/trunk/inc/connect.php

@@ -20 +20 @@
 
 function wpsap_payment_mode(){
-    $mode = get_option('wpsap_payment_mode','own_key');
-    return in_array($mode,array('own_key','connect'),true) ? $mode : 'own_key';
+    $mode = get_option('wpsap_payment_mode','connect');
+    return in_array($mode,array('own_key','connect'),true) ? $mode : 'connect';
 }
 
@@ -326 +326 @@
 }
 
+function wpsap_connect_end_trial($subscription_id){
+    return wpsap_connect_request('POST','v1/subscription/end-trial',array('subscription_id' => $subscription_id));
+}
+
 function wpsap_connect_portal_url($customer_id,$return_url){
     $session = wpsap_connect_request('POST','v1/portal',array(

sell-ads/trunk/inc/helper.php

@@ -2 +2 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
+/**
+ * Baut das kopierbare Feld fuer die PHP-Einbindung einer Kampagne.
+ *
+ * Rueckgabe ist fertiges HTML und wird in der Spalte direkt ausgegeben -
+ * frueher lag ein esc_html() darum, das aus dem <input> sichtbaren Rohtext
+ * machte. Escapt wird deshalb nur noch der dynamische Wert selbst.
+ */
 function wpsap_plugin_php_function($content){
-
-    $html = '<input type="text" readonly value="<?php echo wpsap_show('.esc_attr($content).'); ?>">';
-    return $html;
-
+    $id    = absint($content);
+    $value = '<?php echo wpsap_show('.$id.'); ?>';
+    return wpsap_copy_field($value);
 }
 
+/**
+ * Baut das kopierbare Feld fuer die Shortcode-Einbindung einer Kampagne.
+ */
 function wpsap_shortcode_input($content){
-    $html = '<input type="text" readonly value="[wpsap_ads id='.esc_attr($content).']">';
-    return $html;
+    $id    = absint($content);
+    $value = '[wpsap_ads id='.$id.']';
+    return wpsap_copy_field($value);
+}
+
+/**
+ * Gemeinsames Markup fuer die Kopier-Felder der Kampagnenliste: ein
+ * schreibgeschuetztes Eingabefeld mit Betrag daneben ein Kopier-Button.
+ * Der zugehoerige Klick-Handler liegt im admin_footer der Liste
+ * (inc/campaign_fields.php).
+ */
+function wpsap_copy_field($value){
+    return '<span class="wpsap-copy">'
+        .'<input type="text" class="wpsap-copy__input" readonly value="'.esc_attr($value).'">'
+        .'<button type="button" class="wpsap-copy__btn" title="'.esc_attr__('Copy','wpsap_ads_plugin').'">'
+        .'<span class="dashicons dashicons-admin-page"></span>'
+        .'</button>'
+        .'</span>';
 }
 
@@ -43 +68 @@
 
 /**
+ * Entfernt Motiv und Ziellink einer endgueltig toten Bestellung restlos:
+ * das Attachment aus der Mediathek (Datei inkl. resized Varianten, ohne
+ * Papierkorb) sowie die Meta order_image/order_url. Jedes Motiv gehoert zu
+ * genau einer Bestellung, deshalb ist das harte Loeschen unbedenklich.
+ *
+ * Die Attachment-ID steht seit dem Upload in wpsap_order_image_id; fuer
+ * Bestandsbestellungen ohne dieses Meta wird sie aus der gespeicherten URL
+ * aufgeloest.
+ */
+function wpsap_delete_order_media($order_id){
+    $attachment_id = (int) get_post_meta($order_id,'wpsap_order_image_id',true);
+    if(!$attachment_id){
+        $image_url = get_post_meta($order_id,'order_image',true);
+        if($image_url){
+            $attachment_id = attachment_url_to_postid($image_url);
+        }
+    }
+
+    if($attachment_id && get_post_type($attachment_id) === 'attachment'){
+        wp_delete_attachment($attachment_id,true);
+    }
+
+    delete_post_meta($order_id,'order_image');
+    delete_post_meta($order_id,'order_url');
+    delete_post_meta($order_id,'wpsap_order_image_id');
+}
+
+/**
  * Ablehnen heisst: das Abo bei Stripe beenden. Der lokale Status wird erst
  * danach gesetzt - frueher lief es umgekehrt, wodurch Plugin und Stripe
@@ -62 +115 @@
     ) );
 
+    // Erst nach dem gesicherten Statuswechsel: Motiv und Link sind jetzt tot.
+    wpsap_delete_order_media($order_id);
+
+    return true;
+}
+
+/**
+ * Ablauf einer unbeantworteten Bestellung nach 14 Tagen. Wie das Ablehnen
+ * beendet es das Abo bei Stripe - weil das noch im Trial steht, entsteht dabei
+ * keine Rechnung, der Kaeufer wird also nicht belastet. Getrennt von
+ * wpsap_reject_ads(), damit der Zustand in der Liste als "Expired" (statt
+ * "Rejected") erkennbar bleibt und das Ablaufdatum festgehalten wird.
+ */
+function wpsap_expire_ads($order_id){
+    $subscription_id = get_post_meta($order_id,'wpsap_subscription_id',true);
+    if($subscription_id){
+        $result = wpsap_stripe_cancel_subscription($subscription_id);
+        if(is_wp_error($result)){
+            return $result;
+        }
+    }
+
+    // Ablaufdatum = Bestelldatum + 14 Tage, dieselbe Frist wie in
+    // wpsap_order_days_left(). Festgehalten, damit die Liste "Expired on <Tag>"
+    // zeigen kann, ohne es jedes Mal neu herzuleiten.
+    $placed  = get_post_time('U',true,$order_id);
+    $expires = $placed ? $placed + 14 * DAY_IN_SECONDS : time();
+    update_post_meta($order_id,'wpsap_expired_on',$expires);
+
+    update_post_meta($order_id,"wpsap_order_status",'expired');
+    wp_update_post( array(
+        'ID'          => $order_id,
+        'post_status' => 'rejected',
+    ) );
+
+    // Wie beim Ablehnen: Motiv und Link sind mit dem Ablauf tot.
+    wpsap_delete_order_media($order_id);
+
     return true;
 }
@@ -80 +171 @@
             return new WP_Error('wpsap_subscription_gone',__('This subscription is no longer active at Stripe.','wpsap_ads_plugin'));
         }
+
+        // Erst mit der Annahme wird belastet: das Abo lief bis hierher im Trial
+        // (siehe wpsap_stripe_build_checkout). Das Beenden des Trials stellt die
+        // erste Rechnung sofort aus.
+        $charged = wpsap_stripe_end_trial($subscription_id);
+        if(is_wp_error($charged)){
+            return $charged;
+        }
     }
 

sell-ads/trunk/inc/hooks.php

@@ -144 +144 @@
         }
 
-        $order_date = get_the_date( 'l F j, Y',$order_id);
-        $expected_date = date('l F j, Y',strtotime($order_date."+ 7days"));
-
+        // Die Datumsangaben der Bestaetigungstabelle berechnet confirm.php
+        // selbst aus dem Bestellzeitpunkt - hier ist nichts vorzubereiten.
         require WPSAP_Plugin_Path.'inc/page/confirm.php';
         die();
@@ -229 +228 @@
 // neu registriert - die alte Registrierung ueberschrieb ihn global fuer
 // alle Post-Types.
+
+
+/* --------------------------------------------------------------------------
+ * Klick-Tracking ueber /goto/<slug>
+ *
+ * Die veroeffentlichte Anzeige verlinkt nicht mehr direkt auf die Zielseite,
+ * sondern ueber diesen Endpoint (inc/shortcode.php). Er zaehlt den Klick auf
+ * der Kampagne (wpsap_click_count) und leitet dann zur Zielseite weiter. Der
+ * Zaehler erscheint in der Spalte "Clicks" der Kampagnenliste.
+ * ------------------------------------------------------------------------- */
+
+add_filter('query_vars','wpsap_goto_query_var');
+function wpsap_goto_query_var($vars){
+    $vars[] = 'wpsap_goto';
+    return $vars;
+}
+
+add_action('init','wpsap_goto_rewrite');
+function wpsap_goto_rewrite(){
+    add_rewrite_rule('^goto/([^/]+)/?$','index.php?wpsap_goto=$matches[1]','top');
+
+    // Beim reinen Plugin-Update laeuft der Aktivierungshook nicht - ohne
+    // diesen Guard griffe die Rewrite-Rule auf cybie.de erst nach manuellem
+    // Neu-Speichern der Permalinks. Der Flush erfolgt genau einmal je Version.
+    if(get_option('wpsap_rewrite_version') !== WPSAP_Version){
+        flush_rewrite_rules(false);
+        update_option('wpsap_rewrite_version',WPSAP_Version);
+    }
+}
+
+add_action('template_redirect','wpsap_handle_goto');
+function wpsap_handle_goto(){
+    $slug = get_query_var('wpsap_goto');
+    if($slug === '' || $slug === null){
+        return;
+    }
+
+    $home = home_url('/');
+
+    // Slug -> Kampagne. Numerischer Wert wird als ID behandelt, sonst ueber
+    // den post_name aufgeloest. Der CPT ist nicht oeffentlich, get_page_by_path
+    // findet ihn trotzdem, weil der Post-Type explizit uebergeben wird.
+    $campaign = null;
+    if(ctype_digit((string) $slug)){
+        $maybe = get_post(absint($slug));
+        if($maybe && $maybe->post_type === 'ads_campaign'){
+            $campaign = $maybe;
+        }
+    }
+    if(!$campaign){
+        $campaign = get_page_by_path(sanitize_title($slug),OBJECT,'ads_campaign');
+    }
+
+    if(!$campaign){
+        nocache_headers();
+        wp_redirect($home,302);
+        exit;
+    }
+
+    // Zielseite = URL der aktuell veroeffentlichten Anzeige dieses Slots.
+    $target = '';
+    foreach(wpsap_get_active_ads($campaign->ID) as $ad){
+        $url = get_post_meta($ad->ID,'order_url',true);
+        if(!empty($url)){
+            $target = $url;
+            break;
+        }
+    }
+
+    if(empty($target)){
+        nocache_headers();
+        wp_redirect($home,302);
+        exit;
+    }
+
+    // Selbst-Klicks von Redakteuren verfaelschen die Statistik nicht.
+    if(!(is_user_logged_in() && current_user_can('edit_posts'))){
+        $count = (int) get_post_meta($campaign->ID,'wpsap_click_count',true);
+        update_post_meta($campaign->ID,'wpsap_click_count',$count + 1);
+    }
+
+    nocache_headers();
+    // Ziel ist eine fremde Domain - wp_safe_redirect() wuerde das blocken.
+    wp_redirect(esc_url_raw($target),302);
+    exit;
+}

sell-ads/trunk/inc/page/confirm.php

@@ -43 +43 @@
 // Fuer die Seitenspalte: beide Zahlungswege legen diese Felder an -
 // wpsap_sync_order_from_session() ebenso wie wpsap_create_test_order().
-$wpsap_place_id = (int) get_post_meta($order_id,'wpsap_place_id',true);
-$wpsap_campaign_label = '';
-if($wpsap_place_id){
-    $wpsap_campaign_label = (string) get_post_meta($wpsap_place_id,'wpsap_campaign_title',true);
-    if($wpsap_campaign_label === ''){
-        $wpsap_campaign_label = (string) get_the_title($wpsap_place_id);
-    }
-}
-
 $wpsap_price_label = '';
 $wpsap_order_total = (int) get_post_meta($order_id,'order_total',true);
@@ -58 +49 @@
     $wpsap_price_label = number_format_i18n($wpsap_order_total / 100,2).' '.strtoupper((string) get_post_meta($order_id,'wpsap_currency',true));
 }
+
+// Datumsangaben der Bestaetigungstabelle. Bezugspunkt ist der Zeitpunkt der
+// Bestellung; wp_date() wendet die WP-Zeitzone an. Der Kaeufer-Flow ist
+// durchgaengig englisch, deshalb erzwingt switch_to_locale('en_US') englische
+// Monatsnamen auch auf einer de_DE-Site. Das Billing-Datum ist eine
+// Anzeige-Schaetzung fuer den Kaeufer (Prueffrist bis 14 Tage + ein Abo-Monat) -
+// Stripe bucht im Abo technisch bereits beim Checkout.
+$wpsap_order_ts = get_post_timestamp($order_id);
+$wpsap_switched_locale = switch_to_locale('en_US');
+$wpsap_submitted_date = $wpsap_order_ts ? wp_date('F j, Y',$wpsap_order_ts) : '';
+$wpsap_billing_date = $wpsap_order_ts ? wp_date('F j, Y',strtotime('+14 days +1 month',$wpsap_order_ts)) : '';
+if($wpsap_switched_locale){ restore_previous_locale(); }
 
 // Solange Bild oder Link fehlen, steht der Kaeufer noch im Upload-Schritt.
@@ -85 +88 @@
 <?php } ?>
 
-    <div class="wpsap-flow__grid">
-
-        <aside class="wpsap-flow__aside">
-            <div class="wpsap-flow__site"><?php echo esc_html(get_bloginfo('name')); ?></div>
-
-            <?php if($wpsap_campaign_label !== '' || $wpsap_price_label !== ''){ ?>
-            <div class="wpsap-flow__facts">
-                <?php if($wpsap_campaign_label !== ''){ ?>
-                <div class="wpsap-flow__fact">
-                    <span class="wpsap-flow__fact-label"><?php esc_html_e('Ad space','wpsap_ads_plugin'); ?></span>
-                    <span class="wpsap-flow__fact-value"><?php echo esc_html($wpsap_campaign_label); ?></span>
-                </div>
-                <?php } ?>
-                <?php if($wpsap_price_label !== ''){ ?>
-                <div class="wpsap-flow__fact">
-                    <span class="wpsap-flow__fact-label"><?php esc_html_e('Per month','wpsap_ads_plugin'); ?></span>
-                    <span class="wpsap-flow__fact-value"><?php echo esc_html($wpsap_price_label); ?></span>
-                </div>
-                <?php } ?>
-            </div>
+    <?php /* Schritt 1: Upload - einspaltig zentriert. Bewusst NICHT im
+             Zwei-Spalten-Grid: die Aside gehoert erst auf die Bestaetigung.
+             Sichtbar bzw. verborgen nur ueber display:none - der gezeigte
+             Zustand kommt aus dem Stylesheet, damit wp-sap.js ihn per
+             .hide()/.show() korrekt umschalten kann. */ ?>
+    <section class="upload_ads_area" <?php if($wpsap_step_done){ echo 'style="display:none"'; } ?>>
+        <div class="wpsap-single">
+
+            <h1 class="wpsap-step__title">Upload your Ad</h1>
+
+            <p class="wpsap-step__lead">Attention: Make sure that you upload your desired advertising image (JPG, PNG, GIF) in the preferred resolution (up to max. 10 MB) and add the correct link to your offer.</p>
+
+            <?php if(trim($note_on_upload_page) !== ''){ ?>
+            <div class="wpsap-note"><?php echo esc_html($note_on_upload_page); ?></div>
             <?php } ?>
 
-            <?php if(trim($note_on_thanks_page) !== ''){ ?>
-            <div class="wpsap-flow__aside-note"><?php echo esc_html($note_on_thanks_page); ?></div>
-            <?php } ?>
-
-            <p class="wpsap-flow__copyright">Copyright <?php echo esc_html(get_bloginfo('name')); ?></p>
-        </aside>
-
-        <div class="wpsap-flow__main">
-
-            <section class="upload_ads_area" style="<?php echo $wpsap_step_done ? 'display:none' : 'display:block'; ?>">
-
-                <h1 class="wpsap-step__title">Upload your Ad</h1>
-                <p class="wpsap-step__lead">Attention: Make sure that you upload your desired advertising image (JPG, PNG, GIF) in the preferred resolution (up to max. 10 MB) and add the correct link to your offer.</p>
-
-                <?php if(trim($note_on_upload_page) !== ''){ ?>
-                <div class="wpsap-note"><?php echo esc_html($note_on_upload_page); ?></div>
-                <?php } ?>
-
-                <?php /* Nimmt die Meldungen auf, fuer die wp-sap.js bis 1.8.0
-                         alert() aufrief. */ ?>
-                <div class="wpsap-alert" id="wpsap_form_error" role="alert"></div>
-
-                <form action="" id="wp_sap_form" method="post" enctype="multipart/form-data" class="wpsap-card">
-                    <div class="file-area">
-                        <input type="hidden" name="action" value="wpsap_upload_image">
-                        <input type="hidden" name="security" id="wpsap_security" value="">
-                        <?php /* Die Bestellung wird serverseitig ueber die Session-ID
-                                 aufgeloest. Eine mitgeschickte order_id waere im Browser
-                                 frei aenderbar. */ ?>
-                        <input type="hidden" name="session" value="<?php echo esc_attr($session_id); ?>">
-                        <input type="file" name="image" id="images" accept="image/*" required="required">
-                        <div class="file-dummy">
-                            <?php if($image_uploaded){ ?>
-                            <div class="default">
-                                <img src="<?php echo esc_url($image_uploaded); ?>" alt="">
-                                <h6>Click on the image to change it</h6>
-                            </div>
-                            <?php } else { ?>
-                            <div class="default">
-                                <span class="wpsap-drop__icon" aria-hidden="true">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><path d="M21 15l-5-5L5 21"/></svg>
-                                </span>
-                                <h6>Drop image here or click to upload</h6>
-                            </div>
-                            <?php } ?>
-                            <div class="success" id="image_uploaded_area">
-                                <h5>Image Uploading....</h5>
-                            </div>
+            <?php /* Nimmt die Meldungen auf, fuer die wp-sap.js bis 1.8.0
+                     alert() aufrief. */ ?>
+            <div class="wpsap-alert" id="wpsap_form_error" role="alert"></div>
+
+            <form action="" id="wp_sap_form" method="post" enctype="multipart/form-data" class="wpsap-card">
+                <div class="file-area">
+                    <input type="hidden" name="action" value="wpsap_upload_image">
+                    <input type="hidden" name="security" id="wpsap_security" value="">
+                    <?php /* Die Bestellung wird serverseitig ueber die Session-ID
+                             aufgeloest. Eine mitgeschickte order_id waere im Browser
+                             frei aenderbar. */ ?>
+                    <input type="hidden" name="session" value="<?php echo esc_attr($session_id); ?>">
+                    <input type="file" name="image" id="images" accept="image/*" required="required">
+                    <div class="file-dummy">
+                        <?php if($image_uploaded){ ?>
+                        <div class="default">
+                            <img src="<?php echo esc_url($image_uploaded); ?>" alt="">
+                            <h6>Click on the image to change it</h6>
+                        </div>
+                        <?php } else { ?>
+                        <div class="default">
+                            <span class="wpsap-drop__icon" aria-hidden="true">
+                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><path d="M21 15l-5-5L5 21"/></svg>
+                            </span>
+                            <h6>Drop image here or click to upload</h6>
+                        </div>
+                        <?php } ?>
+                        <div class="success" id="image_uploaded_area">
+                            <h5>Image Uploading....</h5>
                         </div>
                     </div>
-
-                    <div class="wpsap-field">
-                        <input type="submit" value="Upload image" id="hidden_upload_image_btn" style="display:none;">
-                        <button type="button" id="upload_image_btn" class="wpsap-btn wpsap-btn--secondary">Upload image</button>
-                    </div>
-
-                    <div class="wpsap-field">
-                        <label class="wpsap-field__label" for="site_url">Link to your offer</label>
-                        <input type="text" id="site_url" name="site_url" value="<?php echo esc_url($link_added); ?>" placeholder="Paste your product link here...">
-                    </div>
-                </form>
-
+                </div>
+
+                <div class="wpsap-field">
+                    <input type="submit" value="Upload image" id="hidden_upload_image_btn" style="display:none;">
+                    <?php /* Der Upload-Button ist bewusst blau (SS3) und damit von
+                             der schwarzen Primaeraktion "Next" unterscheidbar. */ ?>
+                    <button type="button" id="upload_image_btn" class="wpsap-btn wpsap-btn--upload">Upload image</button>
+                </div>
+
+                <div class="wpsap-field">
+                    <label class="wpsap-field__label" for="site_url">Link to your offer</label>
+                    <input type="text" id="site_url" name="site_url" value="<?php echo esc_url($link_added); ?>" placeholder="Paste your product link here...">
+                </div>
+            </form>
+
+            <?php if($terms || $cencel || $cencel_policy){ ?>
+            <ul class="wpsap-links">
+                <?php if($terms){ ?>
+                <li><a href="<?php echo esc_url(get_the_permalink($terms)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($terms)); ?></a></li>
+                <?php } ?>
                 <?php if($cencel){ ?>
-                <ul class="wpsap-links">
-                    <li><a href="<?php echo esc_url(get_the_permalink($cencel)); ?>"><?php echo esc_html(get_the_title($cencel)); ?></a></li>
-                </ul>
+                <li><a href="<?php echo esc_url(get_the_permalink($cencel)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($cencel)); ?></a></li>
                 <?php } ?>
-
-                <div class="wpsap-actions">
-                    <input type="hidden" id="ads_image" value="<?php echo esc_url($image_uploaded); ?>">
-                    <button type="button" class="btn next wpsap-btn wpsap-btn--primary">Next</button>
-                </div>
-
-            </section>
-
-            <section class="purchased_area" style="<?php echo $wpsap_step_done ? 'display:block' : 'display:none'; ?>">
-
-                <h1 class="wpsap-step__title">Your order has been placed</h1>
-                <?php /* Kein Erstattungsversprechen: wpsap_reject_ads() kuendigt
-                         das Abo bei Stripe, mehr nicht. Bis 1.8.1 stand hier
-                         "you will automatically get your money back" - das
-                         loeste der Code nie ein. */ ?>
-                <p class="wpsap-step__lead">The advertisement has been successfully sent to the website owner. It may take up to 14 days for the ad to be reviewed and accepted. If your request is rejected or stays unanswered, your subscription is cancelled automatically and you will not be charged again. If your ad has been accepted, your advertising partnership will remain active until you or the website owner cancel it.</p>
-
-                <table>
-                    <tbody>
-                        <tr>
-                            <th scope="row">Start date</th>
-                            <td>After the website owner accept your ads.</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">End date</th>
-                            <td>Until someone quits</td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                <div class="link_input_desc_area">
-                    <div class="input-group">
-                        <?php /* Fuehrt in das Billing Portal von Stripe - dort kann der Kaeufer
-                                 selbst kuendigen und seine Rechnungen einsehen. */ ?>
-                        <input id="foo" type="text" class="link_copied_button" readonly value="<?php echo esc_url(add_query_arg(array('action' => 'wpsap_billing_portal','session' => $session_id),admin_url('admin-post.php'))); ?>">
-                        <span class="input-group-button">
-                            <button class="wpsap_ads_copy_btn" type="button" data-clipboard-target="#foo" title="Copy to clipboard" aria-label="Copy to clipboard">
-                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
-                            </button>
-                        </span>
-                    </div>
-
-                    <div class="wpsap-copy-hint">
-                        <span class="wpsap-copy-hint__icon" aria-hidden="true">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg>
-                        </span>
-                        <p>Save this link. With this link you can cancel your monthly advertising space rental in the future. If you want to cancel, you can use this link or simply ask the website owner directly.</p>
-                    </div>
-                </div>
-
-                <?php if($cencel_policy || $terms){ ?>
-                <ul class="wpsap-links">
-                    <?php if($cencel_policy){ ?>
-                    <li><a href="<?php echo esc_url(get_the_permalink($cencel_policy)); ?>"><?php echo esc_html(get_the_title($cencel_policy)); ?></a></li>
-                    <?php } ?>
-                    <?php if($terms){ ?>
-                    <li><a href="<?php echo esc_url(get_the_permalink($terms)); ?>"><?php echo esc_html(get_the_title($terms)); ?></a></li>
-                    <?php } ?>
-                </ul>
+                <?php if($cencel_policy){ ?>
+                <li><a href="<?php echo esc_url(get_the_permalink($cencel_policy)); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html(get_the_title($cencel_policy)); ?></a></li>
                 <?php } ?>
-
-                <div class="wpsap-actions">
-                    <button type="button" class="btn_back wpsap-btn wpsap-btn--quiet">Back</button>
-                    <button type="button" class="btn_finish wpsap-btn wpsap-btn--primary" data-link="<?php echo esc_url(get_site_url()); ?>">Finish</button>
-                </div>
-
-            </section>
+            </ul>
+            <?php } ?>
+
+            <div class="wpsap-actions">
+                <input type="hidden" id="ads_image" value="<?php echo esc_url($image_uploaded); ?>">
+                <button type="button" class="btn next wpsap-btn wpsap-btn--primary">Next</button>
+            </div>
 
         </div>
-    </div>
+    </section>
+
+    <?php /* Schritt 2: Bestaetigung - einspaltig, zentriert wie der
+             Upload-Schritt. Die frueher linke Aside (Logo, Fakten, Copyright)
+             wurde bewusst entfernt; nur .wpsap-flow__main traegt den Inhalt. */ ?>
+    <section class="purchased_area" <?php if(!$wpsap_step_done){ echo 'style="display:none"'; } ?>>
+
+        <div class="wpsap-flow__main">
+
+            <span class="wpsap-badge" aria-hidden="true">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z"/><path d="m9 12 2 2 4-4"/></svg>
+            </span>
+
+            <h1 class="wpsap-step__title">Your order has been placed</h1>
+            <?php /* Kein Erstattungsversprechen: wpsap_reject_ads() kuendigt
+                     das Abo bei Stripe, mehr nicht. Bis 1.8.1 stand hier
+                     "you will automatically get your money back" - das
+                     loeste der Code nie ein. */ ?>
+            <p class="wpsap-step__lead">The advertisement has been successfully sent to the website owner. It may take up to 14 days for the ad to be reviewed and approved. If your request is rejected or remains unanswered, your subscription will be cancelled automatically, and you will not be charged. If your ad is approved, your advertising partnership will remain active until you or the website owner cancels it.</p>
+
+            <?php /* Stand bis 1.8.3 in der linken Aside. Die Notiz ist optional
+                     konfigurierbar und darf mit der entfernten Spalte nicht
+                     verschwinden - sie sitzt jetzt hier im Hauptbereich. */ ?>
+            <?php if(trim($note_on_thanks_page) !== ''){ ?>
+            <div class="wpsap-note"><?php echo esc_html($note_on_thanks_page); ?></div>
+            <?php } ?>
+
+            <table>
+                <tbody>
+                    <tr>
+                        <th scope="row">Offer Submitted</th>
+                        <td><?php echo esc_html($wpsap_submitted_date); ?></td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Expected start date</th>
+                        <td>Waiting for website owner to review (Maximum 14 days)</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">End date</th>
+                        <td>Until you or website owner cancels</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Billing date</th>
+                        <td><?php echo esc_html($wpsap_billing_date); ?></td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <div class="link_input_desc_area">
+                <div class="input-group">
+                    <?php /* Fuehrt in das Billing Portal von Stripe - dort kann der Kaeufer
+                             selbst kuendigen und seine Rechnungen einsehen. */ ?>
+                    <input id="foo" type="text" class="link_copied_button" readonly value="<?php echo esc_url(add_query_arg(array('action' => 'wpsap_billing_portal','session' => $session_id),admin_url('admin-post.php'))); ?>">
+                    <span class="input-group-button">
+                        <button class="wpsap_ads_copy_btn" type="button" data-clipboard-target="#foo" title="Copy to clipboard" aria-label="Copy to clipboard">
+                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
+                        </button>
+                    </span>
+                </div>
+
+                <div class="wpsap-copy-hint">
+                    <span class="wpsap-copy-hint__icon" aria-hidden="true">
+                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg>
+                    </span>
+                    <p>Please save this link. You can use it at any time to manage your subscription or cancel your monthly advertising space rental. If you wish to cancel, simply use this link or contact the website owner directly.</p>
+                </div>
+            </div>
+
+            <div class="wpsap-actions">
+                <button type="button" class="btn_back wpsap-btn wpsap-btn--quiet">Back</button>
+                <button type="button" class="btn_finish wpsap-btn wpsap-btn--primary" data-link="<?php echo esc_url(get_site_url()); ?>">Finish</button>
+            </div>
+
+        </div>
+    </section>
+
 </div>
 

sell-ads/trunk/inc/page/style.css

@@ -107 +107 @@
 
 /* ==========================================================================
-   Zweispaltiger Rahmen
+   Rahmen: Upload einspaltig (SS3), Bestaetigung zweispaltig (SS4)
    ========================================================================== */
 
@@ -120 +120 @@
 }
 
-.wpsap-flow__grid {
+/* Die Bestaetigung ist einspaltig (die frueher linke Aside mit Logo, Fakten
+   und Copyright ist entfernt). flex:1 1 auto fuellt die Resthoehe unter dem
+   Flex-#wpsap-flow - das tat vorher .wpsap-flow__grid. */
+.purchased_area {
     flex: 1 1 auto;
-    display: grid;
-    grid-template-columns: minmax(240px, 320px) 1fr;
-    align-items: stretch;
-}
-
-.wpsap-flow__aside {
-    background-color: var(--wpsap-canvas-soft, #fafafa);
-    border-right: 1px solid var(--wpsap-line, #dcdfe3);
-    padding: 2.5rem 1.75rem;
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
+}
+
+/* Bleibt fuer den Upload-Schritt (Marken-Text als Logo-Fallback). */
 #wpsap-flow .wpsap-flow__site {
     font-size: 22px;
@@ -144 +136 @@
 }
 
-.wpsap-flow__facts {
+/* Bestaetigung: Inhalt zentriert mit fester Maximalbreite (SS4). Die
+   Blanket-Regel gibt jedem direkten Kind dieselbe Breite, damit Badge, Titel,
+   Tabelle und Aktionszeile buendig uebereinanderstehen. */
+.wpsap-flow__main {
+    padding: 3rem 1.75rem;
     display: flex;
     flex-direction: column;
-    gap: .75rem;
-}
-
-.wpsap-flow__fact {
-    display: flex;
-    flex-direction: column;
-    gap: .15rem;
-}
-
-#wpsap-flow .wpsap-flow__fact-label {
-    font-size: 12px;
+    align-items: center;
+    text-align: center;
+}
+
+.wpsap-flow__main > * {
+    width: 100%;
+    max-width: 520px;
+}
+
+/* Schritt 1 ist einspaltig und ohne Aside. wp-sap.js schaltet die Sichtbarkeit
+   per .hide()/.show(); der gezeigte Zustand kommt aus dem Stylesheet, das
+   Markup setzt inline nur display:none fuer den verborgenen Schritt - so
+   ueberschreibt keine Inline-Regel das Grid der Bestaetigung. */
+.upload_ads_area {
+    flex: 1 1 auto;
+    padding: 3rem 1.25rem;
+}
+
+.wpsap-single {
+    width: 100%;
+    max-width: 560px;
+    margin: 0 auto;
+}
+
+/* Nur der Kopfbereich des Upload-Schritts ist zentriert; Karte und Felder
+   darunter bleiben linksbuendig. */
+.wpsap-single > .wpsap-flow__brand,
+.wpsap-single > .wpsap-step__title,
+.wpsap-single > .wpsap-step__subtitle,
+.wpsap-single > .wpsap-step__lead {
+    text-align: center;
+}
+
+.wpsap-single > .wpsap-flow__brand {
+    margin-bottom: 1.5rem;
+}
+
+.upload_ads_area .wpsap-links {
+    justify-content: center;
+}
+
+
+/* ==========================================================================
+   Logo, Untertitel und Erfolgs-Badge
+   ========================================================================== */
+
+/* Logo (get_custom_logo) oben im Upload-Schritt bzw. in der Aside. In der
+   Aside bleibt es linksbuendig wie die uebrigen Angaben. */
+#wpsap-flow .wpsap-flow__brand img,
+#wpsap-flow .custom-logo {
+    display: inline-block;
+    width: auto;
+    height: auto;
+    max-height: 52px;
+}
+
+#wpsap-flow .wpsap-step__subtitle {
+    font-size: 16px;
     font-weight: 600;
-    letter-spacing: .04em;
-    text-transform: uppercase;
-    color: var(--wpsap-muted, #6b7280);
-}
-
-#wpsap-flow .wpsap-flow__fact-value {
-    font-size: 16px;
-    font-weight: 500;
-    color: var(--wpsap-ink, #161616);
-    overflow-wrap: anywhere;
-}
-
-#wpsap-flow .wpsap-flow__aside-note {
-    font-size: 14px;
-    line-height: 1.55;
+    line-height: 1.35;
     color: var(--wpsap-ink-soft, #4a4a4a);
-    white-space: pre-line;
-}
-
-/* Schiebt das Copyright ans untere Ende, ohne es dort festzunageln -
-   bei viel Inhalt rutscht es einfach mit. */
-#wpsap-flow .wpsap-flow__copyright {
-    margin-top: auto;
-    padding-top: 1.5rem;
-    font-size: 13px;
-    color: var(--wpsap-muted, #6b7280);
-}
-
-.wpsap-flow__main {
-    padding: 2.5rem 1.75rem 3rem;
+    margin: 0 0 1rem 0;
+}
+
+/* Siegel mit Haken ueber dem Titel der Bestaetigung (SS4). */
+.wpsap-badge {
     display: flex;
     justify-content: center;
-}
-
-/* Die beiden Schritte behalten ihre Bestandsklassen: inc/page/wp-sap.js
-   blendet sie ueber .hide()/.show() um und setzt dabei display:block. */
-.upload_ads_area,
-.purchased_area {
-    width: 100%;
-    max-width: 640px;
+    color: var(--wpsap-ink, #161616);
+    margin-bottom: 1rem;
+}
+
+#wpsap-flow .wpsap-badge svg {
+    display: block;
+    width: 64px;
+    height: 64px;
 }
 
@@ -331 +351 @@
 }
 
+/* Blauer Upload-Button (SS3) - hebt das Hochladen von der schwarzen
+   Primaeraktion "Next" ab. Fuellt die Breite der Karte. */
+#wpsap-flow .wpsap-btn--upload {
+    width: 100%;
+    background-color: #337ab6;
+    border-color: #337ab6;
+    color: #fff;
+}
+
+#wpsap-flow .wpsap-btn--upload:hover {
+    background-color: #2b6698;
+    border-color: #2b6698;
+}
+
 #wpsap-flow .wpsap-btn[disabled] {
     opacity: .6;
@@ -507 +541 @@
     text-align: left;
     vertical-align: top;
+    /* Beide Spalten identisch: schwarze Schrift auf weissem Grund. Explizit
+       gesetzt, damit kein Theme-CSS auf der Bestaetigungsseite durchschlaegt. */
+    color: #000;
+    background-color: #fff;
 }
 
 #wpsap-flow .purchased_area th {
     width: 40%;
-    font-weight: 600;
-    color: var(--wpsap-ink, #161616);
-    background-color: var(--wpsap-canvas-soft, #fafafa);
 }
 
@@ -521 +556 @@
     border-radius: var(--wpsap-radius-sm, 5px);
     padding: 1rem;
+    /* Der Hauptbereich zentriert seinen Inhalt (SS4); Feld und Hinweis bleiben
+       darin aber linksbuendig. */
+    text-align: left;
 }
 
@@ -604 +642 @@
     }
 
-    .wpsap-flow__grid {
-        grid-template-columns: 1fr;
-    }
-
-    .wpsap-flow__aside {
-        border-right: 0;
-        border-bottom: 1px solid var(--wpsap-line, #dcdfe3);
-        padding: 1.75rem 1.25rem;
-        gap: 1.25rem;
-    }
-
-    /* Gestapelt gehoert das Copyright unter den Inhalt der Spalte,
-       nicht ans Ende eines nicht mehr vorhandenen Streifens. */
-    #wpsap-flow .wpsap-flow__copyright {
-        margin-top: 0;
-        padding-top: 0;
-    }
-
     .wpsap-flow__main {
         padding: 1.75rem 1.25rem 2.5rem;

sell-ads/trunk/inc/settings.php

@@ -94 +94 @@
                         <?php $this->wpsap_notify_callback(); ?>
 
-                        <details class="wpsap-more">
-                                <summary><?php esc_html_e( 'Pages and texts','wpsap_ads_plugin' ); ?></summary>
+                        <h2 class="wpsap-step"><?php esc_html_e( 'Pages and texts','wpsap_ads_plugin' ); ?></h2>
                                 <table class="form-table" role="presentation">
                                         <tr>
-                                                <th scope="row"><label for="terms_condtions_0"><?php esc_html_e( 'Terms of Service','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="terms_condtions_0"><?php esc_html_e( 'Terms of Service (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_terms_condtions_0_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="template_cencel_subscription_1"><?php esc_html_e( 'Uploading Policy','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="template_cencel_subscription_1"><?php esc_html_e( 'Uploading Policy (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_template_cencel_subscription_1_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="template_cencel_policy_1"><?php esc_html_e( 'Cancel Policy','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="template_cencel_policy_1"><?php esc_html_e( 'Cancel Policy (Displayed on the upload page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_template_cencel_policy_1_callback(); ?></td>
                                         </tr>
                                         <tr>
-                                                <th scope="row"><label for="notification_2"><?php esc_html_e( 'Note for the buyer','wpsap_ads_plugin' ); ?></label></th>
+                                                <th scope="row"><label for="notification_2"><?php esc_html_e( 'Note for the buyer (Shown on the Stripe payment page)','wpsap_ads_plugin' ); ?></label></th>
                                                 <td><?php $this->wpsap_notification_2_callback(); ?></td>
                                         </tr>
@@ -122 +121 @@
                                         </tr>
                                 </table>
-                        </details>
 
                         <?php submit_button(); ?>
@@ -142 +140 @@
                         border: 1px solid #dcdcde;
                         border-left: 4px solid #2271b1;
-                }
-                .wpsap-settings .wpsap-more {
-                        margin-top: 32px;
-                        padding-top: 8px;
-                        border-top: 1px solid #dcdcde;
-                }
-                .wpsap-settings .wpsap-more > summary {
-                        cursor: pointer;
-                        font-size: 1.15em;
-                        font-weight: 600;
-                        padding: 8px 0;
                 }
                 </style>
@@ -241 +228 @@
                 $status = wpsap_connect_account_status();
                 ?>
-                <p>Payments run through the Sell Ads platform at <code>sellads.cybie.de</code>.
+                <p>Payments run through our SellAds platform.
                 Your advertisers pay into your own Stripe account. No API key and no webhook setup needed.</p>
 
@@ -330 +317 @@
                 </p>
                 <p class="description">Stripe cannot change this later, so please pick the country your business is registered in.</p>
-                <p class="description">
-                        <a href="https://sellads.cybie.de/terms.html" target="_blank" rel="noopener noreferrer">Terms of service</a>
-                        &middot;
-                        <a href="https://sellads.cybie.de/privacy.html" target="_blank" rel="noopener noreferrer">Privacy policy</a>
-                </p>
                 <?php
         }
@@ -505 +487 @@
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_test_mode" value="live" <?php checked( 'live', $mode ); ?>>
-                        Live &mdash; buyers pay through Stripe
+                        Live
                 </label>
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_test_mode" value="test" <?php checked( 'test', $mode ); ?>>
-                        Test mode &mdash; walk through the plugin without setting up Stripe
+                        Test mode
                 </label>
                 <p class="description">
@@ -519 +501 @@
                 if ( wpsap_test_mode() ) {
                         echo '<p class="notice notice-warning inline" style="padding:8px 12px;margin:8px 0 0;">'
-                                . '<strong>Test mode is on.</strong> Visitors can place orders without paying, and the ad space says so.'
+                                . '<strong>Test mode is on.</strong> Visitors can place orders without paying.'
                                 . '</p>';
                 }
@@ -529 +511 @@
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_payment_mode" value="connect" <?php checked( 'connect', $mode ); ?>>
-                        Connect with Stripe &mdash; one click, nothing to set up
+                        Connect with Stripe Express &mdash; Suggestion for Beginners
                 </label>
                 <label class="wpsap-choice">
                         <input type="radio" name="wpsap_payment_mode" value="own_key" <?php checked( 'own_key', $mode ); ?>>
-                        Use my own Stripe key &mdash; you add the key and the webhook yourself
+                        Use my own Stripe key &mdash; Suggestion for Advanced Users
                 </label>
                 <?php
@@ -627 +609 @@
         public function wpsap_terms_condtions_0_callback() {
                 ?> <select name="wpsap_option_name[terms_condtions_0]" id="terms_condtions_0">
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['terms_condtions_0'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['terms_condtions_0'] ) && $this->wpsap_options['terms_condtions_0'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>
@@ -637 +620 @@
         public function wpsap_template_cencel_subscription_1_callback() {
                 ?> <select name="wpsap_option_name[template_cencel_subscription_1]" id="template_cencel_subscription_1">
-                        
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['template_cencel_subscription_1'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['template_cencel_subscription_1'] ) && $this->wpsap_options['template_cencel_subscription_1'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>
@@ -647 +630 @@
                 public function wpsap_template_cencel_policy_1_callback() {
                 ?> <select name="wpsap_option_name[template_cencel_policy_1]" id="template_cencel_policy_1">
-                        
-                        <?php foreach($this->wpsap_get_pages() as $page){ ?> 
+                        <option value="" <?php echo empty( $this->wpsap_options['template_cencel_policy_1'] ) ? 'selected' : ''; ?>><?php esc_html_e( '— None —', 'wpsap_ads_plugin' ); ?></option>
+                        <?php foreach($this->wpsap_get_pages() as $page){ ?>
                                 <?php $selected = (isset( $this->wpsap_options['template_cencel_policy_1'] ) && $this->wpsap_options['template_cencel_policy_1'] == $page->ID) ? 'selected' : '' ; ?>
                         <option value="<?php echo esc_attr($page->ID); ?>" <?php echo esc_attr($selected); ?>><?php echo esc_html(get_the_title($page->ID)); ?></option>

sell-ads/trunk/inc/shortcode.php

@@ -8 +8 @@
     $price = get_post_meta($id,"wpsap_campaign_price",true);
     $button_text = get_post_meta($id, "wpsap_button_text",true);
-    if(empty($title)){
-        $title = __('This Ad Space is for Sale','wpsap_ads_plugin');
-    }
+    // Kein Default-Titel: der Platz zeigt einen Titel nur, wenn der Betreiber
+    // ihn aktiv gesetzt hat (Ausgabe unten bedingt).
     if(empty($button_text)){
         $button_text = __('Buy','wpsap_ads_plugin');
@@ -27 +26 @@
     <div class="wpsap_ads_plugin_ads_box">
         <div class="wpsap_ads_plugin_ads_box_container">
+        <?php if((string) $title !== ''){ ?>
         <div class="wpsap_ads_plugin_ads_box_title"><?php echo esc_html($title); ?></div>
+        <?php } ?>
         <form class="wpsap_ads_plugin_ads_box_form" method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
             <input type="hidden" name="action" value="wpsap_start_checkout">
@@ -48 +49 @@
     }
     else {
+        // Klicks auf die veroeffentlichte Anzeige laufen ueber /goto/<slug>,
+        // damit der Zaehler der Kampagne hochlaeuft (inc/hooks.php) - derselbe
+        // Zaehler, den auch der Buy-Button-Klick erhoeht (inc/checkout.php).
+        // Fallback auf die ID, falls der Slug (post_name) leer ist.
+        $slug = get_post_field('post_name',$id);
+        if(empty($slug)){
+            $slug = $id;
+        }
+        // user_trailingslashit() richtet sich nach der Permalink-Struktur der
+        // Seite. Ohne das haengt WordPress bei Trailing-Slash-Permalinks erst
+        // einen 301 an, bevor der Redirect greift - ein unnoetiger Hop auf
+        // jedem Anzeigenklick.
+        $goto_url = home_url(user_trailingslashit('goto/'.$slug));
         foreach($activer_orders as $ad){
-            $url = get_post_meta($ad->ID, "order_url",true);
-         ?> 
+         ?>
     <div class="wpsap_ads_plugin_ads_box">
         <div class="wpsap_ads_plugin_ads_box_container">
-        <a href="<?php echo esc_attr($url); ?>" target="_blank" rel="noopener noreferrer nofollow"><img style="max-width:100%;" src="<?php echo esc_attr(get_post_meta($ad->ID, "order_image",true)); ?>"></a>
+        <a href="<?php echo esc_url($goto_url); ?>" target="_blank" rel="noopener noreferrer nofollow"><img style="max-width:100%;" src="<?php echo esc_attr(get_post_meta($ad->ID, "order_image",true)); ?>"></a>
         </div>
     </div>

sell-ads/trunk/inc/stripe.php

@@ -157 +157 @@
         ),
         'subscription_data'    => array(
+            // Waehrend der Pruefungsfrist wird nicht belastet: das Abo startet
+            // im Trial, die erste Rechnung entsteht erst, wenn der Betreiber die
+            // Bestellung annimmt (wpsap_stripe_end_trial) - oder gar nicht, wenn
+            // sie nach 14 Tagen ablaeuft und das Abo vorher gekuendigt wird.
+            // 16 statt 14 Tage: der Ablauf-Cron laeuft nur taeglich, der Puffer
+            // stellt sicher, dass die Kuendigung immer vor dem Trial-Ende greift.
+            'trial_period_days' => 16,
             'metadata' => array(
                 'wpsap_place_id' => (string) $campaign_id,
@@ -210 +217 @@
     }
     return wpsap_stripe_request('DELETE','subscriptions/'.rawurlencode($subscription_id));
+}
+
+/**
+ * Beendet den Trial eines Abos sofort. Dadurch stellt Stripe die erste
+ * Rechnung unmittelbar aus. Aufgerufen beim Annehmen einer Bestellung: erst
+ * dann - nicht schon beim Checkout - soll der Kaeufer belastet werden.
+ */
+function wpsap_stripe_end_trial($subscription_id){
+    $subscription_id = sanitize_text_field($subscription_id);
+    if(empty($subscription_id)){
+        return new WP_Error('wpsap_no_subscription',__('No subscription stored for this order.','wpsap_ads_plugin'));
+    }
+    if(wpsap_connect_is_active()){
+        return wpsap_connect_end_trial($subscription_id);
+    }
+    return wpsap_stripe_request('POST','subscriptions/'.rawurlencode($subscription_id),array('trial_end' => 'now'));
 }
 

sell-ads/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.0
 Requires PHP: 7.0
-Stable tag: 1.8.2
+Stable tag: 1.9.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -241 +241 @@
 If you want to fill unsold inventory automatically, you want an ad network, not this. This plugin
 does nothing until a real advertiser buys a real space from you. If you need impression counting,
-click tracking, geo-targeting or A/B rotation, this plugin has none of it on purpose: an ad here is
-an image and a link, and that is the entire point. And if you would rather never speak to an
+geo-targeting or A/B rotation, this plugin has none of it on purpose: an ad here is an image and a
+link, and that is the entire point. It does count clicks — first-party, on your own server, with no
+cookies and no third-party script — but that is as far as the measuring goes. And if you would rather never speak to an
 advertiser, be aware that even though the purchase itself is automatic, you are the one who decides
 what runs on your site.
@@ -402 +403 @@
 
 == Changelog ==
+
+= 1.9.0 =
+* New: the campaign list shows a "Clicks" column again, counting how often each ad space was clicked. Published ads now link through a first-party /goto/<slug> redirect on your own domain that counts the click and forwards the visitor to the advertiser — no cookies and no third-party script are involved, and clicks from logged-in editors are not counted.
+* Fixed: the "PHP" and "Shortcode" columns showed their raw HTML instead of a usable field. They are copyable input fields again, each with a copy button.
+
+= 1.8.4 =
+* The confirmation step is now a single centred column, matching the upload step. The left column that repeated your site name, the ad space and the monthly price has been removed; the confirmation badge, the summary table and the cancellation link stay.
+
+= 1.8.3 =
+* The buyer flow was reworked to match the intended design. The ad space now shows as a rounded card instead of a square band.
+* The upload step is a single centred column again, with your site logo on top, the ad space name below the heading, and a clearly separated blue upload button. Your terms and refund pages are linked right there.
+* The confirmation step keeps its two columns and now opens with a confirmation badge and a four-row summary: when the request was submitted, the expected review window, that the partnership runs until either side cancels, and the expected first billing date.
+* Uses your WordPress site logo (Appearance → Customize) on both pages when one is set, otherwise your site name.
 
 = 1.8.2 =
@@ -456 +470 @@
 == Upgrade Notice ==
 
+= 1.9.0 =
+The campaign list has a Clicks column again and published ads are counted through a first-party /goto redirect on your own domain. The PHP and Shortcode columns are copyable fields again. No reconfiguration needed; the redirect rule is registered automatically on update.
+
+= 1.8.4 =
+The confirmation page after upload is now a single centred column; the left sidebar with the site name and price has been removed. No reconfiguration needed.
+
+= 1.8.3 =
+Visual update to the pages buyers see. The ad space is a rounded card, the upload step is a single centred column with your site logo, and the confirmation shows a badge and a clear date summary. No reconfiguration needed.
+
 = 1.8.2 =
 Documentation only — the plugin code is identical to 1.8.1. The description now covers pricing, placement and finding your first advertiser.

sell-ads/trunk/wp-sap.php

@@ -5 +5 @@
  * Plugin URI:        https://cybie.de
  * Description:       The easiest way to sell adspace on your WordPress Website
- * Version:           1.8.2
+ * Version:           1.9.6
  * Requires at least: 6.0
  * Requires PHP:      7.0
@@ -17 +17 @@
 
 
-define("WPSAP_Version",'1.8.2');
+define("WPSAP_Version",'1.9.6');
 define('WPSAP_Plugin_Path',plugin_dir_path( __FILE__ ));
 define('WPSAP_Plugin_Dir',plugin_dir_url( __FILE__ ));
@@ -81 +81 @@
         wp_schedule_event(time() + HOUR_IN_SECONDS,'daily','wpsap_expire_pending_orders');
     }
+
+    // Damit /goto/<slug> sofort nach der Aktivierung greift, muss die
+    // Rewrite-Rule bekannt sein und einmal geflusht werden. Die laufende
+    // Absicherung uebernimmt der Versions-Guard in wpsap_goto_rewrite().
+    wpsap_goto_rewrite();
+    flush_rewrite_rules();
 }
 
@@ -86 +92 @@
 function wpsap_deactivate(){
     wp_clear_scheduled_hook('wpsap_expire_pending_orders');
+
+    // Die /goto-Rewrite-Rule wird ohne aktives Plugin nicht mehr registriert -
+    // der Flush raeumt sie aus den gespeicherten Regeln. Beim naechsten
+    // Aktivieren sorgt der Versions-Guard fuer die Neuanlage.
+    delete_option('wpsap_rewrite_version');
+    flush_rewrite_rules();
 }