insideout10 / wordlift-plugin

src/modules/core/wordlift_core_install.php

Indentation +132 added lines, -132 removed lines

@@ -11,95 +11,95 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	// Ensure the custom type and the taxonomy are registered.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-
-	wl_entity_type_taxonomy_register();
-
-	// Ensure the custom taxonomy for dbpedia topics is registered
-	Wordlift_Topic_Taxonomy_Service::get_instance()->init();
-
-	// Set the taxonomy data.
-	// Note: parent types must be defined before child types.
-	$terms = array(
-		'thing'         => array(
-			'label'       => 'Thing',
-			'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-		),
-		'creative-work' => array(
-			'label'       => 'CreativeWork',
-			'description' => 'A creative work (or a Music Album).',
-		),
-		'event'         => array(
-			'label'       => 'Event',
-			'description' => 'An event.',
-		),
-		'organization'  => array(
-			'label'       => 'Organization',
-			'description' => 'An organization, including a government or a newspaper.',
-		),
-		'person'        => array(
-			'label'       => 'Person',
-			'description' => 'A person (or a music artist).',
-		),
-		'place'         => array(
-			'label'       => 'Place',
-			'description' => 'A place.',
-		),
-		'localbusiness' => array(
-			'label'       => 'LocalBusiness',
-			'description' => 'A local business.',
-		),
-	);
-
-	foreach ( $terms as $slug => $term ) {
-
-		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
-			continue;
-		}
-
-		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
-			$term['parents'] = array();
-		}
-
-		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
-		}
-
-		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
-			// No parent
-			$parent_id = 0;
-		} else {
-			// Get first parent
-			$parent_id = $parent_ids[0];
-		}
-
-		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'name'        => $term['label'],
-			'slug'        => $slug,
-			'description' => $term['description'],
-			// We give to WP taxonomy just one parent. TODO: see if can give more than one
-			'parent'      => $parent_id,
-		) );
-
-	}
+    // Ensure the custom type and the taxonomy are registered.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+
+    wl_entity_type_taxonomy_register();
+
+    // Ensure the custom taxonomy for dbpedia topics is registered
+    Wordlift_Topic_Taxonomy_Service::get_instance()->init();
+
+    // Set the taxonomy data.
+    // Note: parent types must be defined before child types.
+    $terms = array(
+        'thing'         => array(
+            'label'       => 'Thing',
+            'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+        ),
+        'creative-work' => array(
+            'label'       => 'CreativeWork',
+            'description' => 'A creative work (or a Music Album).',
+        ),
+        'event'         => array(
+            'label'       => 'Event',
+            'description' => 'An event.',
+        ),
+        'organization'  => array(
+            'label'       => 'Organization',
+            'description' => 'An organization, including a government or a newspaper.',
+        ),
+        'person'        => array(
+            'label'       => 'Person',
+            'description' => 'A person (or a music artist).',
+        ),
+        'place'         => array(
+            'label'       => 'Place',
+            'description' => 'A place.',
+        ),
+        'localbusiness' => array(
+            'label'       => 'LocalBusiness',
+            'description' => 'A local business.',
+        ),
+    );
+
+    foreach ( $terms as $slug => $term ) {
+
+        // Create the term if it does not exist, then get its ID
+        $term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( 0 == $term_id || is_null( $term_id ) ) {
+            $result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            $term_id = $term_id['term_id'];
+            $result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $result ) ) {
+            wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+            continue;
+        }
+
+        // Check if 'parent' corresponds to an actual term and get its ID.
+        if ( ! isset( $term['parents'] ) ) {
+            $term['parents'] = array();
+        }
+
+        $parent_ids = array();
+        foreach ( $term['parents'] as $parent_slug ) {
+            $parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+        }
+
+        // Define a parent in the WP taxonomy style (not important for WL)
+        if ( empty( $parent_ids ) ) {
+            // No parent
+            $parent_id = 0;
+        } else {
+            // Get first parent
+            $parent_id = $parent_ids[0];
+        }
+
+        // Update term with description, slug and parent
+        wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'name'        => $term['label'],
+            'slug'        => $slug,
+            'description' => $term['description'],
+            // We give to WP taxonomy just one parent. TODO: see if can give more than one
+            'parent'      => $parent_id,
+        ) );
+
+    }
 
 }
 
