eventespresso / event-espresso-core

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_question_groups.dmsstage.php

Spacing +25 added lines, -25 removed lines

@@ -38,7 +38,7 @@ 
 		);
  * 
  */
-class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	/**
@@ -49,19 +49,19 @@ 
 	 * @var boolean
 	 */
 	private $_already_got_system_question_group_1 = false;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $question_group){
+		foreach ($rows as $question_group) {
 			$new_id = $this->_insert_new_question_group($question_group);
 
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -85,24 +85,24 @@ 
 	 * @param array $old_question_group
 	 * @return int
 	 */
-	private function _insert_new_question_group($old_question_group){
+	private function _insert_new_question_group($old_question_group) {
 		global $wpdb;
 		//try to guess what the QST_system int should be... finding the Personal info system
 		//question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
 		//could be easily removed.
-		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		}elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== FALSE) {
 			$guess_at_system_number = 2;
-		}else{
+		} else {
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
 		//we'd like to keep track of who made it
-		if(intval($old_question_group['wp_user'])!=1){
-			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
+		if (intval($old_question_group['wp_user']) != 1) {
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else {
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(
@@ -116,17 +116,17 @@ 
 			'QSG_deleted'=>false
 		);
 		$datatypes = array(
-			'%s',//QSG_name
-			'%s',//QSG_identifier
-			'%s',//QSG_desc
-			'%d',//QSG_order
-			'%d',//QSG_show_group_name
-			'%d',//QSG_show_group_desc
-			'%d',//QSG_system
-			'%d',//QSG_deleted
+			'%s', //QSG_name
+			'%s', //QSG_identifier
+			'%s', //QSG_desc
+			'%d', //QSG_order
+			'%d', //QSG_show_group_name
+			'%d', //QSG_show_group_desc
+			'%d', //QSG_system
+			'%d', //QSG_deleted
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -138,12 +138,12 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _already_got_system_question_group_1(){
-		if( ! $this->_already_got_system_question_group_1 ){
+	private function _already_got_system_question_group_1() {
+		if ( ! $this->_already_got_system_question_group_1) {
 			//check the db
 			global $wpdb;
 			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-			if(intval($exists)>0){
+			if (intval($exists) > 0) {
 				$this->_already_got_system_question_group_1 = true;
 			}
 		}		

Braces +3 added lines, -3 removed lines

@@ -92,9 +92,9 @@ 
 		//could be easily removed.
 		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
 			$guess_at_system_number = 1;
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
+		} elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
 			$guess_at_system_number = 2;
-		}else{
+		} else{
 			$guess_at_system_number = 0;
 		}
 		//if the question group wasn't made by the normal admin, 
@@ -102,7 +102,7 @@ 
 		if(intval($old_question_group['wp_user'])!=1){
 			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
-		}else{
+		} else{
 			$identifier = $old_question_group['group_identifier'];
 		}
 		$cols_n_values = array(

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_shortcodes.dmsstage.php

Indentation +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 /**
  * Goes through all the posts and pages, and converts old shortcodes to new ones
-	
-*/
+ */
 
 class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{	
 	function __construct() {

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
 	
 */
 
-class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{	
+class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage {	
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Shortcodes", "event_espresso");
@@ -15,13 +15,13 @@ 
 	protected function _migrate_old_row($old_row) {
 		$new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
 		global $wpdb;
-		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d",$new_post_content,$old_row['ID']));
+		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d", $new_post_content, $old_row['ID']));
 		$slug = $old_row['post_name'];
 		$matches = array();
-		$success = preg_match_all('(ESPRESSO_[^ \]]*)',$new_post_content,$matches);;
-		if($success){
+		$success = preg_match_all('(ESPRESSO_[^ \]]*)', $new_post_content, $matches); ;
+		if ($success) {
 			$shortcodes = $matches[0];
-			foreach($shortcodes as $shortcode){
+			foreach ($shortcodes as $shortcode) {
 				EE_Config::instance()->core->post_shortcodes[$slug][$shortcode] = $old_row['ID'];
 				EE_Config::instance()->core->post_shortcodes['posts'][$shortcode] = $old_row['ID'];
 			}
@@ -41,20 +41,20 @@ 
 	 * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
 	 * @param string $old_content
 	 */
-	private function _change_event_list_shortcode($old_content){
-		return str_replace("[EVENT_LIST","[ESPRESSO_EVENTS",$old_content);
+	private function _change_event_list_shortcode($old_content) {
+		return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
 	}
 	
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -65,7 +65,7 @@ 
 		return $count;
 	}
 	
-	private function _sql_to_only_select_non_drafts(){
+	private function _sql_to_only_select_non_drafts() {
 		return " WHERE post_type NOT IN ('revision','auto-draft') ";
 	}
 	

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_datetime_fields.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * The name is set to just be a string representation of the start date (in UTC time for now), and the description is just left blank
 */
 
-class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table {
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Datetime Fields", "event_espresso");
@@ -25,14 +25,14 @@ 
 				array(
 					'DTT_ID'=>$old_row['DTT_ID']),
 				array(
-					'%s',//DTT_name,
-					'%s',//DTT_description
+					'%s', //DTT_name,
+					'%s', //DTT_description
 					),
 				array(
-					'%d',//DTT_ID
+					'%d', //DTT_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'),$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'), $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_question_group_questions.dmsstage.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  * Populates the QGQ_order (introduced in this version, 4.2.0) from the QST_order
 */
 
-class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table {
 	private $_qgq_table;
 	function __construct() {
 		global $wpdb;
@@ -20,12 +20,12 @@ 
 		$updated = $wpdb->update($this->_qgq_table,
 				array('QGQ_order'=>$old_row['QST_order']),
 				array('QST_ID'=>$old_row['QST_ID']),
-				array('%d',//QGQ_order
+				array('%d', //QGQ_order
 					),
-				array('%d',//QST_ID
+				array('%d', //QST_ID
 					));
-		if( FALSE === $updated ){
-			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'),$old_row['QST_order'],$old_row['QST_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'), $old_row['QST_order'], $old_row['QST_ID']));
 		}
 		//nothing to map really
 	}	

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_invoice_settings.dmsstage.php

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
 		if( ! $invoice_settings ){
 			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
+		} else{
 			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
 			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
 			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];

Spacing +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -56,39 +56,39 @@ 
 	 * @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()->gateway instanceof EE_Gateway_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
-		if( ! $invoice_settings ){
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
-			$invoice_settings[ 'template_invoice_email' ] = '';
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
-			unset( $invoice_settings[ 'pdf_instructions' ] );
-			unset( $invoice_settings[ 'payable_to' ] );
-			unset( $invoice_settings[ 'payment_address' ] );
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
-			EE_Config::instance()->update_espresso_config(false,false);
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
+		if ( ! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
-				EE_Error::add_persistent_admin_notice( 'invoice_css_not_updated', sprintf( __( 'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings[ 'invoice_css' ] ), FALSE );
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
+				EE_Error::add_persistent_admin_notice('invoice_css_not_updated', sprintf(__('You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings['invoice_css']), FALSE);
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
-				EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 			}
 
 		}

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']));
 		}
 	}
 }