1.2.11

* [tested] with WordPress 6.8
* [change] Dashboard tweaks
* [update] Action links

Author: adegans

ajdg-matomo-tracker-dashboard.php

@@ -30,7 +30,7 @@
 				<h2 class="ajdg-postbox-title"><?php _e('Settings', 'ajdg-matomo-tracker'); ?></h2>
 				<div id="report-form" class="ajdg-postbox-content">
 
-					<form name="report" id="post" method="post" action="tools.php?page=matomo-tracker">
+					<form name="report" id="post" method="post" action="tools.php?page=ajdg-matomo-tracker">
 						<?php wp_nonce_field('matomo_nonce','matomo_nonce'); ?>
 
 						<h2><?php _e('Required options', 'ajdg-matomo-tracker'); ?></h2>
@@ -96,17 +96,54 @@
 		<div id="right-column" class="ajdg-postbox-container">
 
 			<div class="ajdg-postbox">
-				<h2 class="ajdg-postbox-title"><?php _e('Support & News', 'ajdg-matomo-tracker'); ?></h2>
-				<div id="stats" class="ajdg-postbox-content">
-					<h2><?php _e('Help with development', 'ajdg-matomo-tracker'); ?></h2>
-					<p><?php _e('AJdG Matomo Tracker is developed independently from Matomo and Arnan is not affiliated with Matomo or their team. Developing plugins like this, however small, takes a lot of time and resources. If you like AJdG Matomo Tracker or you find it useful please consider making a donation. Thanks for your support!', 'ajdg-matomo-tracker'); ?></p>
-					<p><a class="button-primary" href="https://arnan.me/donate.html" target="_blank"><?php _e('Donate via Paypal', 'ajdg-matomo-tracker'); ?></a> <a class="button-secondary" href="https://wordpress.org/support/plugin/matomo-analytics/reviews?rate=5#postform" target="_blank"><?php _e('Write review on wordpress.org', 'ajdg-matomo-tracker'); ?></a> <a class="button-secondary" href="https://support.ajdg.net/" target="_blank"><?php _e('Support', 'ajdg-matomo-tracker'); ?></a></p>
+				<h2 class="ajdg-postbox-title"><?php _e('Matomo Tracker', 'ajdg-matomo-tracker'); ?></h2>
+				<div id="general" class="ajdg-postbox-content">
+					<p><strong><?php _e('Get help with Matomo Tracker', 'ajdg-matomo-tracker'); ?></strong></p>
+					<p><?php _e('Use the buttons below if you have any questions about using Matomo Tracker. I am always happy to help!', 'ajdg-matomo-tracker'); ?></p>
+
+					<p><a class="button-primary" href="https://ajdg.solutions/product/support-ticket/" target="_blank" title="<?php _e('Buy support ticket', 'ajdg-matomo-tracker'); ?>"><?php _e('Buy a support ticket', 'ajdg-matomo-tracker'); ?></a> <a class="button-primary" href="https://support.ajdg.net/knowledgebase.php" target="_blank" title="<?php _e('Knowledgebase', 'ajdg-matomo-tracker'); ?>"><?php _e('Knowledgebase', 'ajdg-matomo-tracker'); ?></a> <a class="button-secondary" href="https://wordpress.org/support/plugin/matomo-analytics/" target="_blank" title="<?php _e('Forum on wordpress.org', 'ajdg-matomo-tracker'); ?>"><?php _e('Forum on wordpress.org', 'ajdg-matomo-tracker'); ?></a></p>
+
+					<p><strong><?php _e('Support Matomo Tracker', 'ajdg-matomo-tracker'); ?></strong></p>
+					<p><?php _e('Consider writing a review or making a donation if you like the plugin or if you find the plugin useful. Thanks for your support!', 'ajdg-matomo-tracker'); ?></p>
+
+					<p><a class="button-primary" href="https://ajdg.solutions/product/token-of-thanks/" target="_blank" title="<?php _e('Support me with a token of thanks', 'ajdg-matomo-tracker'); ?>"><?php _e('Gift a token of thanks', 'ajdg-matomo-tracker'); ?></a> <a class="button-secondary" href="https://wordpress.org/support/plugin/matomo-analytics/reviews?rate=5#postform" target="_blank" title="<?php _e('Write review on wordpress.org', 'ajdg-matomo-tracker'); ?>"><?php _e('Write review on wordpress.org', 'ajdg-matomo-tracker'); ?></a></p>
+
+					<p><strong><?php _e('Plugins and services', 'ajdg-matomo-tracker'); ?></strong></p>
+					<table width="100%">
+						<tr>
+							<td width="50%">
+								<div class="ajdg-sales-widget" style="display: inline-block; margin-right:2%;">
+									<a href="https://ajdg.solutions/product/adrotate-pro-single/" target="_blank"><div class="header"><img src="<?php echo plugins_url("/images/offers/monetize-your-site.jpg", __FILE__); ?>" alt="AdRotate Professional" width="228" height="120"></div></a>
+									<a href="https://ajdg.solutions/product/adrotate-pro-single/" target="_blank"><div class="title"><?php _e('AdRotate Professional', 'ajdg-matomo-tracker'); ?></div></a>
+									<div class="sub_title"><?php _e('WordPress Plugin', 'ajdg-matomo-tracker'); ?></div>
+									<div class="cta"><a role="button" class="cta_button" href="https://ajdg.solutions/product/adrotate-pro-single/" target="_blank">Starting at &euro; 39,-</a></div>
+									<hr>
+									<div class="description"><?php _e('Place any kind of advert including those from Google Adsense or affiliate links on your WordPress and ClassicPress website.', 'ajdg-matomo-tracker'); ?></div>
+								</div>
+							</td>
+							<td>
+								<div class="ajdg-sales-widget" style="display: inline-block;">
+									<a href="https://ajdg.solutions/plugins/" target="_blank"><div class="header"><img src="<?php echo plugins_url("/images/offers/more-plugins.jpg", __FILE__); ?>" alt="AJdG Solutions Plugins" width="228" height="120"></div></a>
+									<a href="https://ajdg.solutions/plugins/" target="_blank"><div class="title"><?php _e('All my plugins', 'ajdg-matomo-tracker'); ?></div></a>
+									<div class="sub_title"><?php _e('WordPress and ClassicPress', 'ajdg-matomo-tracker'); ?></div>
+									<div class="cta"><a role="button" class="cta_button" href="https://ajdg.solutions/plugins/" target="_blank">View now</a></div>
+									<hr>
+									<div class="description"><?php _e('Excellent plugins for WordPres, ClassicPress, WooCommerce and bbPress. Most of them are completely FREE to use!', 'ajdg-matomo-tracker'); ?></div>
+								</div>
+							</td>
+						</tr>
+					</table>
 
