v0.9.20 - Submission Collections

morehawes · web-flow · commit c983ea2eff47 · 2022-10-03T08:14:46.000-07:00
Front-end <a href="https://www.waymark.dev/docs/submissions/">Submissions</a> can now be added to a <a href="https://www.waymark.dev/docs/collections/">Collection</a> by default. A collection for User and Guest submissions can be specified in Settings > Submissions > Default Collection.
diff --git a/Waymark.php b/Waymark.php
@@ -4,7 +4,7 @@
 Plugin Name: Waymark
 Plugin URI: https://www.waymark.dev/
 Description: Mapping with WordPress made easy. With Waymark enabled, click on the "Maps" link in the sidebar to create and edit Maps. Once you are happy with your Map, copy the Waymark shortcode and add it to your content.
-Version: 0.9.19
+Version: 0.9.20
 Text Domain: waymark
 Author: Joe Hawes
 Author URI: https://www.morehawes.co.uk/
diff --git a/inc/Admin/Waymark_Settings.php b/inc/Admin/Waymark_Settings.php
@@ -514,6 +514,18 @@ function __construct() {
 		
 		// ==================== Submission ====================
 		
+		//Build list of Collections to use as <select> options
+		$collection_objects = get_terms([
+			'taxonomy' => 'waymark_collection',
+			'hide_empty' => false
+		]);
+		$collection_array = [
+			'' => ' - '
+		];
+		foreach($collection_objects as $collection) {
+			$collection_array[$collection->term_id] = $collection->name;
+		}
+			
 		//Roles
 		if(! function_exists('get_editable_roles')) {
     	require_once ABSPATH . 'wp-admin/includes/user.php';
@@ -586,23 +598,31 @@ function __construct() {
 							'name' => 'submission_status',
 							'id' => 'submission_users_status',
 							'type' => 'select',
-							'title' => esc_html__('Post Status', 'waymark'),
+							'title' => esc_html__('Default Status', 'waymark'),
 							'default' => Waymark_Config::get_setting('submission', 'from_users', 'submission_status'),
 							'tip' => esc_attr__('This is the initial status of the submitted Map. Note! Publish means that the Map (including any images added) will be *immediately* visible on your site.', 'waymark'),
 							'options' => array(
 								'publish' => esc_attr__('Publish', 'waymark'),
 								'draft' => esc_attr__('Draft', 'waymark')
 							)							
 						),
-						'submission_alert' => array(
-							'name' => 'submission_alert',
-							'id' => 'submission_users_alert',
-							'type' => 'boolean',
-							'title' => esc_html__('Email Alert', 'waymark'),
-							'default' => Waymark_Config::get_setting('submission', 'from_users', 'submission_alert'),
-							'tip' => esc_attr__('Receive email alerts for new submissions.', 'waymark'),
-							'class' => 'waymark-hidden'
-						),																																								
+						'submission_collection' => array(
+							'name' => 'submission_collection',
+							'id' => 'submission_users_collection',
+							'type' => 'select',
+							'title' => esc_html__('Default Collection', 'waymark'),
+							'tip' => esc_attr__('If specified, user submissions will be automatically added to this Collection.', 'waymark'),
+							'options' => $collection_array
+						),
+// 						'submission_alert' => array(
+// 							'name' => 'submission_alert',
+// 							'id' => 'submission_users_alert',
+// 							'type' => 'boolean',
+// 							'title' => esc_html__('Email Alert', 'waymark'),
+// 							'default' => Waymark_Config::get_setting('submission', 'from_users', 'submission_alert'),
+// 							'tip' => esc_attr__('Receive email alerts for new submissions.', 'waymark'),
+// 							'class' => 'waymark-hidden'
+// 						)																																																			
 					)											
 				),
 				
@@ -652,7 +672,7 @@ function __construct() {
 							'name' => 'submission_status',
 							'id' => 'submission_public_status',
 							'type' => 'select',
-							'title' => esc_html__('Post Status', 'waymark'),
+							'title' => esc_html__('Default Status', 'waymark'),
 							'default' => Waymark_Config::get_setting('submission', 'from_public', 'submission_status'),
 							'tip' => esc_attr__('This is the initial status of the submitted Map. Note! Publish means that the Map (including any images added) will be *immediately* visible on your site.', 'waymark'),
 							'options' => array(
@@ -661,15 +681,23 @@ function __construct() {
 							),
 							'class' => ''					
 						),
-						'submission_alert' => array(
-							'name' => 'submission_alert',
-							'id' => 'submission_public_alert',
-							'type' => 'boolean',
-							'title' => esc_html__('Email Alert', 'waymark'),
-							'default' => Waymark_Config::get_setting('submission', 'from_public', 'submission_alert'),
-							'tip' => esc_attr__('Receive email alerts for new submissions.', 'waymark'),
-							'class' => 'waymark-hidden'
-						),																																							
+						'submission_collection' => array(
+							'name' => 'submission_collection',
+							'id' => 'submission_public_collection',
+							'type' => 'select',
+							'title' => esc_html__('Default Collection', 'waymark'),
+							'tip' => esc_attr__('If specified, user submissions will be automatically added to this Collection.', 'waymark'),
+							'options' => $collection_array
+						),
+// 						'submission_alert' => array(
+// 							'name' => 'submission_alert',
+// 							'id' => 'submission_public_alert',
+// 							'type' => 'boolean',
+// 							'title' => esc_html__('Email Alert', 'waymark'),
+// 							'default' => Waymark_Config::get_setting('submission', 'from_public', 'submission_alert'),
+// 							'tip' => esc_attr__('Receive email alerts for new submissions.', 'waymark'),
+// 							'class' => 'waymark-hidden'
+// 						),																																							
 					)											
 				)				
 			)