@@ -108,16 +108,16 @@ 
  */
 function wl_core_install_create_relation_instance_table() {
 
-	global $wpdb;
-	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+    global $wpdb;
+    // global $wl_db_version;
+    $installed_version = get_option( 'wl_db_version' );
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$charset_collate = $wpdb->get_charset_collate();
+    if ( WL_DB_VERSION != $installed_version ) {
+        $table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Sql statement for the relation instances custom table
-		$sql = <<<EOF
+        // Sql statement for the relation instances custom table
+        $sql = <<<EOF
 			CREATE TABLE $table_name (
   				id int(11) NOT NULL AUTO_INCREMENT,
   				subject_id int(11) NOT NULL,
@@ -129,14 +129,14 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
 
-		wl_write_log( $results );
+        wl_write_log( $results );
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
-	}
+        update_option( 'wl_db_version', WL_DB_VERSION );
+    }
 }
 
 /**
@@ -147,9 +147,9 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_site_option( 'wl_db_version' ) ) {
-		wl_core_install_create_relation_instance_table();
-	}
+    if ( ! get_site_option( 'wl_db_version' ) ) {
+        wl_core_install_create_relation_instance_table();
+    }
 
 }
 
@@ -162,44 +162,44 @@ 
  */
 function wl_core_upgrade_db_1_0_to_3_10() {
 
-	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_site_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+    // If the DB version is less than 3.10, than flatten the txonomy.
+    if ( version_compare( get_site_option( 'wl_db_version' ), '3.9', '<=' ) ) {
 
-		$term_slugs = array(
-			'thing',
-			'creative-work',
-			'event',
-			'organization',
-			'person',
-			'place',
-			'localbusiness',
-		);
+        $term_slugs = array(
+            'thing',
+            'creative-work',
+            'event',
+            'organization',
+            'person',
+            'place',
+            'localbusiness',
+        );
 
-		foreach ( $term_slugs as $slug ) {
+        foreach ( $term_slugs as $slug ) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
 
-			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-					'parent' => 0,
-				) );
-			}
-		}
-	}
+            // Set the term's parent to 0.
+            if ( $term ) {
+                wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+                    'parent' => 0,
+                ) );
+            }
+        }
+    }
 
 }
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
 
-	if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+    if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
 
-		wl_core_upgrade_db_to_1_0();
-		wl_core_upgrade_db_1_0_to_3_10();
-		update_site_option( 'wl_db_version', WL_DB_VERSION );
+        wl_core_upgrade_db_to_1_0();
+        wl_core_upgrade_db_1_0_to_3_10();
+        update_site_option( 'wl_db_version', WL_DB_VERSION );
 
-	}
+    }
 
 }
 

Spacing +31 added lines, -31 removed lines

@@ -52,37 +52,37 @@ 
 		),
 	);
 
-	foreach ( $terms as $slug => $term ) {
+	foreach ($terms as $slug => $term) {
 
 		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		$term_id = term_exists($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		if (0 == $term_id || is_null($term_id)) {
+			$result = wp_insert_term($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 		} else {
 			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+			$result  = get_term($term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A);
 		}
 
 		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+		if (is_wp_error($result)) {
+			wl_write_log('wl_install_entity_type_data [ '.$result->get_error_message().' ]');
 			continue;
 		}
 
 		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
+		if ( ! isset($term['parents'])) {
 			$term['parents'] = array();
 		}
 
 		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+		foreach ($term['parents'] as $parent_slug) {
+			$parent_id    = get_term_by('slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
+			$parent_ids[] = intval($parent_id->term_id); // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
 		}
 
 		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
+		if (empty($parent_ids)) {
 			// No parent
 			$parent_id = 0;
 		} else {
@@ -91,13 +91,13 @@ 
 		}
 
 		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+		wp_update_term($result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 			'name'        => $term['label'],
 			'slug'        => $slug,
 			'description' => $term['description'],
 			// We give to WP taxonomy just one parent. TODO: see if can give more than one
 			'parent'      => $parent_id,
-		) );
+		));
 
 	}
 
@@ -110,10 +110,10 @@ 
 
 	global $wpdb;
 	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+	$installed_version = get_option('wl_db_version');
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+	if (WL_DB_VERSION != $installed_version) {
+		$table_name      = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 		$charset_collate = $wpdb->get_charset_collate();
 
 		// Sql statement for the relation instances custom table
@@ -130,12 +130,12 @@ 
 EOF;
 
 		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+		$results = dbDelta($sql);
 
-		wl_write_log( $results );
+		wl_write_log($results);
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
+		update_option('wl_db_version', WL_DB_VERSION);
 	}
 }
 
