Changeset 738380

Timestamp:

07/09/2013 05:29:22 PM (13 years ago)

Author:

cliffcrocker

Message:

Fixed indentations, added key validation, css tuning

Location:

mpulse-real-user-measurement/trunk

Files:

• mpulse-real-user-measurement.php (modified) (7 diffs)
• soasta_wp.css (modified) (4 diffs)

mpulse-real-user-measurement/trunk/mpulse-real-user-measurement.php

@@ -8 +8 @@
 */
 
+// Make sure we don't expose any info if called directly
+if ( !function_exists( 'add_action' ) ) {
+    echo 'Hi there!  I\'m just a plugin, not much I can do when called directly.';
+    exit;
+}
+
 //Clean up after ourselves on delete
 function mpulse_cleanup() {
@@ -13 +19 @@
 }
 
-//Add submenu to plugin menue
+//Add submenu to plugin menu
 function mpulse_plugin_config() {
     add_submenu_page( 'plugins.php', 'mPulse Real User Measurement Configuration', 'mPulse RUM', 'manage_options', 'mpulse_plugin_page', 'mpulse_plugin_page' );
@@ -20 +26 @@
 //Add plugin action link to Plugin page for mPulse Settings
 function  mpulse_plugin_action_links($links, $file) {
-    static $this_plugin;
+    static $this_plugin;
 
-    if (!$this_plugin) {
-        $this_plugin = plugin_basename(__FILE__);
-    }
+    if (!$this_plugin) {
+        $this_plugin = plugin_basename(__FILE__);
+    }
 
-    if ($file == $this_plugin) {
-        // The "page" query string value must be equal to the slug
-        // of the Settings admin page we defined earlier, which in
-        // this case equals "myplugin-settings".
-        $settings_link = '<a href="' . get_bloginfo('wpurl') . '/wp-admin/admin.php?page=mpulse_plugin_page">Settings</a>';
-        array_unshift($links, $settings_link);
-    }
+    if ($file == $this_plugin) {
+        $settings_link = '<a href="' . get_bloginfo('wpurl') . '/wp-admin/admin.php?page=mpulse_plugin_page">Settings</a>';
+        array_unshift($links, $settings_link);
+    }
 
-    return $links;
+    return $links;
 }
 
@@ -46 +49 @@
 
     if (isset($_POST['submit'])) {
-        $mp_key = trim($_POST['mpulse_api_key']);
-        update_option('mpulse_api_key', $mp_key);
-        ?><div id="footer" class="soasta_footer"> <p>Your key has been updated.</p></div><?php
+        $mp_key = trim($_POST['mpulse_api_key']);
+        $mp_pattern = '/[A-Z0-9]{5}\-[A-Z0-9]{5}\-[A-Z0-9]{5}\-[A-Z0-9]{5}\-[A-Z0-9]{5}/';
+        if (preg_match($mp_pattern, $mp_key)) {
+            update_option('mpulse_api_key', $mp_key);
+            echo "<div id=\"footer\" class=\"soasta_footer\"> <p>Your key has been updated.</p></div>";
+        } else {
+            echo "<div id=\"footer\" class=\"soasta_footer\"> <p>Your API key is invalid! Format: A1A1A-B2B2B-C3C3C-D4D4D </p></div>";
+        }
     }
-
 ?>
 
@@ -58 +65 @@
 <h1>mPulse - Real User Measurement</h1>
 
-<p>Please enter your API KEY below. This can be found in your domain configuration within mPulse. If you do not yet have an mPulse account, you can set this up <a href="http://www.soasta.com/free" target="new">here.</a> (For FREE!).</p>
+<p>Please enter your API KEY below. This can be found in your domain configuration within mPulse. If you do not yet have an mPulse account, you can <a href="http://www.soasta.com/free" target="new" title="Create a free mPulse account">set one up (For FREE!)</a></p>
         <form method="post" action="" class="soasta_form">
             <input name="mpulse_api_key" type="text" id="mpulse_api_key" class="soasta_input" value="<?php echo get_option('mpulse_api_key');?>" maxlength="29" placeholder="A1A1A-B2B2B-C3C3C-D4D4D-E5E5E"/>
@@ -72 +79 @@
 function mpulse_add_rum_header() {
 ?>    
-  <script type='text/javascript'>(function(){
-  var dom,doc,where,iframe = document.createElement('iframe');
-  iframe.src = "javascript:false";
-  (iframe.frameElement || iframe).style.cssText = "width: 0; height: 0; border: 0";
-  where = document.getElementsByTagName('script')[0];
-  where.parentNode.insertBefore(iframe, where);
-  try {
-    doc = iframe.contentWindow.document;
-  } catch(e) {
-    dom = document.domain;
-    iframe.src="javascript:var d=document.open();d.domain='"+dom+"';void(0);";
-    doc = iframe.contentWindow.document;
-  }
-  doc.open()._l = function() {
-    var js = this.createElement("script");
-    if(dom) this.domain = dom;
-    js.id = "boomr-if-as";
-    js.src = '//c.go-mpulse.net/boomerang/' +
-    '<?php echo get_option('mpulse_api_key');?>';
-    BOOMR_lstart=new Date().getTime();
-    this.body.appendChild(js);
-  };
-  doc.write('<body onload="document._l();">');
-  doc.close();
-  })();</script>;
+    <script type='text/javascript'>(function(){
+    var dom,doc,where,iframe = document.createElement('iframe');
+    iframe.src = "javascript:false"; iframe.title = ""; iframe.role="presentation";
+    (iframe.frameElement || iframe).style.cssText = "width: 0; height: 0; border: 0";
+    where = document.getElementsByTagName('script')[0];
+    where.parentNode.insertBefore(iframe, where);
+    try {
+        doc = iframe.contentWindow.document;
+    } catch(e) {
+    dom = document.domain;
+    iframe.src="javascript:var d=document.open();d.domain='"+dom+"';void(0);";
+    doc = iframe.contentWindow.document;
+    }
+    doc.open()._l = function() {
+    var js = this.createElement("script");
+    if(dom) this.domain = dom;
+    js.id = "boomr-if-as";
+    js.src = '//c.go-mpulse.net/boomerang/' +
+    '<?php echo get_option('mpulse_api_key');?>';
+    BOOMR_lstart=new Date().getTime();
+    this.body.appendChild(js);
+    };
+    doc.write('<body onload="document._l();">');
+    doc.close();
+    })();</script>;
 
 <?php
@@ -109 +116 @@
     register_uninstall_hook(__FILE__, 'mpulse_cleanup');
 }
-
-// Make sure we don't expose any info if called directly
-if ( !function_exists( 'add_action' ) ) {
-    echo 'Hi there!  I\'m just a plugin, not much I can do when called directly.';
-    exit;
-}
-
 ?>

mpulse-real-user-measurement/trunk/soasta_wp.css

@@ -4 +4 @@
 
 .soasta_container {
-    margin: 50px 0 0 10px;
-    width: 500px;
-    font-size: 14px;
+    margin: 50px 0 0 10px;
+    width: 500px;
+    font-size: 1.000em;
     line-height: 1.4;
     color: #565656;
@@ -14 +14 @@
     
 .soasta_footer {
-   position:absolute;
-   bottom:0;
-   width:500px;
-   height:40px;   /* Height of the footer */
-   margin: 10px 0px 0px 10px;
-   padding-left: 10px;
-   border: 2px solid red;
-   font-size: 14px;
-   line-height: 1.4;
-   color: white;
-   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-   background:#42B4E6;
+    position:absolute;
+    bottom:0;
+    width:500px;
+    height:40px;   /* Height of the footer */
+    margin: 10px 0px 0px 10px;
+    padding-left: 10px;
+    border: 2px solid red;
+    font-size: 1.000em;
+    line-height: 1.4em;
+    color: white;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    background:#42B4E6;
 }
     
 .soasta_container h1 {
     font-size: 2.5em;
-    line-height: 1.333em;
+    line-height: 1.4em;
     font-weight: 200;
     color: #8F8F8F; 
@@ -37 +37 @@
 .soasta_form {  
     background-color: #d8d9da;
-    border: 1px solid #a8a8a8;
-    margin-top: 20px;
-    padding-left: 5px;
-    padding-right: 5px;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    border: 1px solid #a8a8a8;
+    margin-top: 20px;
+    padding: 5px;
 }
 
 .soasta_input {
-    font-size: 14px;
+    font-size: 1.000em;
     width: 390px;
 }
@@ -53 +50 @@
     background:#42B4E6;
     border: 1px solid #a8a8a8;
-    -webkit-border-radius: 6px 6px 6px 6px;
-    -moz-border-radius: 6px;
-    border-radius: 6px;
-    margin-left: 6px;
-    color: white;
-    font-size: 14px;
+        border-radius: 6px;
+    margin-left: 6px;
+    color: white;
+    font-size: 1.000em;
     width: 80px;
 }