gravityview / GravityView

includes/class-template.php

Doc Comments +3 added lines

@@ -220,6 +220,9 @@
 
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getCurrentFieldSetting( $key ) {
 		$settings = $this->getCurrentField('field_settings');
 

includes/class-gravityview-entry-notes.php

Spacing +6 added lines, -6 removed lines

@@ -67,10 +67,10 @@ 
 		// Make sure the keys are all set
 		$note = wp_parse_args( $note, $default_note );
 
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
 
 		// If last_error is empty string, there was no error.
-		if( empty( $wpdb->last_error ) ) {
+		if ( empty( $wpdb->last_error ) ) {
 			$return = $wpdb->insert_id;
 		} else {
 			$return = new WP_Error( 'gravityview-add-note', $wpdb->last_error );
@@ -96,7 +96,7 @@ 
 	 */
 	public static function delete_notes( $note_ids = array() ) {
 
-		if( !is_array( $note_ids ) ) {
+		if ( ! is_array( $note_ids ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array. Not processing delete request.', $note_ids );
 
@@ -151,7 +151,7 @@ 
 			)
 		);
 
-		return $results ? $results[0] : false;
+		return $results ? $results[ 0 ] : false;
 	}
 
 	/**
@@ -164,8 +164,8 @@ 
 	 */
 	public static function filter_avatar( $avatar = '', $note ) {
 
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
 		}
 
 		return $avatar;

includes/extensions/entry-notes/partials/note-add-note.php

Spacing +2 added lines, -2 removed lines

@@ -21,10 +21,10 @@
 		{email_fields}
 
 		<div class="gv-note-content-container">
-			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings('content-label'); ?></label>
+			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings( 'content-label' ); ?></label>
 			<textarea name="gv-note-content" id="gv-note-content-{entry_slug}"></textarea>
 		</div>
 
-		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings('add-note'); ?></button>
+		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings( 'add-note' ); ?></button>
 	</div>
 </form>
\ No newline at end of file

includes/admin/field-types/type_html.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * @return string
 	 */
 	function get_field_desc() {
-		return !empty( $this->field['desc'] ) ? $this->field['desc'] : '';
+		return ! empty( $this->field[ 'desc' ] ) ? $this->field[ 'desc' ] : '';
 	}
 
 }

includes/admin/field-types/type_checkboxes.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 	}
 
 	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -30,18 +30,18 @@ 
 		?>
 		<ul class="gv-setting-list">
 		<?php
-		foreach( $this->field['options'] as $value => $label ) { ?>
-			<li <?php if( isset( $label['requires'] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label['requires'] ); } ?>>
+		foreach ( $this->field[ 'options' ] as $value => $label ) { ?>
+			<li <?php if ( isset( $label[ 'requires' ] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label[ 'requires' ] ); } ?>>
 				<label>
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>" type="hidden"
 				       value="0"/>
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>"
 				       id="<?php echo $this->get_field_id(); ?>" type="checkbox"
 				       value="1" <?php checked( ! empty( $this->value[ $value ] ) ); ?> />
-				<?php echo esc_html( $label['label'] ); ?>
+				<?php echo esc_html( $label[ 'label' ] ); ?>
 				</label>
-				<?php if( ! empty( $label['desc'] ) ) {
-					printf( '<span class="howto">%s</span>', $label['desc'] );
+				<?php if ( ! empty( $label[ 'desc' ] ) ) {
+					printf( '<span class="howto">%s</span>', $label[ 'desc' ] );
 				}
 				?>
 			</li>

includes/extensions/entry-notes/fields/notes.php

Spacing +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
 $gravityview_view = GravityView_View::getInstance();
 
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
 
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
 	return;
 }
 
@@ -25,20 +25,20 @@ 
 do_action( 'gravityview/field/notes/scripts' );
 
 $entry = $gravityview_view->getCurrentEntry();
-$notes = GravityView_Entry_Notes::get_notes( $entry['id'] );
+$notes = GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
 $strings = GravityView_Field_Notes::strings();
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
-$show_add = ! empty( $visibility_settings['add'] );
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
+$show_add = ! empty( $visibility_settings[ 'add' ] );
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
 
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
 ?>
 <div class="gv-notes <?php echo $container_class; ?>">
 <?php
-	if( $show_notes ) {
+	if ( $show_notes ) {
 ?>
 	<form method="post" class="gv-notes-list">
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@ 
 			<input type="hidden" name="action" value="gv_delete_notes" />
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
 			<table>
-				<caption><?php echo $strings['caption']; ?></caption>
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
 				<?php
 				if ( $show_delete ) {
 				?>
 				<thead>
 					<tr>
 						<th colspan="2">
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
 						</th>
 					</tr>
 				</thead>
 				<?php } ?>
 				<tbody>
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
 					<?php
 						foreach ( $notes as $note ) {
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@ 
 <?php
 	} // End if can view notes
 
-	if( $show_add ) {
+	if ( $show_add ) {
 		echo do_shortcode( '[gv_note_add]' );
 	}
 ?>

includes/class-gvlogic-shortcode.php

Spacing +22 added lines, -22 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -118,9 +118,9 @@ 
 
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
 
-		if( $with_values ) {
+		if ( $with_values ) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
+			foreach ( $operators as $key ) {
 				$operators_with_values[ $key ] = '';
 			}
 			return $operators_with_values;
@@ -137,14 +137,14 @@ 
 	 */
 	function set_operation( $operation = '' ) {
 
-		if( empty( $operation ) ) {
+		if ( empty( $operation ) ) {
 			return false;
 		}
 
 		$operators = $this->get_operators( false );
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if ( ! in_array( $operation, $operators ) ) {
+			do_action( 'gravityview_log_debug', __METHOD__ . ' Attempted to add invalid operation type.', $operation );
 			return false;
 		}
 
@@ -164,11 +164,11 @@ 
 	 */
 	private function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ( $this->atts as $key => $value ) {
 
 			$valid = $this->set_operation( $key );
 
-			if( $valid ) {
+			if ( $valid ) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -191,8 +191,8 @@ 
 			return null;
 		}
 
-		if( empty( $atts ) ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts are empty.', $atts );
+		if ( empty( $atts ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts are empty.', $atts );
 			return null;
 		}
 
@@ -203,16 +203,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->passed_atts );
+		if ( false === $this->if ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts->if is empty.', $this->passed_atts );
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if ( ! $setup ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' No valid operators were passed.', $this->atts );
 			return null;
 		}
 
@@ -245,7 +245,7 @@ 
 	 */
 	private function get_output() {
 
-		if( $this->is_match ) {
+		if ( $this->is_match ) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
@@ -259,9 +259,9 @@ 
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' Output: ', $output );
 
 		return $output;
 	}
@@ -277,11 +277,11 @@ 
 
 		$content = explode( '[else]', $this->passed_content );
 
-		$this->content = $content[0];
+		$this->content = $content[ 0 ];
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
 
-		$this->else_content = isset( $content[1] ) ? $content[1] : $else_attr;
+		$this->else_content = isset( $content[ 1 ] ) ? $content[ 1 ] : $else_attr;
 	}
 
 	/**
@@ -304,10 +304,10 @@ 
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = is_string( $this->atts['if'] ) ? trim( $this->atts['if'] ) : false;
+		$this->if = is_string( $this->atts[ 'if' ] ) ? trim( $this->atts[ 'if' ] ) : false;
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset( $this->atts[ 'if' ] );
 	}
 }
 

includes/extensions/delete-entry/class-delete-entry.php

Spacing +84 added lines, -84 removed lines

@@ -42,12 +42,12 @@ 
 
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
 		// Modify the field options based on the name of the field type
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@ 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
 
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -105,20 +105,20 @@ 
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
 		// Always a link, never a filter
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
 		// Delete Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
-		$add_option['delete_link'] = array(
+		$add_option[ 'delete_link' ] = array(
 			'type' => 'text',
 			'label' => __( 'Delete Link Text', 'gravityview' ),
 			'desc' => NULL,
-			'value' => __('Delete Entry', 'gravityview'),
+			'value' => __( 'Delete Entry', 'gravityview' ),
 			'merge_tags' => true,
 		);
 
-		$field_options['allow_edit_cap'] = array(
+		$field_options[ 'allow_edit_cap' ] = array(
 			'type' => 'select',
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -142,10 +142,10 @@ 
 	 */
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-		$entry_default_fields['delete_link'] = array(
-			'label' => __('Delete Entry', 'gravityview'),
+		$entry_default_fields[ 'delete_link' ] = array(
+			'label' => __( 'Delete Entry', 'gravityview' ),
 			'type' => 'delete_link',
-			'desc'	=> __('A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview'),
+			'desc'	=> __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
 		);
 
 		return $entry_default_fields;
@@ -158,7 +158,7 @@ 
 	 */
 	function add_available_field( $available_fields = array() ) {
 
-		$available_fields['delete_link'] = array(
+		$available_fields[ 'delete_link' ] = array(
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
@@ -186,12 +186,12 @@ 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ( $field_id === 'delete_link' ) {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
 
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
 		}
 
 		return $caps;
@@ -204,7 +204,7 @@ 
 	 * @param [type] $entry [description]
 	 */
 	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
 	}
 
 	/**
@@ -234,13 +234,13 @@ 
 
         $base = GravityView_API::directory_link( $post_id, true );
 
-		if( empty( $base ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
+		if ( empty( $base ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: ' . $post_id );
 			return NULL;
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
         $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
 
@@ -251,7 +251,7 @@ 
             'view_id' => $view_id,
 		), $base );
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
 
 		return $url;
 	}
@@ -268,7 +268,7 @@ 
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
 			return;
 		}
 
@@ -279,7 +279,7 @@ 
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if ( ! $show_delete_button ) {
 			return;
 		}
 
@@ -309,27 +309,27 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
 
 			// Make sure it's a GravityView request
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
 
-			if( ! $valid_nonce_key ) {
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
+			if ( ! $valid_nonce_key ) {
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
 				return;
 			}
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
 
 			// See if there's an entry there
 			$entry = gravityview_get_entry( $entry_slug );
 
-			if( $entry ) {
+			if ( $entry ) {
 
 				$has_permission = $this->user_can_delete_entry( $entry );
 
-				if( is_wp_error( $has_permission ) ) {
+				if ( is_wp_error( $has_permission ) ) {
 
 					$messages = array(
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -341,7 +341,7 @@ 
 					// Delete the entry
 					$delete_response = $this->delete_or_trash_entry( $entry );
 
-					if( is_wp_error( $delete_response ) ) {
+					if ( is_wp_error( $delete_response ) ) {
 
 						$messages = array(
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -360,10 +360,10 @@ 
 
 			} else {
 
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug ' . $entry_slug );
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
 					'status' => 'error',
 				);
 			}
@@ -403,18 +403,18 @@ 
 	 */
 	private function delete_or_trash_entry( $entry ) {
 
-		$entry_id = $entry['id'];
+		$entry_id = $entry[ 'id' ];
 		
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ( 'delete' === $mode ) {
 
 			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
 
 			// Delete the entry
 			$delete_response = GFAPI::delete_entry( $entry_id );
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if ( ! is_wp_error( $delete_response ) ) {
 				$delete_response = 'deleted';
 
 				/**
@@ -435,8 +435,8 @@ 
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if ( ! $trashed ) {
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
 			} else {
 
 				/**
@@ -467,7 +467,7 @@ 
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
 
 		// The entry had no connected post
-		if( empty( $entry['post_id'] ) ) {
+		if ( empty( $entry[ 'post_id' ] ) ) {
 			return;
 		}
 
@@ -478,22 +478,22 @@ 
 		 */
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
 		
-		if( false === $delete_post ) {
+		if ( false === $delete_post ) {
 			return;
 		}
 
 		$action = current_action();
 
-		if( 'gravityview/delete-entry/deleted' === $action ) {
-			$result = wp_delete_post( $entry['post_id'], true );
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
 		} else {
-			$result = wp_trash_post( $entry['post_id'] );
+			$result = wp_trash_post( $entry[ 'post_id' ] );
 		}
 
-		if( false === $result ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' (called by '.$action.'): Error processing the Post connected to the entry.', $entry );
+		if ( false === $result ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' (called by ' . $action . '): Error processing the Post connected to the entry.', $entry );
 		} else {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' (called by '.$action.'): Successfully processed Post connected to the entry.', $entry );
+			do_action( 'gravityview_log_debug', __METHOD__ . ' (called by ' . $action . '): Successfully processed Post connected to the entry.', $entry );
 		}
 	}
 
@@ -506,13 +506,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -534,7 +534,7 @@ 
 	 */
 	public static function get_confirm_dialog() {
 
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
 
 		/**
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -542,7 +542,7 @@ 
 		 */
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
 	}
 
 	/**
@@ -560,16 +560,16 @@ 
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if ( ! $this->verify_nonce() ) {
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
+		if ( $entry[ 'status' ] === 'trash' ) {
+			if ( 'trash' === $this->get_delete_mode() ) {
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
 			} else {
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -577,11 +577,11 @@ 
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
 
 		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
 	}
@@ -603,32 +603,32 @@ 
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
 
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
+			do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
 
 			return true;
 		}
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if ( ! empty( $field ) ) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
 
 				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
 					return true;
 				}
 
@@ -641,9 +641,9 @@ 
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
+			do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.' );
 
 			return false;
 		}
@@ -651,24 +651,24 @@ 
 		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
 
 		// Only checks user_delete view option if view is already set
-		if( $view_id ) {
+		if ( $view_id ) {
 
 			$current_view = gravityview_get_current_view_data( $view_id );
 
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
 
-			if( empty( $user_delete ) ) {
+			if ( empty( $user_delete ) ) {
 
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
+				do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
 
 				return false;
 			}
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
 
 			return true;
 		}
@@ -691,31 +691,31 @@ 
 	 */
 	public function display_message( $current_view_id = 0 ) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
+		if ( intval( $_GET[ 'gvid' ] ) !== intval( $current_view_id ) ) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
-		$message_from_url = rgget('message');
+		$status = esc_attr( $_GET[ 'status' ] );
+		$message_from_url = rgget( 'message' );
 		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
 		$class = '';
 
 		switch ( $status ) {
 			case 'error':
 				$class = ' gv-error error';
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
 				$message = sprintf( $error_message, $message_from_url );
 				break;
 			case 'trashed':
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
 				break;
 			default:
-				$message = __('The entry was successfully deleted.', 'gravityview');
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
 				break;
 		}
 
@@ -729,7 +729,7 @@ 
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
 	}
 
 

includes/class-gravityview-gfformsmodel.php

Indentation +177 added lines, -177 removed lines

@@ -7,183 +7,183 @@
 
 class GravityView_GFFormsModel extends GFFormsModel {
 
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
-     *
-     * @since 1.16.2
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
-     */
-    public static function copy_post_image( $url, $post_id ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::copy_post_image( $url, $post_id );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        $time = current_time( 'mysql' );
-
-        if ( $post = get_post( $post_id ) ) {
-            if ( substr( $post->post_date, 0, 4 ) > 0 ) {
-                $time = $post->post_date;
-            }
-        }
-
-        //making sure there is a valid upload folder
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
-            return false;
-        }
-
-        $form_id = get_post_meta( $post_id, '_gform-form-id', true );
-
-        /**
-         * Filter the media upload location.
-         *
-         * @param array $upload_dir The current upload directory’s path and url.
-         * @param int $form_id The ID of the form currently being processed.
-         * @param int $post_id The ID of the post created from the entry currently being processed.
-         */
-        $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
-
-        if ( ! file_exists( $upload_dir['path'] ) ) {
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
-                return false;
-            }
-        }
-
-        $name     = basename( $url );
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
-
-        // the destination path
-        $new_file = $upload_dir['path'] . "/$filename";
-
-        // the source path
-        $y                = substr( $time, 0, 4 );
-        $m                = substr( $time, 5, 2 );
-        $target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
-        $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
-        $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
-        $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
-
-        // copy the file to the destination path
-        if ( ! copy( $path, $new_file ) ) {
-            return false;
-        }
-
-        // Set correct file permissions
-        $stat  = stat( dirname( $new_file ) );
-        $perms = $stat['mode'] & 0000666;
-        @ chmod( $new_file, $perms );
-
-        // Compute the URL
-        $url = $upload_dir['url'] . "/$filename";
-
-        if ( is_multisite() ) {
-            delete_transient( 'dirsize_cache' );
-        }
-
-        $type = wp_check_filetype( $new_file );
-
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
-
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
-     *
-     * Note: The method became public in GF 1.9.17.7
-     *
-     * @see GFFormsModel::media_handle_upload
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
-     * 
-     * @uses copy_post_image
-     * @uses wp_insert_attachment
-     * @uses wp_update_attachment_metadata
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
-     */
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::media_handle_upload( $url, $post_id, $post_data );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        //WordPress Administration API required for the media_handle_upload() function
-        require_once( ABSPATH . 'wp-admin/includes/image.php' );
-
-        $name = basename( $url );
-
-        $file = self::copy_post_image( $url, $post_id );
-
-        if ( ! $file ) {
-            return false;
-        }
-
-        $name_parts = pathinfo( $name );
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
-
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
-        $title   = $name;
-        $content = '';
-
-        // use image exif/iptc data for title and caption defaults if possible
-        if ( $image_meta = @wp_read_image_metadata( $file ) ) {
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-                $title = $image_meta['title'];
-            }
-            if ( trim( $image_meta['caption'] ) ) {
-                $content = $image_meta['caption'];
-            }
-        }
-
-        // Construct the attachment array
-        $attachment = array_merge(
-            array(
-                'post_mime_type' => $type,
-                'guid'           => $url,
-                'post_parent'    => $post_id,
-                'post_title'     => $title,
-                'post_content'   => $content,
-            ), $post_data
-        );
-
-        // Save the data
-        $id = wp_insert_attachment( $attachment, $file, $post_id );
-        if ( ! is_wp_error( $id ) ) {
-            wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-        }
-
-        return $id;
-    }
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
+	 *
+	 * @since 1.16.2
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
+	 */
+	public static function copy_post_image( $url, $post_id ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::copy_post_image( $url, $post_id );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		$time = current_time( 'mysql' );
+
+		if ( $post = get_post( $post_id ) ) {
+			if ( substr( $post->post_date, 0, 4 ) > 0 ) {
+				$time = $post->post_date;
+			}
+		}
+
+		//making sure there is a valid upload folder
+		if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
+			return false;
+		}
+
+		$form_id = get_post_meta( $post_id, '_gform-form-id', true );
+
+		/**
+		 * Filter the media upload location.
+		 *
+		 * @param array $upload_dir The current upload directory’s path and url.
+		 * @param int $form_id The ID of the form currently being processed.
+		 * @param int $post_id The ID of the post created from the entry currently being processed.
+		 */
+		$upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
+
+		if ( ! file_exists( $upload_dir['path'] ) ) {
+			if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
+				return false;
+			}
+		}
+
+		$name     = basename( $url );
+		$filename = wp_unique_filename( $upload_dir['path'], $name );
+
+		// the destination path
+		$new_file = $upload_dir['path'] . "/$filename";
+
+		// the source path
+		$y                = substr( $time, 0, 4 );
+		$m                = substr( $time, 5, 2 );
+		$target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
+		$target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
+		$upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
+		$upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
+		$path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
+
+		// copy the file to the destination path
+		if ( ! copy( $path, $new_file ) ) {
+			return false;
+		}
+
+		// Set correct file permissions
+		$stat  = stat( dirname( $new_file ) );
+		$perms = $stat['mode'] & 0000666;
+		@ chmod( $new_file, $perms );
+
+		// Compute the URL
+		$url = $upload_dir['url'] . "/$filename";
+
+		if ( is_multisite() ) {
+			delete_transient( 'dirsize_cache' );
+		}
+
+		$type = wp_check_filetype( $new_file );
+
+		return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
+
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
+	 *
+	 * Note: The method became public in GF 1.9.17.7
+	 *
+	 * @see GFFormsModel::media_handle_upload
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
+	 * 
+	 * @uses copy_post_image
+	 * @uses wp_insert_attachment
+	 * @uses wp_update_attachment_metadata
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
+	 */
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::media_handle_upload( $url, $post_id, $post_data );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		//WordPress Administration API required for the media_handle_upload() function
+		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+
+		$name = basename( $url );
+
+		$file = self::copy_post_image( $url, $post_id );
+
+		if ( ! $file ) {
+			return false;
+		}
+
+		$name_parts = pathinfo( $name );
+		$name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
+
+		$url     = $file['url'];
+		$type    = $file['type'];
+		$file    = $file['file'];
+		$title   = $name;
+		$content = '';
+
+		// use image exif/iptc data for title and caption defaults if possible
+		if ( $image_meta = @wp_read_image_metadata( $file ) ) {
+			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+				$title = $image_meta['title'];
+			}
+			if ( trim( $image_meta['caption'] ) ) {
+				$content = $image_meta['caption'];
+			}
+		}
+
+		// Construct the attachment array
+		$attachment = array_merge(
+			array(
+				'post_mime_type' => $type,
+				'guid'           => $url,
+				'post_parent'    => $post_id,
+				'post_title'     => $title,
+				'post_content'   => $content,
+			), $post_data
+		);
+
+		// Save the data
+		$id = wp_insert_attachment( $attachment, $file, $post_id );
+		if ( ! is_wp_error( $id ) ) {
+			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+		}
+
+		return $id;
+	}
 
 
 }
\ No newline at end of file