added ip addresses to settings

uwex-learning-tech · Nov 15, 2016 · e698d76 · e698d76
1 parent 95acf89
commit e698d76
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 37 deletions.
diff --git a/build/assets/css/system-requirements-check-frontend.css b/build/assets/css/system-requirements-check-frontend.css
@@ -26,7 +26,7 @@
 .icon-link:before {
  content: "\E003"; }
 
-icon-ip:before {
+.icon-ip:before {
  content: "\E004"; }
 
 .icon-info:before {

diff --git a/build/includes/admin/class-system-requirements-check-settings.php b/build/includes/admin/class-system-requirements-check-settings.php
@@ -113,6 +113,14 @@ protected function init_settings() {
  'name' => 'flash',
  'std' => '11'
  ),
+ array(
+ 'name' => 'ip',
+ 'std' => '0'
+ ),
+ array(
+ 'name' => 'host_ip',
+ 'std' => '0'
+ )
  ),
  )
  )

diff --git a/build/includes/admin/system-requirements-check-settings-form.php b/build/includes/admin/system-requirements-check-settings-form.php
@@ -2,10 +2,16 @@
 
 <div class="settings_box">
 
- <h3>Settings</h3>
-
  <form method="post" action="options.php">
-
+
+ <p class="submit">
+ <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'system_requirements_check' ); ?>" />
+ </p>
+
+ <hr class="thick"/>
+
+ <h3>Settings</h3>
+
  <?php
 
  settings_fields($this->settings_group);
@@ -17,13 +23,13 @@
  ?>
 
  <div class="settings_form">
-
+
+
+
  <h4>Operating Systems</h4>
 
  <p>Select the minimum operating systems required.</p>
 
-
-
  <div class="callout danger">
  <label class="src-cb"><input type="checkbox" name="disable_os_check" value="1" <?php checked('1', get_option('disable_os_check')); ?> />Disable operating systems check.</label><br>
  If selected, operating systems will not be checked and displayed even if they are selected below.
@@ -76,6 +82,16 @@
 
  <hr />
 
+ <h4>IP Addresses</h4>
+
+ <div class="callout danger"><strong>Important:</strong> Displaying IP address to the public may increase of the risk of a security breach. By choosing to display the IP address, you expressed or agreed that the author of this plugin will not be held responsible for any security breaches. Please use responsibly.</div>
+
+ <label>Display client's IP address? <input type="checkbox" name="ip" value="1" <?php checked('1', get_option('ip')); ?> /></label>
+ <br>
+ <label>Display host's IP address? <input type="checkbox" name="host_ip" value="1" <?php checked('1', get_option('host_ip')); ?> /></label>
+
+ <hr />
+
  <h4>JavaScript</h4>
  <label>Check for JavaScript? <input type="checkbox" name="js" value="1" <?php checked('1', get_option('js')); ?> /></label>
 