-					<h2><?php _e('News and Updates', 'ajdg-matomo-tracker'); ?></h2>
-					<p><a href="http://ajdg.solutions/feed/" target="_blank" title="Subscribe to the AJdG Solutions RSS feed!" class="button-primary"><i class="icn-rss"></i>Subscribe via RSS feed</a> <em>No account required!</em></p>
+				</div>
+			</div>
+
+			<div class="ajdg-postbox">
+				<h2 class="ajdg-postbox-title"><?php _e('News & Updates', 'ajdg-matomo-tracker'); ?></h2>
+				<div id="news" class="ajdg-postbox-content">
+					<p><a href="http://ajdg.solutions/feed/" target="_blank" title="Subscribe to the AJdG Solutions RSS feed!" class="button-primary"><i class="icn-rss"></i><?php _e('Subscribe via RSS feed', 'ajdg-matomo-tracker'); ?></a> <em><?php _e('No account required!', 'ajdg-matomo-tracker'); ?></em></p>
 
 					<?php wp_widget_rss_output(array(
-						'url' => array('http://ajdg.solutions/feed/'),
+						'url' => 'http://ajdg.solutions/feed/',
 						'items' => 5,
 						'show_summary' => 1,
 						'show_author' => 0,
@@ -118,4 +155,4 @@
 		</div>
 	</div>
 </div>
-<center><small><?php _e('Arnan de Gans and "AJdG Matomo Tracker" are luckily not affiliated with Matomo. For support with Matomo itself check out their website.', 'ajdg-matomo-tracker'); ?></small></center>
+<center><small><?php _e('Arnan de Gans and "Matomo Tracker" are not affiliated with Matomo. For support with Matomo itself check out their website.', 'ajdg-matomo-tracker'); ?></small></center>

ajdg-matomo-tracker-functions.php

@@ -103,7 +103,7 @@ function ajdg_matomo_save_settings() {
 		update_option('ajdg_matomo_track_feed_impressions', $track_feed_impressions);
 		update_option('ajdg_matomo_high_accuracy', $track_high_accuracy);
 
-		ajdg_matomo_return('matomo-tracker', 100);
+		ajdg_matomo_return('ajdg-matomo-tracker', 100);
 		exit;
 	} else {
 		ajdg_matomo_nonce_error();
@@ -164,7 +164,7 @@ function ajdg_matomo_notifications_dashboard() {
 	if($review_banner != 1 AND $review_banner < (current_time('timestamp') - (7 * DAY_IN_SECONDS))) {
 		echo '<div class="ajdg-notification notice" style="">';
 		echo '	<div class="ajdg-notification-logo" style="background-image: url(\''.plugins_url('/images/notification.png', __FILE__).'\');"><span></span></div>';
-		echo '	<div class="ajdg-notification-message">Hey there <strong>'.$displayname.'</strong>! You have been using <strong>AJdG Matomo Tracker</strong> for a few days.<br />If you like the plugin, please <strong>write a review</strong>.<br />If you have questions, complaints or something else that does not belong in a review, please use the <a href="https://wordpress.org/support/plugin/matomo-analytics/">support forum</a>!</div>';
+		echo '	<div class="ajdg-notification-message">Hey there <strong>'.$displayname.'</strong>! You have been using <strong>Matomo Tracker</strong> for a few days.<br />If you like the plugin, please <strong>write a review</strong>.<br />If you have questions, complaints or something else that does not belong in a review, please use the <a href="https://wordpress.org/support/plugin/matomo-analytics/">support forum</a>!</div>';
 		echo '	<div class="ajdg-notification-cta">';
 		echo '		<a href="https://wordpress.org/support/plugin/matomo-analytics/reviews?rate=5#postform" class="ajdg-notification-act button-primary">Write a Review</a>';
 		echo '		<a href="tools.php?page=matomo-tracker&hide=1" class="ajdg-notification-dismiss">Maybe later</a>';
@@ -180,7 +180,7 @@ function ajdg_matomo_notifications_dashboard() {
 		foreach($has_error as $error => $message) {
 			echo '&raquo; '.$message.'<br />';
 		}
-		echo '	<br /><a href="'.admin_url('/tools.php?page=matomo-tracker').'">'.__('Check your settings', 'ajdg-matomo-tracker').'</a>!';
+		echo '	<a href="'.admin_url('/tools.php?page=ajdg-matomo-tracker').'">'.__('Check your settings', 'ajdg-matomo-tracker').'</a>!';
 		echo '	</div>';
 		echo '</div>';
 	}
@@ -195,8 +195,12 @@ function ajdg_matomo_has_error() {
 	$siteurl = get_option('ajdg_matomo_siteurl');
 	$track_active = get_option('ajdg_matomo_active');
 
-	if($track_active == 'yes' AND (empty($siteid) OR empty($siteurl))) {
-		$error['matomo_site_details'] = __('You activated the tracker but the Site ID and/or Site URL is empty.', 'ajdg-matomo-tracker');
+	if($track_active == 'yes' AND empty($siteid)) {
+		$error['matomo_site_id'] = __('You activated the Matomo Analytics Tracker but the Site ID is not set.', 'ajdg-matomo-tracker');
+	}
+
+	if($track_active == 'yes' AND empty($siteurl)) {
+		$error['matomo_site_url'] = __('You activated the Matomo Analytics Tracker but the Site URL is not configured.', 'ajdg-matomo-tracker');
 	}
 
 	$error = (isset($error) AND is_array($error)) ? $error : false;
@@ -209,8 +213,8 @@ function ajdg_matomo_has_error() {
  Since:		1.0
 -------------------------------------------------------------*/
 function ajdg_matomo_action_links($links) {
-	$links['ajdg-matomo-settings'] = sprintf('<a href="%s">%s</a>', admin_url('tools.php?page=matomo-tracker'), 'Settings');
-	$links['ajdg-matomo-help'] = sprintf('<a href="%s" target="_blank">%s</a>', 'https://support.ajdg.net/', 'Support');
+	$links['ajdg-matomo-settings'] = sprintf('<a href="%s">%s</a>', admin_url('tools.php?page=ajdg-matomo-tracker'), 'Settings');
+	$links['ajdg-matomo-help'] = sprintf('<a href="%s" target="_blank">%s</a>', 'https://support.ajdg.net/knowledgebase.php', 'Support');
 	$links['ajdg-matomo-ajdg'] = sprintf('<a href="%s" target="_blank">%s</a>', 'https://ajdg.solutions/', 'ajdg.solutions');
 
 	return $links;
@@ -229,7 +233,7 @@ function ajdg_matomo_return($page, $status, $args = null) {
 		$arguments = wp_parse_args($args, $defaults);
 		$redirect = 'tools.php?page=' . $page . '&'.http_build_query($arguments);
 	} else {
-		$redirect = 'tools.php?page=matomo-tracker';
+		$redirect = 'tools.php?page=ajdg-matomo-tracker';
 	}
 
 	wp_redirect($redirect);

ajdg-matomo-tracker.php

@@ -1,11 +1,11 @@
 <?php
 /*
-Plugin Name: AJdG Matomo Tracker
+Plugin Name: Matomo Tracker
 Plugin URI: https://ajdg.solutions/product/matomo-tracker-for-wordpress/
 Author: Arnan de Gans
 Author URI: https://www.arnan.me/
 Description: Easily add the Matomo tracking code to your websites footer and manage options for it from the dashboard.
-Version: 1.2.10
+Version: 1.2.11
 Text Domain: ajdg-matomo-tracker
 Domain Path: /languages/
 License: GPLv3
@@ -62,22 +62,22 @@
  Purpose:   Add pages to admin menus
 -------------------------------------------------------------*/
 function ajdg_matomo_dashboard_menu() {
-	add_management_page('Matomo Tracker', 'Matomo Tracker', 'manage_options', 'matomo-tracker', 'ajdg_matomo_info');
+	add_management_page('Matomo Tracker', 'Matomo Tracker', 'manage_options', 'ajdg-matomo-tracker', 'ajdg_matomo_dashboard');
 }
 
 /*-------------------------------------------------------------
- Name:      ajdg_matomo_info
+ Name:      ajdg_matomo_dashboard
  Purpose:   Admin general info page
 -------------------------------------------------------------*/
-function ajdg_matomo_info() {
-	$status = $do = '';
+function ajdg_matomo_dashboard() {
+	$status = '';
 	if(isset($_GET['status'])) $status = esc_attr($_GET['status']);
 
 	$current_user = wp_get_current_user();
 	?>
 
 	<div class="wrap">
-		<h1><?php _e('AJdG Matomo Tracker', 'ajdg-matomo-tracker'); ?></h1>
+		<h1><?php _e('Matomo Tracker', 'ajdg-matomo-tracker'); ?></h1>
 
 		<?php
 		if($status > 0) ajdg_matomo_status($status);

images/offers/index.php

@@ -0,0 +1,3 @@
+<?php
+// Nope.
+?>