Changeset 1244416

Timestamp:

09/13/2015 09:23:53 AM (10 years ago)

Author:

rclick

Message:

refactored constants

File:

• i-am-human/trunk/iamhuman.php (modified) (7 diffs)

i-am-human/trunk/iamhuman.php

@@ -37 +37 @@
 
     $html = "
-    <div id='iamhuman_container' style='display: none' title='" . get_option('description_title') . "'>
+    <div id='iamhuman_container' style='display: none' title='" . get_option(IamHumanConstants::IAMHUMAN_OPTION_DESCRIPTION_TITLE) . "'>
         
         <div id=\"iamhuman_dialog_contents\">
@@ -46 +46 @@
        
             <div id=\"iamhuman_grid\" class='iamhuman_grid'></div>
-            <div class='iamhuman_message'>" . get_option("incorrect_attempt_message") ."</div>
+            <div class='iamhuman_message'>" . get_option(IamHumanConstants::IAMHUMAN_OPTION_INCORRECT_ATTEMPT_MESSAGE) ."</div>
         </div>
     </div>
@@ -53 +53 @@
         jQuery(document).ready(function($) {
         
-            $('html > head').append($('<style> .colour_bg { background: " . get_option('background_colour') . "; }</style>'));
-            $('html > head').append($('<style> .colour_one { background: " . get_option('colour_one') . "; }</style>'));
-            $('html > head').append($('<style> .colour_two { background: " . get_option('colour_two') . "; }</style>'));
-            $('html > head').append($('<style> .cell_mouse_over { background: " . get_option('colour_hover') . "; }</style>'));
-                
-            foreground = '" . get_option('question_colour_one_string') . "';" . 
-            "guide = '" . get_option('question_colour_two_string') . "';" . 
-            
-            "create_grid(\"#iamhuman_grid\", " . get_option('grid_size') .");
+            $('html > head').append($('<style> .colour_bg { background: " . get_option(IamHumanConstants::IAMHUMAN_OPTION_BACKGROUND_COLOUR) . "; }</style>'));
+            $('html > head').append($('<style> .colour_one { background: " . get_option(IamHumanConstants::IAMHUMAN_OPTION_COLOUR_ONE) . "; }</style>'));
+            $('html > head').append($('<style> .colour_two { background: " . get_option(IamHumanConstants::IAMHUMAN_OPTION_COLOUR_TWO) . "; }</style>'));
+            $('html > head').append($('<style> .cell_mouse_over { background: " . get_option(IamHumanConstants::IAMHUMAN_OPTION_COLOUR_HOVER) . "; }</style>'));
+                
+            foreground = '" . get_option(IamHumanConstants::IAMHUMAN_OPTION_QUESTION_COLOUR_ONE_STRING) . "';" . 
+            "guide = '" . get_option(IamHumanConstants::IAMHUMAN_OPTION_COLOUR_TWO) . "';" . 
+            
+            "create_grid(\"#iamhuman_grid\", " . get_option(IamHumanConstants::IAMHUMAN_OPTION_GRID_SIZE) .");
                 
             highlight_list(\"#iamhuman_grid\", \"colour_one\", foreground);
@@ -181 +181 @@
 function iamhuman_answer_check_ajax_callback() {
         $results = "<result>";
-        $answer_string = get_option('answer_colour_one_string');
+        $answer_string = get_option(IamHumanConstants::IAMHUMAN_OPTION_ANSWER_COLOUR_ONE_STRING);
     $test_string = $_POST['answer_string'];
         $results .= "<success>" . (($answer_string === $test_string) ? "true" : "false")  . "</success>";
@@ -214 +214 @@
         
             if(empty($_POST['iamhuman_answer'])) {
-               wp_die( get_option("incorrect_attempt_message"));  
+               wp_die( get_option(IamHumanConstants::IAMHUMAN_OPTION_INCORRECT_ATTEMPT_MESSAGE));  
             } else {
 
@@ -220 +220 @@
 
                 if($test_answer !== $answer_string) {
-                    wp_die( get_option("incorrect_attempt_message")); 
+                    wp_die( get_option(IamHumanConstants::IAMHUMAN_OPTION_INCORRECT_ATTEMPT_MESSAGE)); 
                 }
             }
@@ -240 +240 @@
 function iamhuman_is_enabled() {
 
-    return !is_user_logged_in() && get_option('colour_one') !== false &&  get_option('grid_size') !== false && 
+    return !is_user_logged_in() && get_option('colour_one') !== false &&  get_option(IamHumanConstants::IAMHUMAN_OPTION_GRID_SIZE) !== false && 
             filter_var(get_option('enable_post_comments'), FILTER_VALIDATE_BOOLEAN);
 }