@@ -147,7 +147,7 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_site_option( 'wl_db_version' ) ) {
+	if ( ! get_site_option('wl_db_version')) {
 		wl_core_install_create_relation_instance_table();
 	}
 
@@ -163,7 +163,7 @@ 
 function wl_core_upgrade_db_1_0_to_3_10() {
 
 	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_site_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+	if (version_compare(get_site_option('wl_db_version'), '3.9', '<=')) {
 
 		$term_slugs = array(
 			'thing',
@@ -175,15 +175,15 @@ 
 			'localbusiness',
 		);
 
-		foreach ( $term_slugs as $slug ) {
+		foreach ($term_slugs as $slug) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+			$term = get_term_by('slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+			if ($term) {
+				wp_update_term($term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 					'parent' => 0,
-				) );
+				));
 			}
 		}
 	}
@@ -193,14 +193,14 @@ 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
 
-	if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+	if (get_site_option('wl_db_version') != WL_DB_VERSION) {
 
 		wl_core_upgrade_db_to_1_0();
 		wl_core_upgrade_db_1_0_to_3_10();
-		update_site_option( 'wl_db_version', WL_DB_VERSION );
+		update_site_option('wl_db_version', WL_DB_VERSION);
 
 	}
 
 }
 
-add_action( 'init', 'wl_core_update_db_check', 11 ); // need taxonomies and post type to be defined first
+add_action('init', 'wl_core_update_db_check', 11); // need taxonomies and post type to be defined first

src/includes/class-wordlift-activator.php

Indentation +28 added lines, -28 removed lines

@@ -22,33 +22,33 @@
  */
 class Wordlift_Activator {
 
-	/**
-	 * Short Description. (use period)
-	 *
-	 * Long Description.
-	 *
-	 * @since    1.0.0
-	 */
-	public static function activate() {
-
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-		// Create a blank application key if there is none
-		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
-		}
-
-		wl_core_install_entity_type_data();
-		wl_core_install_create_relation_instance_table();
-		flush_rewrite_rules();
-
-		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
-		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
-		}
-
-	}
+    /**
+     * Short Description. (use period)
+     *
+     * Long Description.
+     *
+     * @since    1.0.0
+     */
+    public static function activate() {
+
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+        // Create a blank application key if there is none
+        $key = $configuration_service->get_key();
+        if ( empty( $key ) ) {
+            $configuration_service->set_key( '' );
+        }
+
+        wl_core_install_entity_type_data();
+        wl_core_install_create_relation_instance_table();
+        flush_rewrite_rules();
+
+        // If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
+        // for granted that we're in a browser admin session.
+        if ( '' === $configuration_service->get_key() ) {
+            set_transient( '_wl_activation_redirect', true, 30 );
+        }
+
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -35,8 +35,8 @@ 
 
 		// Create a blank application key if there is none
 		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
+		if (empty($key)) {
+			$configuration_service->set_key('');
 		}
 
 		wl_core_install_entity_type_data();
@@ -45,8 +45,8 @@ 
 
 		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
 		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
+		if ('' === $configuration_service->get_key()) {
+			set_transient('_wl_activation_redirect', true, 30);
 		}
 
 	}