Merge branch 'master' into update-gravityapi-domain

* master:
  Fix network activate install flag (#26)
  update change log
  Fix form notification update command (#25)
  update change log
  update docblock
  sanitize the form export file name
  bump version; update change log
  Add missing gf subcommand in documentation
  merges changes from github out of sync with public plugin
  adds optional filename flag for form export
  entry list: same features for json as ids format
  Permanently delete trashed entries
  Add missing entry subcommand in inline documentation

Author: yoren

cli.php

@@ -3,15 +3,15 @@
 Plugin Name: Gravity Forms CLI
 Plugin URI: http://www.gravityforms.com
 Description: Manage Gravity Forms with the WP CLI.
-Version: 1.1.1
+Version: 1.1.3
 Author: Rocketgenius
 Author URI: http://www.gravityforms.com
 License: GPL-2.0+
 Text Domain: gravityformscli
 Domain Path: /languages
 
 ------------------------------------------------------------------------
-Copyright 2016-2018 Rocketgenius, Inc.
+Copyright 2016-2020 Rocketgenius, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 defined( 'ABSPATH' ) || die();
 
 // Defines the current version of the CLI add-on
-define( 'GF_CLI_VERSION', '1.1.1' );
+define( 'GF_CLI_VERSION', '1.1.3' );
 
 define( 'GF_CLI_MIN_GF_VERSION', '1.9.17.8' );
 

includes/class-gf-cli-entry.php

@@ -125,10 +125,10 @@ public function get( $args, $assoc_args ) {
 	 *
 	 * ## EXAMPLES
 	 *
-	 *     wp gf delete 1
-	 *     wp gf delete 1 3 7 10
-	 *     wp gf delete 1 --force
-	 *     wp gf delete $(wp gf entry list 1 --status=trash --format=ids )
+	 *     wp gf entry delete 1
+	 *     wp gf entry delete 1 3 7 10
+	 *     wp gf entry delete 1 --force
+	 *     wp gf entry delete $(wp gf entry list 1 --status=trash --format=ids ) --force
 	 *
 	 * @synopsis <entry-id>... [--force]
 	 */
@@ -198,7 +198,7 @@ public function delete( $args, $assoc_args ) {
 	 * ## EXAMPLES
 	 *
 	 *     wp gf entry create 1 --field_1=ABC [email protected] --field_3=1234 --field_4=Hello --field_5.3=John --field_5.6=Doe
-	 *     wp gf entry create $(wp entry get 3 --raw --format=json)
+	 *     wp gf entry create $(wp gf entry get 3 --raw --format=json)
 	 * @synopsis [<entry-json>] [<form-id>] [--<field>=<value>]
 	 */
 	public function create( $args, $assoc_args ) {
@@ -643,7 +643,7 @@ public function entry_list( $args, $assoc_args ) {
 
 		// If the fomate is set to 'ids', get the entry IDs
 		if ( $format == 'ids' ) {
-			$entry_ids = GFFormsModel::search_lead_ids( $form_id, $search_criteria );
+			$entry_ids = GFAPI::get_entry_ids( $form_id, $search_criteria, array(), $paging, $total_count );
 			echo implode( ' ', $entry_ids );
 
 			return;

includes/class-gf-cli-form-notification.php

@@ -391,35 +391,48 @@ function duplicate( $args, $assoc_args ) {
 	 * <form-id>
 	 * : The Form ID
 	 *
+	 * [<notification-id>]
+	 * : The ID of the notification to updated.
+	 *
 	 * --notification-json=<notification-json>
-	 * : The JSON representation of the form
+	 * : The JSON representation of the notification.
 	 *
 	 * ## EXAMPLES
 	 *
 	 *     wp gf form notification update 1 --notification-json='{snip}'
+	 *     wp gf form notification update 1 abc1 --notification-json='{snip}'
 	 *
-	 * @synopsis <form-id> --notification-json=<notification-json>
+	 * @synopsis <form-id> [<notification-id>] --notification-json=<notification-json>
 	 */
 	function update( $args, $assoc_args ) {
 		$form_id = $args[0];
+		$form    = GFAPI::get_form( $form_id );
 
-		$notification_id = $args[1];
-
-		$form = GFAPI::get_form( $form_id );
 		if ( empty( $form ) ) {
 			WP_CLI::error( 'Form not found' );
 		}
 
-		$notifications = $form['notifications'];
-
-		$json_config = $assoc_args['notification-json'];
-
+		$json_config      = $assoc_args['notification-json'];
 		$new_notification = json_decode( $json_config, ARRAY_A );
 
 		if ( empty( $new_notification ) ) {
 			WP_CLI::error( 'Notification not valid' );
 		}
 
+		$notification_id = rgar( $args, 1 );
+
+		if ( empty( $notification_id ) ) {
+			if ( empty( $new_notification['id'] ) ) {
+				WP_CLI::error( 'Please specify the ID of the notification to be updated' );
+			} else {
+				$notification_id = $new_notification['id'];
+			}
+		} else {
+			$new_notification['id'] = $notification_id;
+		}
+
+		$notifications = $form['notifications'];
+
 		$found = false;
 		foreach ( $notifications as $key => $notification ) {
 			if ( $notification['id'] == $notification_id ) {

includes/class-gf-cli-form.php

@@ -101,6 +101,7 @@ function form_list( $args, $assoc_args ) {
 	 * Exports forms to a Gravity Forms Form export file.
 	 *
 	 * @since 1.0-beta-1
+	 * @since 1.2 Added the optional filename arg.
 	 *
 	 * ## OPTIONS
 	 *
@@ -110,6 +111,9 @@ function form_list( $args, $assoc_args ) {
 	 * [--dir=<dir>]
 	 * : The directory for the form to export. Defaults to the current working directory.
 	 *
+	 * [--filename=<filename>]
+	 * : The filename for the form to export. Defaults to the current date.
+	 *
 	 * [--porcelain]
 	 * : Overrides the standard success message with just the export file path
 	 *
@@ -118,7 +122,7 @@ function form_list( $args, $assoc_args ) {
 	 *     wp gf form export 1
 	 *     wp gf form export
 	 *
-	 * @synopsis [<form-id>] [--dir=<dir>] [--porcelain]
+	 * @synopsis [<form-id>] [--dir=<dir>] [--filename=<filename>] [--porcelain]
 	 */
 	function export( $args, $assoc_args ) {
 
@@ -138,7 +142,13 @@ function export( $args, $assoc_args ) {
 		$forms_json = json_encode( $forms );
 
 		// Set the filename of the export
-		$filename = 'gravityforms-export-' . date( 'Y-m-d' ) . '.json';
+		if ( isset( $assoc_args['filename'] ) ) {
+			$filename = $assoc_args['filename'];
+		} else {
+			$filename = 'gravityforms-export-' . date( 'Y-m-d' ) . '.json';
+		}
+
+		$filename = sanitize_file_name( $filename );
 
 		// If the export directory is set
 		if ( isset( $assoc_args['dir'] ) ) {

includes/class-gf-cli-root.php

@@ -79,7 +79,7 @@ public function version( $args, $assoc_args ) {
 	 * [--activate]
 	 * : If set, the plugin will be activated immediately after install.
 	 *
-	 * [--network-activate]
+	 * [--activate-network]
 	 * : If set, the plugin will be network activated immediately after install
 	 *
 	 *
@@ -89,7 +89,7 @@ public function version( $args, $assoc_args ) {
 	 *     wp gf install --force
 	 *     wp gf install --key=[A valid Gravity Forms License Key]
 	 *     wp gf install gravityformspolls key=[1234ABC]
-	 * @synopsis [<slug>] [--key=<key>] [--version=<version>] [--force] [--activate] [--network-activate]
+	 * @synopsis [<slug>] [--key=<key>] [--version=<version>] [--force] [--activate] [--activate-network]
 	 */
 	public function install( $args, $assoc_args ) {
 		$slug = isset( $args[0] ) ? $args[0] : 'gravityforms';
@@ -122,7 +122,7 @@ public function install( $args, $assoc_args ) {
 
 			$activate = WP_CLI\Utils\get_flag_value( $assoc_args, 'activate', false );
 
-			$network_activate = WP_CLI\Utils\get_flag_value( $assoc_args, 'network-activate', false );
+			$activate_network = WP_CLI\Utils\get_flag_value( $assoc_args, 'activate-network', false );
 
 			$command = sprintf( 'plugin install "%s"', $download_url );
 
@@ -138,9 +138,9 @@ public function install( $args, $assoc_args ) {
 				$command .= ' --activate';
 			}
 
-			if ( $network_activate ) {
-				$install_assoc_args['network-activate'] = true;
-				$command .= ' --network-activate';
+			if ( $activate_network ) {
+				$install_assoc_args['activate-network'] = true;
+				$command .= ' --activate-network';
 			}
 
 			$options = array(

readme.txt

@@ -181,6 +181,17 @@ https://www.gravityforms.com/open-support-ticket/
 
 == ChangeLog ==
 
+= 1.1.3 =
+- Fixed an issue where the install command could not network activate plugins.
+
+= 1.1.2 =
+- Updated the ids format of the entry list command to support the page-size and offset args. Credit: Ulrich Pogson.
+- Updated the form export command to support the optional filename arg e.g. wp gf form export 1 --filename=testing.json. Credit: Timothy Decker.
+- Fixed an error occurring when using the form notification update command without the notification-id arg.
+
+= 1.1.1 =
+- Fixed an issue with the entry export command.
+
 = 1.1 =
 - Added support for start_date and end_date filters for the entry export command. e.g. wp gf entry export 11 --start_date="2018-11-01" --end_date="2018-11-11"
 - Added the "wp gf tool system-report" command and the "wp gf tool status" alias for outputting the system report from the Gravity Forms 2.2+ System Status page.