Changeset 1446896

Timestamp:

06/30/2016 11:37:34 PM (8 years ago)

Author:

gcorne

Message:

Remove more trailing whitespace and executable bit for real

Location:

hubspot-tracking-code/trunk

Files:

• admin/hubspot-tracking-code-admin.php (modified) (12 diffs, 1 prop)
• hubspot-tracking-code.php (modified) (6 diffs)
• readme.txt (modified) (1 prop)

hubspot-tracking-code/trunk/admin/hubspot-tracking-code-admin.php

@@ -1 +1 @@
 <?php
 
-if ( !defined('HUBSPOT_TRACKING_CODE_PLUGIN_VERSION') ) 
+if ( !defined('HUBSPOT_TRACKING_CODE_PLUGIN_VERSION') )
 {
     header('HTTP/1.0 403 Forbidden');
@@ -23 +23 @@
 // HubSpotTrackingCodeAdmin Class
 //=============================================
-class HubSpotTrackingCodeAdmin 
+class HubSpotTrackingCodeAdmin
 {
     /**
@@ -39 +39 @@
         if ( $options['hs_version'] != HUBSPOT_TRACKING_CODE_PLUGIN_VERSION )
             self::hubspot_tracking_code_update_check();
-        
+
         add_action('admin_menu', array(&$this, 'hubspot_add_menu_items'));
         add_action('admin_init', array(&$this, 'hubspot_build_settings_page'));
@@ -52 +52 @@
         hubspot_tracking_code_update_option('hs_settings', 'hs_version', HUBSPOT_TRACKING_CODE_PLUGIN_VERSION);
     }
-    
+
     //=============================================
     // Menus
     //=============================================
 
-    function hubspot_add_menu_items () 
+    function hubspot_add_menu_items ()
     {
         add_submenu_page('options-general.php', 'HubSpot Settings', 'HubSpot Settings', 'edit_posts', basename(__FILE__), array($this, 'hubspot_plugin_options'));
@@ -68 +68 @@
 
     /**
-     * Adds setting link for HubSpot to plugins management page 
+     * Adds setting link for HubSpot to plugins management page
      *
      * @param   array $links
@@ -85 +85 @@
      */
     function hubspot_build_settings_page ()
-    {   
+    {
         global $pagenow;
         $options = get_option('hs_settings');
@@ -94 +94 @@
             array($this, 'sanitize')
         );
-        
+
         add_settings_section(
             'hubspot_settings_section',
@@ -101 +101 @@
             HUBSPOT_TRACKING_CODE_ADMIN_PATH
         );
-        
+
         add_settings_field(
             'hs_portal',
@@ -146 +146 @@
                 <form method="POST" action="options.php">
                     <div id="dashboard-widgets" class="metabox-holder">
-                        <div class="postbox-container" style="width:60%;">  
+                        <div class="postbox-container" style="width:60%;">
                             <div class="meta-box-sortables ui-sortable">
                                 <div class="postbox">
@@ -152 +152 @@
                                     <div class="inside">
                                         Enter your Hub ID below to track your WordPress site in HubSpot's analytics system.
-                                        <?php 
+                                        <?php
                                             settings_fields('hubspot_settings_options');
                                             do_settings_sections(HUBSPOT_TRACKING_CODE_ADMIN_PATH);
                                         ?>
                                     </div>
-                                    
+
                                 </div>
                             </div>
@@ -164 +164 @@
 
                         <div class="postbox-container" style="width:40%;">
-                            <div class="meta-box-sortables ui-sortable">    
+                            <div class="meta-box-sortables ui-sortable">
                                 <div class="postbox">
                                 <h3 class="hndle"><span>Where is my HubSpot Hub ID?</span></h3>
@@ -213 +213 @@
         $options = get_option('hs_settings');
         $hs_portal  = ( isset($options['hs_portal']) && $options['hs_portal'] ? $options['hs_portal'] : '' );
-     
+
         printf(
             '<input id="hs_portal" type="text" id="title" name="hs_settings[hs_portal]" style="width: 400px;" value="%s"/>',

hubspot-tracking-code/trunk/hubspot-tracking-code.php

@@ -10 +10 @@
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly 
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 //=============================================
@@ -47 +47 @@
 {
     // Check activation on entire network or one blog
-    if ( is_multisite() && $network_wide ) 
-    { 
+    if ( is_multisite() && $network_wide )
+    {
         global $wpdb;
- 
+
         // Get this so we can switch back to it later
         $current_blog = $wpdb->blogid;
- 
+
         // Get all blogs in the network and activate plugin on each one
         $q = "SELECT blog_id FROM $wpdb->blogs";
         $blog_ids = $wpdb->get_col($q);
-        foreach ( $blog_ids as $blog_id ) 
+        foreach ( $blog_ids as $blog_id )
         {
             switch_to_blog($blog_id);
             hubspot_tracking_code_setup_plugin();
         }
- 
+
         // Switch back to the current blog
         switch_to_blog($current_blog);
@@ -93 +93 @@
             $multisite_prefix = ( is_multisite() ? $wpdb->prefix : '' );
             $q = $wpdb->prepare("
-                INSERT INTO " . $multisite_prefix . "options 
-                    ( option_name, option_value ) 
+                INSERT INTO " . $multisite_prefix . "options
+                    ( option_name, option_value )
                 VALUES ('hs_settings', %s)", serialize($opt));
             $wpdb->query($q);
@@ -121 +121 @@
 function hubspot_tracking_code_init ()
 {
-    if ( is_plugin_active('hubspot/hubspot.php') ) 
+    if ( is_plugin_active('hubspot/hubspot.php') )
     {
         remove_action( 'plugins_loaded', 'hubspot_tracking_code_init' );
@@ -135 +135 @@
 add_action( 'plugins_loaded', 'hubspot_tracking_code_init', 14 );
 
-if ( is_admin() ) 
+if ( is_admin() )
 {
     // Activate + install Super Simple Landing Pages
@@ -144 +144 @@
 }
 
-function deactivate_hubspot_tracking_code_notice () 
+function deactivate_hubspot_tracking_code_notice ()
 {
     ?>
     <div id="message" class="error">
-        <?php _e( 
-            '<p><h3>HubSpot Tracking Code plugin wasn\'t activated because your HubSpot for WordPress plugin is still activated...</h3></p>' . 
+        <?php _e(
+            '<p><h3>HubSpot Tracking Code plugin wasn\'t activated because your HubSpot for WordPress plugin is still activated...</h3></p>' .
                 '<p>HubSpot Tracking Code and HubSpot for WordPress are like two rival siblings - they don\'t play nice together, but don\'t panic - it\'s an easy fix. Deactivate <b><i>HubSpot for WordPress</i></b> and then try activating <b><i>HubSpot Tracking Code for WordPress</i></b> again, and everything should work fine.</p>' .
             '<p>By the way - make sure you replace all your form and CTA shortcodes with <a href="http://help.hubspot.com/articles/KCS_Article/Integrations/How-to-switch-from-the-HubSpot-for-Wordpress-plugin-to-the-HubSpot-Tracking-code-for-Wordpress-plugin" target="_blank">HubSpot embed codes</a></p>',