Changeset 1948784

Timestamp:

09/28/2018 06:58:42 PM (7 years ago)

Author:

crimson090

Message:

Version 1.1

Location:

wp-environment-indicator/trunk

Files:

• . (modified) (1 prop)
• README.txt (modified) (3 diffs)
• admin/class-wp-environment-indicator-admin.php (modified) (7 diffs)
• admin/css/dev-mode-red.svg (added)
• admin/css/dev-mode-yellow.svg (added)
• admin/css/wp-environment-indicator-admin-red.css (added)
• admin/css/wp-environment-indicator-admin-yellow.css (added)

wp-environment-indicator/trunk/README.txt

@@ -4 +4 @@
 Tags: environment, development, indicator, admin, administration, dashboard, production, staging
 Requires at least: 3.0.1
-Tested up to: 4.6.1
-Stable tag: 1.0.0
+Tested up to: 4.9.8
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -14 +14 @@
 
 Displays an indicator above the admin bar indicating the current environment. Useful for quickly determining which
-environment you are currently viewing. 
+environment you are currently viewing.
 
 This only displays in the WordPress admin, not on the website itself.
@@ -37 +37 @@
 == Changelog ==
 
+= 1.1 =
+* Fixes to support different hosting environments such as docker
+* Add a selection box for the banner color
+
 = 1.0 =
 * Initial release

wp-environment-indicator/trunk/admin/class-wp-environment-indicator-admin.php

@@ -39 +39 @@
      * @var      string    $version    The current version of this plugin.
      */
-    private $version;
+    private $version;
+
+    private $hostName;
 
     /**
@@ -51 +53 @@
 
         $this->plugin_name = $plugin_name;
-        $this->version = $version;
-    }
+        $this->version = $version;
+        $this->hostName = $this->get_host_name();
+    }
+
+    private function get_host_name() {
+        $hostName = $_SERVER['HTTP_HOST'];
+        if (empty($hostName)) {
+            $hostName = $_SERVER['SERVER_NAME'];
+        }
+        if (empty($hostName)) {
+            $hostName = $_SERVER['VIRTUAL_HOST'];
+        }
+
+        return $hostName;
+
+    }
 
     /**
@@ -60 +76 @@
      */
     public function enqueue_styles() {
-
         /**
          * Enqueues the admin style, but only if we're on the dev host
@@ -72 +87 @@
          * class.
          */
-        if ($_SERVER['SERVER_NAME'] == get_option('wpei_dev_hostname_field')) {
-            wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wp-environment-indicator-admin.css', array(), $this->version, 'all' );
+
+        $devServer = get_option('wpei_dev_hostname_field');
+        $devServer = str_replace("http://", "", $devServer);
+        $devServer = str_replace("https://", "", $devServer);
+
+        if (strpos($devServer, $this->hostName) !== false) {
+            if (get_option('wpei_dev_hostname_color') == "yellow") {
+                wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wp-environment-indicator-admin-yellow.css', array(), $this->version, 'all' );
+            }
+            else {
+                wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wp-environment-indicator-admin-red.css', array(), $this->version, 'all' );
+            }
         }
 
@@ -86 +111 @@
 
         /**
-         * 
+         *
          *
          * An instance of this class should be passed to the run() function
@@ -127 +152 @@
         </form>
     </div> <?php
-    }   
+    }
 
     public function setup_sections() {
@@ -135 +160 @@
     public function section_callback( $arguments ) {
         echo '<p>Enter the host name of your development environment below. When visiting the site at this host name, an indicator will be added to the top of the WordPress admin.</p>';
-        echo '<em>Current Host</em>: ' . $_SERVER['SERVER_NAME'];
+        echo '<em>Current Host</em>: ' . $this->hostName;
     }
 
     public function setup_fields() {
-        add_settings_field( 'wpei_dev_hostname_field', 'Development Host Name', array( $this, 'field_callback' ), 'wp_environment_indicator_fields', 'environment_urls_section' );
+        add_settings_field( 'wpei_dev_hostname_field', 'Development Host Name', array( $this, 'hostname_field' ), 'wp_environment_indicator_fields', 'environment_urls_section' );
         register_setting( 'wp_environment_indicator_fields', 'wpei_dev_hostname_field' );
+
+        add_settings_field( 'wpei_dev_hostname_color', 'Development Banner Color', array( $this, 'banner_color' ), 'wp_environment_indicator_fields', 'environment_urls_section' );
+        register_setting( 'wp_environment_indicator_fields', 'wpei_dev_hostname_color' );
     }
 
-    public function field_callback( $arguments ) {
-        echo '<input name="wpei_dev_hostname_field" id="wpei_dev_hostname_field" type="text" value="' . get_option( 'wpei_dev_hostname_field' ) . '" />';       
-    }
+    public function hostname_field( $arguments ) {
+        echo '<input name="wpei_dev_hostname_field" id="wpei_dev_hostname_field" type="text" value="' . get_option( 'wpei_dev_hostname_field' ) . '" />';
+    }
+
+    public function banner_color( $arguments ) {
+        echo '<select name="wpei_dev_hostname_color" id="wpei_dev_hostname_color">';
+        if (get_option('wpei_dev_hostname_color') == 'red') {
+            echo '<option value="yellow">Yellow</option>
+                  <option value="red" selected>Red</option>';
+        }
+        else {
+            echo '<option value="yellow" selected>Yellow</option>
+                  <option value="red">Red</option>';
+        }
+
+
+    }
 
 }