diff --git a/inc/Front/Waymark_Submission.php b/inc/Front/Waymark_Submission.php
@@ -9,6 +9,7 @@ class Waymark_Submission {
 	private $Map;
 	
 	private $user;
+	private $user_type;	// admin / user / guest
 	private $status;
 	private $alert;	
 	private $features = [];	
@@ -32,6 +33,7 @@ public function __construct($data = array()) {
 			if(sizeof($this->user->roles)) {			
 				//Admin
 				if(in_array('administrator', $this->user->roles)) {
+					$this->user_type = 'admin';
 					$this->allowed = true;
 				
 					$this->status = 'publish';
@@ -40,6 +42,7 @@ public function __construct($data = array()) {
 					$this->features = $this->all_features;
 				//Current user can
 				} elseif($this->user_can_submit()) {
+					$this->user_type = 'user';
 					$this->allowed = true;
 
 					$this->status = Waymark_Config::get_setting('submission', 'from_users', 'submission_status');
@@ -48,6 +51,7 @@ public function __construct($data = array()) {
 					$this->features = Waymark_Config::get_setting('submission', 'from_users', 'submission_features');				
 				//Treat as public?
 				} elseif(Waymark_Config::get_setting('submission', 'from_public', 'submission_public')) {
+					$this->user_type = 'guest';
 					$this->allowed = true;
 
 					$this->status = Waymark_Config::get_setting('submission', 'from_public', 'submission_status');				
@@ -62,6 +66,7 @@ public function __construct($data = array()) {
 			} else {
 				//Public submissions allowed	
 				if(Waymark_Config::get_setting('submission', 'from_public', 'submission_public')) {
+					$this->user_type = 'guest';
 					$this->allowed = true;
 
 					$this->status = Waymark_Config::get_setting('submission', 'from_public', 'submission_status');				
@@ -321,6 +326,23 @@ public function create_map() {
 			'post_status' => $this->status
 		));		
 
+		//Add to collection?
+		$submission_collection = false;
+		switch($this->user_type) {
+			case 'guest' :
+				$submission_collection = Waymark_Config::get_setting('submission', 'from_public', 'submission_collection');
+				
+				break;
+			default :
+				$submission_collection = Waymark_Config::get_setting('submission', 'from_users', 'submission_collection');
+
+				break;
+		}	
+		if($submission_collection) {
+			//Link Map to Collection
+			wp_set_object_terms($this->Map->post_id, (int) $submission_collection, 'waymark_collection');		
+		}
+
 		$this->redirect_data['waymark_map_id'] = $this->Map->post_id;
 		
 		return $this->Map->post_id;
diff --git a/inc/Waymark_Config.php b/inc/Waymark_Config.php
@@ -11,7 +11,7 @@ public static function init() {
 			'plugin_name' => 'Waymark',
 			'plugin_name_short' => 'Waymark',		
 			'custom_types' => array(),
-			'plugin_version' => '0.9.19',
+			'plugin_version' => '0.9.20',
 			'nonce_string' => 'Waymark_Nonce',
 			'site_url' => 'https://www.waymark.dev/',
 			'directory_url' => 'https://wordpress.org/support/plugin/waymark/',
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Waymark",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "Waymark for WordPress",
   "author": "Joe Hawes",
   "main": "Gruntfile.js",
diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@
 **Requires at least:** 4.6  
 **Tested up to:** 6.0  
 **Requires PHP:** 5.2  
-**Stable tag:** 0.9.19  
+**Stable tag:** 0.9.20  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -111,6 +111,10 @@ A big thank you to the following projects and their contributors. Without their
 
 ## Changelog ##
 
+### 0.9.20 ###
+
+* Front-end <a href="https://www.waymark.dev/docs/submissions/">Submissions</a> can now be added to a <a href="https://www.waymark.dev/docs/collections/">Collection</a> by default. A collection for User and Guest submissions can be specified in Settings > Submissions > Default Collection.
+
 ### 0.9.19 ###
 
 * **<a href="https://www.waymark.dev/docs/shortcodes/#shortcode-files">Shortcode Files</a>**
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: Create interactive Maps, Add custom Markers, Display geotagged photos, ele
 Requires at least: 4.6
 Tested up to: 6.0
 Requires PHP: 5.2
-Stable tag: 0.9.19
+Stable tag: 0.9.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,10 @@ A big thank you to the following projects and their contributors. Without their
 
 == Changelog ==
 
+= 0.9.20 = 
+
+* Front-end <a href="https://www.waymark.dev/docs/submissions/">Submissions</a> can now be added to a <a href="https://www.waymark.dev/docs/collections/">Collection</a> by default. A collection for User and Guest submissions can be specified in Settings > Submissions > Default Collection.
+
 = 0.9.19 = 
 
 * **<a href="https://www.waymark.dev/docs/shortcodes/#shortcode-files">Shortcode Files</a>**

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Waymark",`
`3`		`- "version": "0.9.19",`
	`3`	`+ "version": "0.9.20",`
`4`	`4`	`"description": "Waymark for WordPress",`
`5`	`5`	`"author": "Joe Hawes",`
`6`	`6`	`"main": "Gruntfile.js",`