diff --git a/build/includes/class-system-requirements-check-shortcodes.php b/build/includes/class-system-requirements-check-shortcodes.php
@@ -41,6 +41,10 @@ public function check_system_requirements() {
 
  $osCallout = '';
 
+ if ( get_option('ip') == '1' ) {
+ $ipCallout = $this->getIP();
+ }
+
  if ( get_option('disable_os_check') != '1' ) {
  $osCallout = $this->checkOS();
  }
@@ -54,10 +58,30 @@ public function check_system_requirements() {
  $javaCallout = $this->checkJava();
  $flashCallout = $this->checkFlash();
 
- return '<div class="system_req_check">' . $osCallout . $browserCallout . $jsCallout . $cookieCallout . $javaCallout . $flashCallout . '</div>';
+ return '<div class="system_req_check">' . $ipCallout . $osCallout . $browserCallout . $jsCallout . $cookieCallout . $javaCallout . $flashCallout . '</div>';
 
  }
-
+
+ /**
+ * getIP function
+ *
+ * @access public
+ * @return string
+ *
+ */
+ public function getIP() {
+
+ $ip = $_SERVER['REMOTE_ADDR'];
+
+ if ( get_option('host_ip') == '1' ) {
+ $host = $_SERVER['SERVER_ADDR'];
+ return '<div class="callout success"><p><span class="icon-ip big"></span><strong>IP Addresses</strong></p><p>Your IP: ' . $ip . '<br>Host\'s IP: ' . $host . '</p></div>';
+ }
+
+ return '<div class="callout success"><p><span class="icon-ip big"></span><strong>IP Address: ' . $ip . '</strong></p></div>';
+
+ }
+
  /**
  * checkOS function
  *

diff --git a/config.codekit3 b/config.codekit3
@@ -163,12 +163,6 @@
  "oS": 0,
  "uL": 1
  },
- "\/source\/includes\/admin\/class-system-requirements-check-settings.php": {
- "ft": 8192,
- "oA": 2,
- "oAP": "\/build\/includes\/admin\/class-system-requirements-check-settings.php",
- "oF": 0
- },
  "\/source\/includes\/admin\/system-requirements-check-functions.php": {
  "ft": 8192,
  "oA": 2,
@@ -181,18 +175,6 @@
  "oAP": "\/build\/includes\/admin\/system-requirements-check-settings-donation.php",
  "oF": 0
  },
- "\/source\/includes\/admin\/system-requirements-check-settings-form.php": {
- "ft": 8192,
- "oA": 2,
- "oAP": "\/build\/includes\/admin\/system-requirements-check-settings-form.php",
- "oF": 0
- },
- "\/source\/includes\/class-system-requirements-check-shortcodes.php": {
- "ft": 8192,
- "oA": 2,
- "oAP": "\/build\/includes\/class-system-requirements-check-shortcodes.php",
- "oF": 0
- },
  "\/source\/includes\/class-system-requirements-check-system.php": {
  "ft": 8192,
  "oA": 2,
@@ -227,7 +209,7 @@
  "displayValue": "system-requirements-check",
  "displayValueWasSetByUser": 0,
  "iconImageName": "meme-owl",
- "lastBuiltDate": 500929542
+ "lastBuiltDate": 500937866
  },
 "projectSettings": {
  "abortBuildOnError": 1,

diff --git a/source/assets/scss/systemrequirementscheckfont.scss b/source/assets/scss/systemrequirementscheckfont.scss
@@ -29,7 +29,7 @@
 .icon-link:before {
  content: "\E003";
 }
-icon-ip:before {
+.icon-ip:before {
  content: "\E004";
 }
 .icon-info:before {

diff --git a/source/includes/admin/class-system-requirements-check-settings.php b/source/includes/admin/class-system-requirements-check-settings.php
@@ -113,6 +113,14 @@ protected function init_settings() {
  'name' => 'flash',
  'std' => '11'
  ),
+ array(
+ 'name' => 'ip',
+ 'std' => '0'
+ ),
+ array(
+ 'name' => 'host_ip',
+ 'std' => '0'
+ )
  ),
  )
  )

diff --git a/source/includes/admin/system-requirements-check-settings-form.php b/source/includes/admin/system-requirements-check-settings-form.php
@@ -2,10 +2,16 @@
 
 <div class="settings_box">
 
- <h3>Settings</h3>
-
  <form method="post" action="options.php">
-
+
+ <p class="submit">
+ <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'system_requirements_check' ); ?>" />
+ </p>
+
+ <hr class="thick"/>
+
+ <h3>Settings</h3>
+
  <?php
 
  settings_fields($this->settings_group);
@@ -17,13 +23,13 @@
  ?>
 
  <div class="settings_form">
-
+
+
+
  <h4>Operating Systems</h4>
 
  <p>Select the minimum operating systems required.</p>
 
-
-
  <div class="callout danger">
  <label class="src-cb"><input type="checkbox" name="disable_os_check" value="1" <?php checked('1', get_option('disable_os_check')); ?> />Disable operating systems check.</label><br>
  If selected, operating systems will not be checked and displayed even if they are selected below.
@@ -76,6 +82,16 @@
 
  <hr />
 
+ <h4>IP Addresses</h4>
+
+ <div class="callout danger"><strong>Important:</strong> Displaying IP address to the public may increase of the risk of a security breach. By choosing to display the IP address, you expressed or agreed that the author of this plugin will not be held responsible for any security breaches. Please use responsibly.</div>
+
+ <label>Display client's IP address? <input type="checkbox" name="ip" value="1" <?php checked('1', get_option('ip')); ?> /></label>
+ <br>
+ <label>Display host's IP address? <input type="checkbox" name="host_ip" value="1" <?php checked('1', get_option('host_ip')); ?> /></label>
+
+ <hr />
+
  <h4>JavaScript</h4>
  <label>Check for JavaScript? <input type="checkbox" name="js" value="1" <?php checked('1', get_option('js')); ?> /></label>
 

diff --git a/source/includes/class-system-requirements-check-shortcodes.php b/source/includes/class-system-requirements-check-shortcodes.php
@@ -41,6 +41,10 @@ public function check_system_requirements() {
 
  $osCallout = '';
 
+ if ( get_option('ip') == '1' ) {
+ $ipCallout = $this->getIP();
+ }
+
  if ( get_option('disable_os_check') != '1' ) {
  $osCallout = $this->checkOS();
  }
@@ -54,10 +58,30 @@ public function check_system_requirements() {
  $javaCallout = $this->checkJava();
  $flashCallout = $this->checkFlash();
 
- return '<div class="system_req_check">' . $osCallout . $browserCallout . $jsCallout . $cookieCallout . $javaCallout . $flashCallout . '</div>';
+ return '<div class="system_req_check">' . $ipCallout . $osCallout . $browserCallout . $jsCallout . $cookieCallout . $javaCallout . $flashCallout . '</div>';
 
  }
-
+
+ /**
+ * getIP function
+ *
+ * @access public
+ * @return string
+ *
+ */
+ public function getIP() {
+
+ $ip = $_SERVER['REMOTE_ADDR'];
+
+ if ( get_option('host_ip') == '1' ) {
+ $host = $_SERVER['SERVER_ADDR'];
+ return '<div class="callout success"><p><span class="icon-ip big"></span><strong>IP Addresses</strong></p><p>Your IP: ' . $ip . '<br>Host\'s IP: ' . $host . '</p></div>';
+ }
+
+ return '<div class="callout success"><p><span class="icon-ip big"></span><strong>IP Address: ' . $ip . '</strong></p></div>';
+
+ }
+
  /**
  * checkOS function
  *