eventespresso / event-espresso-core

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_critical_page_shortcode_tracking.dmsstage.php

Spacing +29 added lines, -29 removed lines

@@ -32,7 +32,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Critical Page Shortcode Tracking', 'event_espresso' );
+		$this->_pretty_name = __('Update Critical Page Shortcode Tracking', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -59,24 +59,24 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->core instanceof EE_Core_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->core instanceof EE_Core_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
 		// name of the WP Posts Page
 		$posts_page = $this->_get_page_for_posts();
 		// make sure critical pages get removed
-        $this->_update_post_shortcodes( $posts_page );
+        $this->_update_post_shortcodes($posts_page);
         // save updated config, but don't add errors
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
-			EE_Error::add_error( __( 'The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+			EE_Error::add_error(__('The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check for errors
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		// any errors to report?
-		if( isset( $notices['errors'] )) {
-          foreach($notices as $value){
+		if (isset($notices['errors'])) {
+          foreach ($notices as $value) {
 			  $this->add_error($value);
 		  }
         }
@@ -97,13 +97,13 @@ 
      *  @return 	string
      */
     private function _get_page_for_posts() {
-        $page_for_posts = get_option( 'page_for_posts' );
-        if ( ! $page_for_posts ) {
+        $page_for_posts = get_option('page_for_posts');
+        if ( ! $page_for_posts) {
             return 'posts';
         }
         global $wpdb;
-        $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-        return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+        $SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+        return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
     }
 
 
@@ -115,45 +115,45 @@ 
      * @param $page_for_posts
      * @return    void
      */
-    private function _update_post_shortcodes( $page_for_posts = '' ) {
+    private function _update_post_shortcodes($page_for_posts = '') {
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
         // verify that post_shortcodes is set
-        EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
+        EE_Config::instance()->core->post_shortcodes = isset(EE_Config::instance()->core->post_shortcodes) && is_array(EE_Config::instance()->core->post_shortcodes) ? EE_Config::instance()->core->post_shortcodes : array();
         //  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
-        $post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
+        $post_pages_to_check = $page_for_posts == 'posts' ? array($page_for_posts) : array('posts', $page_for_posts);
         // cycle thru post_shortcodes
-        foreach( $post_pages_to_check as $post_page ){
+        foreach ($post_pages_to_check as $post_page) {
             // cycle thru post_shortcodes
-            foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
+            foreach (EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
                 // are there any shortcodes to track ?
-                if ( ! empty( $shortcodes )) {
+                if ( ! empty($shortcodes)) {
                     // loop thru list of tracked shortcodes
-                    foreach( $shortcodes as $shortcode => $post_id ) {
+                    foreach ($shortcodes as $shortcode => $post_id) {
                         // if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-                        if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
+                        if (isset($critical_shortcodes[$post_id]) && $post_name == $post_page) {
                             // then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-                            unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
+                            unset(EE_Config::instance()->core->post_shortcodes[$post_name][$shortcode]);
                         }
                         // skip the posts page, because we want all shortcodes registered for it
-                        if ( $post_name == $post_page ) {
+                        if ($post_name == $post_page) {
                             continue;
                         }
                         // make sure post still exists
-                        $post = get_post( $post_id );
-                        if ( $post ) {
+                        $post = get_post($post_id);
+                        if ($post) {
                             // check that the post name matches what we have saved
-                            if ( $post->post_name == $post_name ) {
+                            if ($post->post_name == $post_name) {
                                 // if so, then break before hitting the unset below
                                 continue;
                             }
                         }
                         // we don't like missing posts around here >:(
-                        unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                        unset(EE_Config::instance()->core->post_shortcodes[$post_name]);
                     }
                 } else {
                     // you got no shortcodes to keep track of !
-                    unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                    unset(EE_Config::instance()->core->post_shortcodes[$post_name]);
                 }
             }
         }

Indentation +75 added lines, -75 removed lines

@@ -67,8 +67,8 @@ 
 		// name of the WP Posts Page
 		$posts_page = $this->_get_page_for_posts();
 		// make sure critical pages get removed
-        $this->_update_post_shortcodes( $posts_page );
-        // save updated config, but don't add errors
+		$this->_update_post_shortcodes( $posts_page );
+		// save updated config, but don't add errors
 		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
 			EE_Error::add_error( __( 'The Event Espresso Configuration Settings were not updated when attempting to save the "critical page post shortcodes".', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 		}
@@ -76,87 +76,87 @@ 
 		$notices = EE_Error::get_notices( FALSE );
 		// any errors to report?
 		if( isset( $notices['errors'] )) {
-          foreach($notices as $value){
+		  foreach($notices as $value){
 			  $this->add_error($value);
 		  }
-        }
+		}
 		//regardless of whether it worked or not, we ought to continue the migration
 		$this->set_completed();
-            return 1;
+			return 1;
 	}
 
 
 
-    /**
-     * 	_get_page_for_posts
-     *
-     * 	if the wp-option "show_on_front" is set to "page", then this is the post_name for the post set in the wp-option "page_for_posts", or "posts" if no page is selected
-     *
-     *
-     *  @access 	private
-     *  @return 	string
-     */
-    private function _get_page_for_posts() {
-        $page_for_posts = get_option( 'page_for_posts' );
-        if ( ! $page_for_posts ) {
-            return 'posts';
-        }
-        global $wpdb;
-        $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-        return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
-    }
-
-
-
-    /**
-     *    _update_post_shortcodes
-     *
-     * @access    private
-     * @param $page_for_posts
-     * @return    void
-     */
-    private function _update_post_shortcodes( $page_for_posts = '' ) {
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        // verify that post_shortcodes is set
-        EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
-        //  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
-        $post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
-        // cycle thru post_shortcodes
-        foreach( $post_pages_to_check as $post_page ){
-            // cycle thru post_shortcodes
-            foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
-                // are there any shortcodes to track ?
-                if ( ! empty( $shortcodes )) {
-                    // loop thru list of tracked shortcodes
-                    foreach( $shortcodes as $shortcode => $post_id ) {
-                        // if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-                        if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
-                            // then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-                            unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
-                        }
-                        // skip the posts page, because we want all shortcodes registered for it
-                        if ( $post_name == $post_page ) {
-                            continue;
-                        }
-                        // make sure post still exists
-                        $post = get_post( $post_id );
-                        if ( $post ) {
-                            // check that the post name matches what we have saved
-                            if ( $post->post_name == $post_name ) {
-                                // if so, then break before hitting the unset below
-                                continue;
-                            }
-                        }
-                        // we don't like missing posts around here >:(
-                        unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                    }
-                } else {
-                    // you got no shortcodes to keep track of !
-                    unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                }
-            }
-        }
+	/**
+	 * 	_get_page_for_posts
+	 *
+	 * 	if the wp-option "show_on_front" is set to "page", then this is the post_name for the post set in the wp-option "page_for_posts", or "posts" if no page is selected
+	 *
+	 *
+	 *  @access 	private
+	 *  @return 	string
+	 */
+	private function _get_page_for_posts() {
+		$page_for_posts = get_option( 'page_for_posts' );
+		if ( ! $page_for_posts ) {
+			return 'posts';
+		}
+		global $wpdb;
+		$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+	}
+
+
+
+	/**
+	 *    _update_post_shortcodes
+	 *
+	 * @access    private
+	 * @param $page_for_posts
+	 * @return    void
+	 */
+	private function _update_post_shortcodes( $page_for_posts = '' ) {
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = EE_Config::instance()->core->get_critical_pages_shortcodes_array();
+		// verify that post_shortcodes is set
+		EE_Config::instance()->core->post_shortcodes = isset( EE_Config::instance()->core->post_shortcodes ) && is_array( EE_Config::instance()->core->post_shortcodes ) ? EE_Config::instance()->core->post_shortcodes : array();
+		//  just in case the site has ever had posts on frontpage at some time, then we should check for a "Posts Page" named "posts"
+		$post_pages_to_check = $page_for_posts == 'posts' ? array( $page_for_posts ) : array( 'posts', $page_for_posts );
+		// cycle thru post_shortcodes
+		foreach( $post_pages_to_check as $post_page ){
+			// cycle thru post_shortcodes
+			foreach( EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ){
+				// are there any shortcodes to track ?
+				if ( ! empty( $shortcodes )) {
+					// loop thru list of tracked shortcodes
+					foreach( $shortcodes as $shortcode => $post_id ) {
+						// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
+						if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $post_page ) {
+							// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
+							unset( EE_Config::instance()->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						}
+						// skip the posts page, because we want all shortcodes registered for it
+						if ( $post_name == $post_page ) {
+							continue;
+						}
+						// make sure post still exists
+						$post = get_post( $post_id );
+						if ( $post ) {
+							// check that the post name matches what we have saved
+							if ( $post->post_name == $post_name ) {
+								// if so, then break before hitting the unset below
+								continue;
+							}
+						}
+						// we don't like missing posts around here >:(
+						unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+					}
+				} else {
+					// you got no shortcodes to keep track of !
+					unset( EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+				}
+			}
+		}
    }
 
 

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_event_message_templates.dmsstage.php

Indentation +15 added lines, -15 removed lines

@@ -41,19 +41,19 @@ 
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
  		global $wpdb;
  		if ( $old_row['EVT_ID'] > 0 ) {
-                                    //let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
+									//let's get the EVT for this id so we can update the custom name on the old row.
+									$event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
 
-                                    //update name
-                                    $updated = $wpdb->update(
-                                        $this->_old_table,
-                                        array(
-                                            'MTP_name' =>$event_name
-                                            ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
-                                        );
+									//update name
+									$updated = $wpdb->update(
+										$this->_old_table,
+										array(
+											'MTP_name' =>$event_name
+											),
+										array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
+										array( '%s' ),
+										array( '%d' )
+										);
 
  			$inserted = $wpdb->insert(
  				$this->_emt_table,
@@ -64,9 +64,9 @@ 
  				array( '%d', '%d' )
  				);
 
-                                    if ( FALSE === $updated ) {
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
-                                    }
+									if ( FALSE === $updated ) {
+										$this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
+									}
 
  			if ( FALSE === $inserted ) {
  				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );

Spacing +11 added lines, -11 removed lines

@@ -37,12 +37,12 @@ 
 
 
 
- 	protected function _migrate_old_row( $old_row ) {
+ 	protected function _migrate_old_row($old_row) {
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
  		global $wpdb;
- 		if ( $old_row['EVT_ID'] > 0 ) {
+ 		if ($old_row['EVT_ID'] > 0) {
                                     //let's get the EVT for this id so we can update the custom name on the old row.
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
+                                    $event_name = 'Custom Template for '.$wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
 
                                     //update name
                                     $updated = $wpdb->update(
@@ -50,9 +50,9 @@ 
                                         array(
                                             'MTP_name' =>$event_name
                                             ),
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
-                                        array( '%s' ),
-                                        array( '%d' )
+                                        array('GRP_ID' => (int) $old_row['GRP_ID']),
+                                        array('%s'),
+                                        array('%d')
                                         );
 
  			$inserted = $wpdb->insert(
@@ -61,15 +61,15 @@ 
  					'EVT_ID' => (int) $old_row['EVT_ID'],
  					'GRP_ID' => (int) $old_row['GRP_ID'],
  					),
- 				array( '%d', '%d' )
+ 				array('%d', '%d')
  				);
 
-                                    if ( FALSE === $updated ) {
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
+                                    if (FALSE === $updated) {
+                                        $this->add_error(sprintf(__("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name));
                                     }
 
- 			if ( FALSE === $inserted ) {
- 				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );
+ 			if (FALSE === $inserted) {
+ 				$this->add_error(sprintf(__("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID']));
  			}
  		}
  	}

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage 	migrations
  * @since 			4.3
  */
- if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+ if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+ 	exit('No direct script access allowed');
+ }
 
 
 /**

core/data_migration_scripts/4_3_0_stages/EE_DMS_4_3_0_question_option_order.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('QSO_order'=>$old_row['QSO_ID']),
 				array('QSO_ID'=>$old_row['QSO_ID']),
-				array('%d',//QSO_order
+				array('%d', //QSO_order
 					),
-				array('%d',//QSO_ID
+				array('%d', //QSO_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'),$old_row['QSO_ID'],$old_row['QSO_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'), $old_row['QSO_ID'], $old_row['QSO_ID']));
 		}
 	}
 }
\ No newline at end of file

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_price_types.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('PRT_wp_user'=>$user_id),
 				array('PRT_ID'=>$old_row['PRT_ID']),
-				array('%d',//PRT_wp_user
+				array('%d', //PRT_wp_user
 					),
-				array('%d',//PRT_ID
+				array('%d', //PRT_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'),$user_id,$old_row['PRT_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'), $user_id, $old_row['PRT_ID']));
 		}
 	}
 }

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_prices.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('PRC_wp_user'=>$user_id),
 				array('PRC_ID'=>$old_row['PRC_ID']),
-				array('%d',//PRC_wp_user
+				array('%d', //PRC_wp_user
 					),
-				array('%d',//PRC_ID
+				array('%d', //PRC_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRC_wp_user = %d where PRC_ID = %d", 'event_espresso'),$user_id,$old_row['PRC_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRC_wp_user = %d where PRC_ID = %d", 'event_espresso'), $user_id, $old_row['PRC_ID']));
 		}
 	}
 }

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_question_groups.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('QSG_wp_user'=>$user_id),
 				array('QSG_ID'=>$old_row['QSG_ID']),
-				array('%d',//QSG_wp_user
+				array('%d', //QSG_wp_user
 					),
-				array('%d',//QSG_ID
+				array('%d', //QSG_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSG_wp_user = %d where QSG_ID = %d", 'event_espresso'),$user_id,$old_row['QSG_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSG_wp_user = %d where QSG_ID = %d", 'event_espresso'), $user_id, $old_row['QSG_ID']));
 		}
 	}
 }

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_update_wp_user_for_tickets.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('TKT_wp_user'=>$user_id),
 				array('TKT_ID'=>$old_row['TKT_ID']),
-				array('%d',//TKT_wp_user
+				array('%d', //TKT_wp_user
 					),
-				array('%d',//TKT_ID
+				array('%d', //TKT_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting TKT_wp_user = %d where TKT_ID = %d", 'event_espresso'),$user_id,$old_row['TKT_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting TKT_wp_user = %d where TKT_ID = %d", 'event_espresso'), $user_id, $old_row['TKT_ID']));
 		}
 	}
 }

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_billing_info.dmsstage.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,24 +12,24 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
 		$this->_old_table = $wpdb->postmeta;
 		$this->_pretty_name = __('Billing Info', 'event_espresso');
 		$this->_extra_where_sql = "WHERE meta_key LIKE 'billing_info_%'";
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $old_row ) {
+	protected function _migrate_old_row($old_row) {
 		$new_billing_info = array();
-		$old_billing_info = maybe_unserialize( $old_row[ 'meta_value' ] );
-		$gateway_name = str_replace( "billing_info_",'',$old_row[ 'meta_key' ] );
+		$old_billing_info = maybe_unserialize($old_row['meta_value']);
+		$gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
 		$repetitive_prefix = '_reg-page-billing-';
-		$repetitive_suffix = "-" . $gateway_name;
-		foreach( $old_billing_info as $old_input_name => $input_value ){
-			$old_input_name_important_part = str_replace( array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name );
+		$repetitive_suffix = "-".$gateway_name;
+		foreach ($old_billing_info as $old_input_name => $input_value) {
+			$old_input_name_important_part = str_replace(array($repetitive_prefix, $repetitive_suffix), array('', ''), $old_input_name);
 
-			switch( $old_input_name_important_part ){
+			switch ($old_input_name_important_part) {
 				case 'fname':
 					$new_input_name = 'first_name';
 					break;
@@ -39,7 +39,7 @@ 
 				case 'state':
 					//we used to store the state's id ,but now we just store the name
 					$new_input_name = $old_input_name_important_part;
-					$input_value = $this->_get_state_name_by_ID( $input_value );
+					$input_value = $this->_get_state_name_by_ID($input_value);
 					break;
 				case 'card-nmbr':
 					$new_input_name = 'credit_card';
@@ -62,9 +62,9 @@ 
 					$new_input_name = $old_input_name_important_part;
 
 			}
-			$new_billing_info[ $new_input_name ] = $input_value;
+			$new_billing_info[$new_input_name] = $input_value;
 		}
-		update_post_meta( $old_row[ 'post_id' ], $old_row[ 'meta_key' ], $new_billing_info );
+		update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
 	}
 	/**
 	 *
@@ -72,9 +72,9 @@ 
 	 * @param int $id
 	 * @return string
 	 */
-	protected function _get_state_name_by_ID( $id ){
+	protected function _get_state_name_by_ID($id) {
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM ".$wpdb->prefix."esp_state WHERE STA_ID = %d", $id));
 	}
 
 

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_gateways.dmsstage.php

Braces +5 added lines, -5 removed lines

@@ -184,11 +184,11 @@ 
 		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
 		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
+		} elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
+		} elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
 			$scope = array( 'ADMIN' );
-		}else{
+		} else{
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -229,7 +229,7 @@ 
 			if( ! $success ){
 				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,json_encode($payment_method_col_values),$wpdb->last_error));
 			}
-		}else{
+		} else{
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
@@ -237,7 +237,7 @@ 
 			if ( ! $success ) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else{
 				$id = $wpdb->insert_id;
 			}
 		}

Spacing +71 added lines, -71 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * Migrates 4.1-4.5-style gateway settings (which were stores in EE_Config)
  * to 4.6-style payment methods (which have their database table)
  */
-class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage {
 
 	protected $_new_table_name;
 	protected $_extra_meta_table_name;
@@ -73,11 +73,11 @@ 
 	 */
 	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
-		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings,$this->count_records_migrated(),$num_items_to_migrate);
-		foreach($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings){
+		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
 
-			if( in_array( $old_gateway_slug, $this->_gateway_we_know_to_migrate ) ) {
-				if( ! $old_gateway_settings){
+			if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
+				if ( ! $old_gateway_settings) {
 					//no settings existed for this gateway anyways... weird...
 					$items_actually_migrated++;
 					continue;
@@ -86,16 +86,16 @@ 
 				$success = $this->_convert_gateway_settings(
 						$old_gateway_slug,
 						$old_gateway_settings,
-						isset( EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ] ) );
-				if( $success ) {
-					EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+						isset(EE_Config::instance()->gateway->active_gateways[$old_gateway_slug]) );
+				if ($success) {
+					EE_Config::instance()->gateway->payment_settings[$old_gateway_slug] = 'Deprecated';
 				}
 			}
 			$items_actually_migrated++;
 		}
 
-		EE_Config::instance()->update_espresso_config(false,false);
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -108,22 +108,22 @@ 
 	 * @param boolean $active indicates the gateway is currently active
 	 * @return boolean success
 	 */
-	protected function _convert_gateway_settings($old_gateway_slug,$old_gateway_settings,$active){
-		switch($old_gateway_slug){
+	protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active) {
+		switch ($old_gateway_slug) {
 			case 'Aim':
 				$extra_meta_key_values = array(
 					'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
 					'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
 					'test_transactions'=>$old_gateway_settings['test_transactions']
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Bank':
 				$extra_meta_key_values = array(
 					'page_title'=>$old_gateway_settings['page_title'],
 					'payment_instructions'=>
-					sprintf( __('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'] , $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address'] ) );
-				$desc = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+					sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
+				$desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 				break;
 			case 'Check':
 				$extra_meta_key_values = array(
@@ -131,7 +131,7 @@ 
 					'payment_instructions'=>$old_gateway_settings['check_instructions'],
 					'address_to_send_payment'=>$old_gateway_settings['payment_address']
 				);
-				$desc = __( 'On the next page you will be given instructions on how to make a payment by check.', 'event_espresso' );
+				$desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
 				break;
 			case 'Invoice':
 				$extra_meta_key_values = array(
@@ -139,23 +139,23 @@ 
 					'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
 					'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
 					'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
-					'pdf_instructions' => $old_gateway_settings[ 'template_payment_instructions' ],
-					'pdf_logo_image' => $old_gateway_settings[ 'invoice_logo_url' ],
-					'page_confirmation_text' => isset( $old_gateway_settings[ 'page_instructions' ] ) ? $old_gateway_settings[ 'page_instructions' ] : '',
-					'page_extra_info' => isset( $old_gateway_settings[ 'payment_address' ] ) ? $old_gateway_settings[ 'payment_address' ] : '',
+					'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
+					'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
+					'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
+					'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
 					'legacy_invoice_css' => $old_gateway_settings['invoice_css']
 				);
 				//if they didnt want the invoiec gateway to show, pretend it was inactive
-				if( ! $old_gateway_settings['show'] ){
+				if ( ! $old_gateway_settings['show']) {
 					$active = FALSE;
 				}
-				$desc = __( 'On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso' );
+				$desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
 				break;
 			case 'Mijireh':
 				$extra_meta_key_values = array(
-					'access_key' => $old_gateway_settings[ 'access_key' ]
+					'access_key' => $old_gateway_settings['access_key']
 				);
-				$desc =  __( 'On the next page you will be able to enter your billing information to make the payment.', 'event_espresso' );
+				$desc = __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
 				break;
 			case 'Paypal_Pro':
 				$extra_meta_key_values = array(
@@ -164,31 +164,31 @@ 
 					'signature'=>$old_gateway_settings['signature'],
 					'credit_card_types'=>$old_gateway_settings['credit_cards'],
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Paypal_Standard':
 				$extra_meta_key_values = array(
-					'paypal_id' => $old_gateway_settings[ 'paypal_id' ],
-					'image_url' => $old_gateway_settings[ 'image_url' ],
-					'shipping_details' => isset( $old_gateway_settings[ 'no_shipping' ] ) ? $old_gateway_settings[ 'no_shipping' ] : false,
+					'paypal_id' => $old_gateway_settings['paypal_id'],
+					'image_url' => $old_gateway_settings['image_url'],
+					'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
 
 				);
-				$desc = sprintf( __( 'After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso' ), '<strong>','</strong>' );
+				$desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
 				break;
 			default:
 				//if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
 				$extra_meta_key_values = $old_gateway_settings;
 				$desc = '';
 		}
-		$pretty_name = isset( $old_gateway_settings[ 'display_name' ] ) ? $old_gateway_settings[ 'display_name' ] : $old_gateway_slug;
-		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
-		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
-			$scope = array( 'ADMIN' );
-		}else{
+		$pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
+		$offline_gateways = array('Bank', 'Check', 'Invoice');
+		if ($active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART', 'ADMIN');
+		}elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART');
+		}elseif ( ! $active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('ADMIN');
+		} else {
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -196,25 +196,25 @@ 
 			'PMD_name' => $pretty_name,
 			'PMD_desc' => $desc,
 			'PMD_admin_name' => $pretty_name,
-			'PMD_slug' => sanitize_key( $old_gateway_slug ),
-			'PMD_debug_mode' => isset( $old_gateway_settings[ 'use_sandbox' ] ) ? $old_gateway_settings['use_sandbox'] : FALSE,
-			'PMD_button_url' => isset( $old_gateway_settings[ 'button_url' ] ) ? $old_gateway_settings[ 'button_url' ] : NULL,
-			'PMD_scope' =>  serialize( $scope )
+			'PMD_slug' => sanitize_key($old_gateway_slug),
+			'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : FALSE,
+			'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : NULL,
+			'PMD_scope' =>  serialize($scope)
 		);
 		$db_types = array(
-			'%s',//PMD_type
-			'%s',//PMD_name
-			'%s',//PMD_desc
-			'%s',//PMD_admin_name
-			'%s',//PMD_slug
-			'%d',//PMD_debug_mode
-			'%s',//PMD_button_url
-			'%s',//PMD_scope
+			'%s', //PMD_type
+			'%s', //PMD_name
+			'%s', //PMD_desc
+			'%s', //PMD_admin_name
+			'%s', //PMD_slug
+			'%d', //PMD_debug_mode
+			'%s', //PMD_button_url
+			'%s', //PMD_scope
 		);
 		global $wpdb;
 		//first: check if it already exists
-		$id = $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values[ 'PMD_slug' ] ) );
-		if( $id ){
+		$id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
+		if ($id) {
 			//just update that payment method instead of creating a new one
 			$success = $wpdb->update(
 					$this->_new_table_name,
@@ -224,27 +224,27 @@ 
 					),
 					$db_types,
 					array(
-						'%d',//PMD_ID
+						'%d', //PMD_ID
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,wp_json_encode($payment_method_col_values),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, wp_json_encode($payment_method_col_values), $wpdb->last_error));
 			}
-		}else{
+		} else {
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
 					$db_types);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else {
 				$id = $wpdb->insert_id;
 			}
 		}
 
-		if( $id ){
-			$this->_convert_extra_meta_values( $id, $extra_meta_key_values );
-			$this->get_migration_script()->set_mapping( 'EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id );
+		if ($id) {
+			$this->_convert_extra_meta_values($id, $extra_meta_key_values);
+			$this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
 			return true;
 		}
 		return false;
@@ -258,26 +258,26 @@ 
 	 * @param int $id
 	 * @param array $extra_meta_key_values
 	 */
-	private function _convert_extra_meta_values($id,$extra_meta_key_values){
+	private function _convert_extra_meta_values($id, $extra_meta_key_values) {
 		global $wpdb;
-		foreach( $extra_meta_key_values as $key => $value ){
+		foreach ($extra_meta_key_values as $key => $value) {
 			$exm_args = array(
 				'OBJ_ID'=>$id,
 				'EXM_type'=>'Payment_Method',
 				'EXM_key'=>$key,
-				'EXM_value'=> maybe_serialize($value )
+				'EXM_value'=> maybe_serialize($value)
 			);
 			$success = $wpdb->insert(
 					$this->_extra_meta_table_name,
 					$exm_args,
 					array(
-						'%d',//OBJ_ID
-						'%s',//EXM_type
-						'%s',//EXM_key
-						'%s',//EXM_value
+						'%d', //OBJ_ID
+						'%s', //EXM_type
+						'%s', //EXM_key
+						'%s', //EXM_value
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"),wp_json_encode($exm_args),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), wp_json_encode($exm_args), $wpdb->last_error));
 			}
 		}
 	}