Changeset 2931593
- Timestamp:
- 06/27/2023 11:40:06 PM (3 years ago)
- Location:
- home-value/trunk
- Files:
-
- 12 edited
-
admin/partials/_notes/dwsync.xml (modified) (1 diff)
-
admin/partials/home-values-forms.php (modified) (1 diff)
-
home-values.php (modified) (2 diffs)
-
includes/_notes/dwsync.xml (modified) (1 diff)
-
includes/class-home-values-install.php (modified) (5 diffs)
-
includes/home-values-functions.php (modified) (1 diff)
-
public/_notes/dwsync.xml (modified) (1 diff)
-
public/class-home-values-shortcodes.php (modified) (2 diffs)
-
public/css/_notes/dwsync.xml (modified) (1 diff)
-
readme.txt (modified) (1 diff)
-
templates/forms/_notes/dwsync.xml (modified) (1 diff)
-
templates/forms/lead-form.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
home-value/trunk/admin/partials/_notes/dwsync.xml
r2931195 r2931593 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="home-values-forms.php" server="45.63.90.215" local="133 265851640000000" remote="133265851640000000" Dst="0" />3 <file name="home-values-forms.php" server="45.63.90.215" local="133323620590000000" remote="133323620590000000" Dst="0" /> 4 4 <file name="home-values-premium.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> 5 5 <file name="home-values-emails.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> -
home-value/trunk/admin/partials/home-values-forms.php
r2931195 r2931593 107 107 </td> 108 108 </tr> 109 <tr> 110 <th scope="row"><label for="submit_button_text"><?php _e('Lead Form Submit Button Text', 'home-values'); ?></label></th> 111 <td> 112 <input type="text" id="submit_button_text" name="home_values_forms[lead_form_submit_button_text]" value="<?php echo esc_attr($options['lead_form_submit_button_text']); ?>" class="regular-text" /> 113 </td> 114 </tr> 109 115 110 116 </table> -
home-value/trunk/home-values.php
r2931195 r2931593 4 4 * Plugin Name: Home Value 5 5 * Description: Home Value provides your website visitors the ability to get accurate home price valuations of their applicable property(s). 6 * Version: 2.336 * Version: 3.0.3 7 7 * Author: 8blocks 8 8 * Author Email: support@8blocks.com … … 17 17 18 18 // Plugin directory path and URL. 19 define('HOME_VALUES_PLUGIN_VERSION', '3.0. 1');19 define('HOME_VALUES_PLUGIN_VERSION', '3.0.3'); 20 20 define('HOME_VALUES_PLUGIN_DIR', plugin_dir_path(__FILE__)); 21 21 define('HOME_VALUES_PLUGIN_URL', plugin_dir_url(__FILE__)); -
home-value/trunk/includes/_notes/dwsync.xml
r2931195 r2931593 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="home-values-functions.php" server="45.63.90.215" local="1333 06608800000000" remote="133306608800000000" Dst="0" />3 <file name="home-values-functions.php" server="45.63.90.215" local="133323817870000000" remote="133323817870000000" Dst="0" /> 4 4 <file name="class-home-values.php" server="45.63.90.215" local="133288294060000000" remote="133288294060000000" Dst="0" /> 5 5 <file name="class-home-values-lead.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> 6 6 <file name="class-home-values-loader.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> 7 <file name="class-home-values-install.php" server="45.63.90.215" local="1333 11629180000000" remote="133311629180000000" Dst="0" />7 <file name="class-home-values-install.php" server="45.63.90.215" local="133323736540000000" remote="133323736540000000" Dst="0" /> 8 8 <file name="class-home-values-api.php" server="45.63.90.215" local="133322990330000000" remote="133322990330000000" Dst="0" /> 9 9 <file name="class-home-values-cpt.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> -
home-value/trunk/includes/class-home-values-install.php
r2931195 r2931593 15 15 // Get the stored version 16 16 $stored_version = is_multisite() ? get_site_option('home_values_plugin_version') : get_option('home_values_plugin_version'); 17 write_log('stored version: ' . $stored_version); 18 19 // if there is no version stored then it is either fresh install or update from very old version 20 if (!$stored_version || empty($stored_version)) { 21 // Check if data from old install exists 22 $old_key = get_site_option('eightb\home_value\Home_Value_home_value_api_key') || get_option('Home_Value_home_value_api_key'); 23 24 write_log('old key exists: ' . $old_key); 25 26 // If old data exists then it is update from very old version 27 if ($old_key !== false) { 28 29 write_log('Migrating Settings'); 30 31 // Run your update function 32 $this->migrate_settings(); 33 34 // Update the stored version 35 if (is_multisite()) { 36 update_site_option('home_values_plugin_version', $current_version); 37 } else { 38 update_option('home_values_plugin_version', $current_version); 39 } 40 } else { 41 42 write_log('Fresh Install'); 43 44 // Run your install function for fresh install 45 $this->set_default_settings(); 46 47 // Update the stored version 48 if (is_multisite()) { 49 update_site_option('home_values_plugin_version', $current_version); 50 } else { 51 update_option('home_values_plugin_version', $current_version); 52 } 53 } 54 55 return; 56 } 17 57 18 58 // Check if versions do not match 19 59 if ($stored_version != $current_version) { 20 60 21 write_log('hv_check_version'); 22 // Run your update function 23 $this->set_default_settings(); 61 $old_key = get_site_option('eightb\home_value\Home_Value_home_value_api_key') || get_option('Home_Value_home_value_api_key'); 62 63 // If old data exists then it is update from very old version 64 if ($old_key !== false) { 65 66 write_log('Migrating Settings'); 67 68 // Run your update function 69 $this->migrate_settings(); 70 71 // Update the stored version 72 if (is_multisite()) { 73 update_site_option('home_values_plugin_version', $current_version); 74 } else { 75 update_option('home_values_plugin_version', $current_version); 76 } 77 78 return; 79 } 80 81 24 82 25 83 // Update the stored version … … 32 90 } 33 91 34 public function on_plugin_activation()92 public function migrate_settings() 35 93 { 36 $is_upgrade = get_option('home_values_plugin_version'); // Check for old plugin settings 37 38 if ($is_upgrade) { 39 $this->migrate_settings(); 94 95 // if is multisite update site options as well 96 if (is_multisite()) { 97 // Get all blog ids 98 $blog_ids = get_sites(array('fields' => 'ids')); 99 100 foreach ($blog_ids as $blog_id) { 101 switch_to_blog($blog_id); // Switch to each blog 102 103 // Check if already configured 104 $home_values_general_check = home_values_get_setting('general'); 105 $api_key = isset($home_values_general_check['api_key']) ? $home_values_general_check['api_key'] : ''; 106 $google_api_key = isset($home_values_general_check['google_api_key']) ? $home_values_general_check['google_api_key'] : ''; 107 $adjust_values = isset($home_values_general_check['adjust_values']) ? $home_values_general_check['adjust_values'] : ''; 108 $lead_pool_blog = isset($home_values_general_check['lead_pool_blog']) ? $home_values_general_check['lead_pool_blog'] : ''; 109 $webhooks = isset($home_values_general_check['webhooks']) ? $home_values_general_check['webhooks'] : ''; 110 $credits = isset($home_values_general_check['credits']) ? $home_values_general_check['credits'] : ''; 111 $next_refill_date = isset($home_values_general_check['next_refill_date']) ? $home_values_general_check['next_refill_date'] : ''; 112 $renewal_url = isset($home_values_general_check['renewal_url']) ? $home_values_general_check['renewal_url'] : ''; 113 $cancel_url = isset($home_values_general_check['cancel_url']) ? $home_values_general_check['cancel_url'] : ''; 114 115 116 $home_values_general = array( 117 'api_key' => !empty($api_key) ? $api_key : get_option('Home_Value_home_value_api_key'), 118 'google_api_key' => !empty($google_api_key) ? $google_api_key : get_option('Home_Value_google_api_key'), 119 'adjust_values' => !empty($adjust_values) ? $adjust_values : get_option('Home_Value_home_extra_value'), 120 'lead_pool_blog' => !empty($lead_pool_blog) ? $lead_pool_blog : get_option('Home_Value_lead_pool_blog'), 121 'load_css' => get_option('Home_Value_load_css') === 'on' || get_option('Home_Value_load_css') == 1 ? 1 : 0, 122 'webhooks' => !empty($webhooks) ? $webhooks : get_option('Home_Value_new_lead_webhooks'), 123 'credits' => !empty($credits) ? $credits : get_option('Home_Value_results_left'), 124 'next_refill_date' => !empty($next_refill_date) ? $next_refill_date : get_option('Home_Value_refill_date'), 125 'renewal_url' => !empty($renewal_url) ? $renewal_url : 'https://homevalueplugin.com/renew?key=' . get_option('Home_Value_home_value_api_key', ''), 126 'cancel_url' => !empty($cancel_url) ? $cancel_url : 'https://homevalueplugin.com/cancel?key=' . get_option('Home_Value_home_value_api_key', ''), 127 ); 128 129 update_option('home_values_general', $home_values_general); 130 131 // Check if already configured 132 $home_values_forms_check = home_values_get_setting('forms'); 133 $address_field_placeholder = isset($home_values_forms_check['address_field_placeholder']) ? $home_values_forms_check['address_field_placeholder'] : ''; 134 $submit_button_text = isset($home_values_forms_check['submit_button_text']) ? $home_values_forms_check['submit_button_text'] : ''; 135 $email_field_placeholder = isset($home_values_forms_check['email_field_placeholder']) ? $home_values_forms_check['email_field_placeholder'] : ''; 136 $first_name_field_placeholder = isset($home_values_forms_check['first_name_field_placeholder']) ? $home_values_forms_check['first_name_field_placeholder'] : ''; 137 $last_name_field_placeholder = isset($home_values_forms_check['last_name_field_placeholder']) ? $home_values_forms_check['last_name_field_placeholder'] : ''; 138 $phone_number_placeholder = isset($home_values_forms_check['phone_number_placeholder']) ? $home_values_forms_check['phone_number_placeholder'] : ''; 139 $lead_form_submit_button_text = isset($home_values_forms_check['lead_form_submit_button_text']) ? $home_values_forms_check['lead_form_submit_button_text'] : ''; 140 $address_found_messaging = isset($home_values_forms_check['address_found_messaging']) ? $home_values_forms_check['address_found_messaging'] : ''; 141 $address_not_found_messaging = isset($home_values_forms_check['address_not_found_messaging']) ? $home_values_forms_check['address_not_found_messaging'] : ''; 142 $form_thank_you_message = isset($home_values_forms_check['form_thank_you_message']) ? $home_values_forms_check['form_thank_you_message'] : ''; 143 144 $home_values_forms = array( 145 'address_field_placeholder' => get_option('Home_Value_address_search_form_address_input_placeholder') === 'No text' ? $address_field_placeholder : get_option('Home_Value_address_search_form_address_input_placeholder'), 146 'submit_button_text' => get_option('Home_Value_address_search_form_submit_button_text') === 'No text' ? $submit_button_text : get_option('Home_Value_address_search_form_submit_button_text'), 147 'email_field_placeholder' => !empty($email_field_placeholder) ? $email_field_placeholder : get_option('Home_Value_lead_form_email_placeholder'), 148 'show_first_name_field' => get_option('Home_Value_lead_form_first_name_visible') === 'on' || get_option('Home_Value_lead_form_first_name_visible') == 1 ? 1 : 0, 149 'require_first_name' => get_option('Home_Value_lead_form_first_name_required') === 'on' || get_option('Home_Value_lead_form_first_name_required') == 1 ? 1 : 0, 150 'first_name_field_placeholder' => get_option('Home_Value_lead_form_first_name_placeholder') === 'No text' ? $first_name_field_placeholder : get_option('Home_Value_lead_form_first_name_placeholder'), 151 'show_last_name_field' => get_option('Home_Value_lead_form_last_name_visible') === 'on' || get_option('Home_Value_lead_form_last_name_visible') == 1 ? 1 : 0, 152 'require_last_name_field' => get_option('Home_Value_lead_form_last_name_required') === 'on' || get_option('Home_Value_lead_form_last_name_required') == 1 ? 1 : 0, 153 'last_name_field_placeholder' => get_option('Home_Value_lead_form_last_name_placeholder') === 'No text' ? $last_name_field_placeholder : get_option('Home_Value_lead_form_last_name_placeholder'), 154 'show_phone_number_field' => get_option('Home_Value_lead_form_phone_visible') === 'on' || get_option('Home_Value_lead_form_phone_visible') == 1 ? 1 : 0, 155 'require_phone_number' => get_option('Home_Value_lead_form_phone_required') === 'on' || get_option('Home_Value_lead_form_phone_required') == 1 ? 1 : 0, 156 'phone_number_placeholder' => get_option('Home_Value_lead_form_phone_placeholder') === 'No text' ? $phone_number_placeholder : get_option('Home_Value_lead_form_phone_placeholder'), 157 'lead_form_submit_button_text' => get_option('Home_Value_lead_form_submit_button_text') === 'No text' ? $lead_form_submit_button_text : get_option('Home_Value_lead_form_submit_button_text'), 158 'address_found_messaging' => get_option('Home_Value_lead_form_address_found_text') === 'No text' ? $address_found_messaging : get_option('Home_Value_lead_form_address_found_text'), 159 'address_not_found_messaging' => get_option('Home_Value_lead_form_address_not_found_text') === 'No text' ? $address_not_found_messaging : get_option('Home_Value_lead_form_address_not_found_text'), 160 'form_thank_you_message' => get_option('Home_Value_no_address_page_text') === 'No text' ? $form_thank_you_message : get_option('Home_Value_no_address_page_text'), 161 ); 162 163 update_option('home_values_forms', $home_values_forms); 164 165 // Check if the home values emails option exists 166 $home_values_emails_check = home_values_get_setting('emails'); 167 $sender_email = isset($home_values_emails_check['sender_email']) ? $home_values_emails_check['sender_email'] : ''; 168 $sender_name = isset($home_values_emails_check['sender_name']) ? $home_values_emails_check['sender_name'] : ''; 169 $new_lead_recipients = isset($home_values_emails_check['new_lead_recipients']) ? $home_values_emails_check['new_lead_recipients'] : ''; 170 $new_lead_subject = isset($home_values_emails_check['new_lead_subject']) ? $home_values_emails_check['new_lead_subject'] : ''; 171 $new_lead_email = isset($home_values_emails_check['new_lead_email']) ? $home_values_emails_check['new_lead_email'] : ''; 172 173 174 $home_values_emails = array( 175 'sender_email' => !empty($sender_email) ? $sender_email : get_option('Home_Value_email_new_lead_sender_email'), 176 'sender_name' => !empty($sender_name) ? $sender_name : get_option('Home_Value_email_new_lead_sender_name'), 177 'new_lead_recipients' => !empty($new_lead_recipients) ? $new_lead_recipients : get_option('Home_Value_email_new_lead_recipients'), 178 'new_lead_subject' => get_option('Home_Value_email_new_lead_subject') === 'No text' ? $new_lead_subject : get_option('Home_Value_email_new_lead_subject'), 179 'new_lead_email' => get_option('Home_Value_email_new_lead_text') === 'No text' ? $new_lead_email : get_option('Home_Value_email_new_lead_text'), 180 ); 181 182 update_option('home_values_emails', $home_values_emails); 183 184 // Check if the home values debug option exists 185 $home_values_debug_check = home_values_get_setting('debug'); 186 $enable_debugging = isset($home_values_debug_check['enable_debugging']) ? $home_values_debug_check['enable_debugging'] : ''; 187 $debug_ips = isset($home_values_debug_check['debug_ips']) ? $home_values_debug_check['debug_ips'] : ''; 188 189 $home_values_debug = array( 190 'enable_debugging' => !empty($enable_debugging) ? $enable_debugging : 0, 191 'debug_ips' => !empty($debug_ips) ? $debug_ips : get_option('Home_Value_debug_ips'), 192 ); 193 194 update_option('home_values_debug', $home_values_debug); 195 } 196 restore_current_blog(); // Switch back to the current blog 197 198 199 // Check if already configured 200 $home_values_general_check = get_site_option('home_values_general'); 201 $api_key = isset($home_values_general_check['api_key']) ? $home_values_general_check['api_key'] : ''; 202 $google_api_key = isset($home_values_general_check['google_api_key']) ? $home_values_general_check['google_api_key'] : ''; 203 $adjust_values = isset($home_values_general_check['adjust_values']) ? $home_values_general_check['adjust_values'] : ''; 204 $lead_pool_blog = isset($home_values_general_check['lead_pool_blog']) ? $home_values_general_check['lead_pool_blog'] : ''; 205 $webhooks = isset($home_values_general_check['webhooks']) ? $home_values_general_check['webhooks'] : ''; 206 $credits = isset($home_values_general_check['credits']) ? $home_values_general_check['credits'] : ''; 207 $next_refill_date = isset($home_values_general_check['next_refill_date']) ? $home_values_general_check['next_refill_date'] : ''; 208 $renewal_url = isset($home_values_general_check['renewal_url']) ? $home_values_general_check['renewal_url'] : ''; 209 $cancel_url = isset($home_values_general_check['cancel_url']) ? $home_values_general_check['cancel_url'] : ''; 210 211 212 $home_values_general = array( 213 'api_key' => !empty($api_key) ? $api_key : get_site_option('eightb\home_value\Home_Value_home_value_api_key'), 214 'google_api_key' => !empty($google_api_key) ? $google_api_key : get_site_option('eightb\home_value\Home_Value_google_api_key'), 215 'adjust_values' => !empty($adjust_values) ? $adjust_values : get_site_option('eightb\home_value\Home_Value_home_extra_value'), 216 'lead_pool_blog' => !empty($lead_pool_blog) ? $lead_pool_blog : get_site_option('eightb\home_value\Home_Value_lead_pool_blog'), 217 'load_css' => get_site_option('eightb\home_value\Home_Value_load_css') === 'on' || get_site_option('eightb\home_value\Home_Value_load_css') == 1 ? 1 : 0, 218 'webhooks' => !empty($webhooks) ? $webhooks : get_site_option('eightb\home_value\Home_Value_new_lead_webhooks'), 219 'credits' => !empty($credits) ? $credits : get_site_option('eightb\home_value\Home_Value_results_left'), 220 'next_refill_date' => !empty($next_refill_date) ? $next_refill_date : get_site_option('eightb\home_value\Home_Value_refill_date'), 221 'renewal_url' => !empty($renewal_url) ? $renewal_url : 'https://homevalueplugin.com/renew?key=' . get_site_option('eightb\home_value\Home_Value_home_value_api_key', ''), 222 'cancel_url' => !empty($cancel_url) ? $cancel_url : 'https://homevalueplugin.com/cancel?key=' . get_site_option('eightb\home_value\Home_Value_home_value_api_key', ''), 223 ); 224 225 update_site_option('home_values_general', $home_values_general); 226 227 // Check if already configured 228 $home_values_forms_check = get_site_option('home_values_forms'); 229 $address_field_placeholder = isset($home_values_forms_check['address_field_placeholder']) ? $home_values_forms_check['address_field_placeholder'] : ''; 230 $submit_button_text = isset($home_values_forms_check['submit_button_text']) ? $home_values_forms_check['submit_button_text'] : ''; 231 $email_field_placeholder = isset($home_values_forms_check['email_field_placeholder']) ? $home_values_forms_check['email_field_placeholder'] : ''; 232 $first_name_field_placeholder = isset($home_values_forms_check['first_name_field_placeholder']) ? $home_values_forms_check['first_name_field_placeholder'] : ''; 233 $last_name_field_placeholder = isset($home_values_forms_check['last_name_field_placeholder']) ? $home_values_forms_check['last_name_field_placeholder'] : ''; 234 $phone_number_placeholder = isset($home_values_forms_check['phone_number_placeholder']) ? $home_values_forms_check['phone_number_placeholder'] : ''; 235 $lead_form_submit_button_text = isset($home_values_forms_check['lead_form_submit_button_text']) ? $home_values_forms_check['lead_form_submit_button_text'] : ''; 236 $address_found_messaging = isset($home_values_forms_check['address_found_messaging']) ? $home_values_forms_check['address_found_messaging'] : ''; 237 $address_not_found_messaging = isset($home_values_forms_check['address_not_found_messaging']) ? $home_values_forms_check['address_not_found_messaging'] : ''; 238 $form_thank_you_message = isset($home_values_forms_check['form_thank_you_message']) ? $home_values_forms_check['form_thank_you_message'] : ''; 239 240 $home_values_forms = array( 241 'address_field_placeholder' => get_site_option('eightb\home_value\Home_Value_address_search_form_address_input_placeholder') === 'No text' ? $address_field_placeholder : get_site_option('eightb\home_value\Home_Value_address_search_form_address_input_placeholder'), 242 'submit_button_text' => get_site_option('eightb\home_value\Home_Value_address_search_form_submit_button_text') === 'No text' ? $submit_button_text : get_site_option('eightb\home_value\Home_Value_address_search_form_submit_button_text'), 243 'email_field_placeholder' => !empty($email_field_placeholder) ? $email_field_placeholder : get_site_option('eightb\home_value\Home_Value_lead_form_email_placeholder'), 244 'show_first_name_field' => get_site_option('eightb\home_value\Home_Value_lead_form_first_name_visible') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_first_name_visible') == 1 ? 1 : 0, 245 'require_first_name' => get_site_option('eightb\home_value\Home_Value_lead_form_first_name_required') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_first_name_required') == 1 ? 1 : 0, 246 'first_name_field_placeholder' => get_site_option('eightb\home_value\Home_Value_lead_form_first_name_placeholder') === 'No text' ? $first_name_field_placeholder : get_site_option('eightb\home_value\Home_Value_lead_form_first_name_placeholder'), 247 'show_last_name_field' => get_site_option('eightb\home_value\Home_Value_lead_form_last_name_visible') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_last_name_visible') == 1 ? 1 : 0, 248 'require_last_name_field' => get_site_option('eightb\home_value\Home_Value_lead_form_last_name_required') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_last_name_required') == 1 ? 1 : 0, 249 'last_name_field_placeholder' => get_site_option('eightb\home_value\Home_Value_lead_form_last_name_placeholder') === 'No text' ? $last_name_field_placeholder : get_site_option('eightb\home_value\Home_Value_lead_form_last_name_placeholder'), 250 'show_phone_number_field' => get_site_option('eightb\home_value\Home_Value_lead_form_phone_visible') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_phone_visible') == 1 ? 1 : 0, 251 'require_phone_number' => get_site_option('eightb\home_value\Home_Value_lead_form_phone_required') === 'on' || get_site_option('eightb\home_value\Home_Value_lead_form_phone_required') == 1 ? 1 : 0, 252 'phone_number_placeholder' => get_site_option('eightb\home_value\Home_Value_lead_form_phone_placeholder') === 'No text' ? $phone_number_placeholder : get_site_option('eightb\home_value\Home_Value_lead_form_phone_placeholder'), 253 'lead_form_submit_button_text' => get_site_option('eightb\home_value\Home_Value_lead_form_submit_button_text') === 'No text' ? $lead_form_submit_button_text : get_site_option('eightb\home_value\Home_Value_lead_form_submit_button_text'), 254 'address_found_messaging' => get_site_option('eightb\home_value\Home_Value_lead_form_address_found_text') === 'No text' ? $address_found_messaging : get_site_option('eightb\home_value\Home_Value_lead_form_address_found_text'), 255 'address_not_found_messaging' => get_site_option('eightb\home_value\Home_Value_lead_form_address_not_found_text') === 'No text' ? $address_not_found_messaging : get_site_option('eightb\home_value\Home_Value_lead_form_address_not_found_text'), 256 'form_thank_you_message' => get_site_option('eightb\home_value\Home_Value_no_address_page_text') === 'No text' ? $form_thank_you_message : get_site_option('eightb\home_value\Home_Value_no_address_page_text'), 257 ); 258 259 update_site_option('home_values_forms', $home_values_forms); 260 261 // Check if the home values emails option exists 262 $home_values_emails_check = get_site_option('home_values_emails'); 263 $sender_email = isset($home_values_emails_check['sender_email']) ? $home_values_emails_check['sender_email'] : ''; 264 $sender_name = isset($home_values_emails_check['sender_name']) ? $home_values_emails_check['sender_name'] : ''; 265 $new_lead_recipients = isset($home_values_emails_check['new_lead_recipients']) ? $home_values_emails_check['new_lead_recipients'] : ''; 266 $new_lead_subject = isset($home_values_emails_check['new_lead_subject']) ? $home_values_emails_check['new_lead_subject'] : ''; 267 $new_lead_email = isset($home_values_emails_check['new_lead_email']) ? $home_values_emails_check['new_lead_email'] : ''; 268 269 270 $home_values_emails = array( 271 'sender_email' => !empty($sender_email) ? $sender_email : get_site_option('eightb\home_value\Home_Value_email_new_lead_sender_email'), 272 'sender_name' => !empty($sender_name) ? $sender_name : get_site_option('eightb\home_value\Home_Value_email_new_lead_sender_name'), 273 'new_lead_recipients' => !empty($new_lead_recipients) ? $new_lead_recipients : get_site_option('eightb\home_value\Home_Value_email_new_lead_recipients'), 274 'new_lead_subject' => get_site_option('eightb\home_value\Home_Value_email_new_lead_subject') === 'No text' ? $new_lead_subject : get_site_option('eightb\home_value\Home_Value_email_new_lead_subject'), 275 'new_lead_email' => get_site_option('eightb\home_value\Home_Value_email_new_lead_text') === 'No text' ? $new_lead_email : get_site_option('eightb\home_value\Home_Value_email_new_lead_text'), 276 ); 277 278 update_site_option('home_values_emails', $home_values_emails); 279 280 // Check if the home values debug option exists 281 $home_values_debug_check = get_site_option('home_values_debug'); 282 $enable_debugging = isset($home_values_debug_check['enable_debugging']) ? $home_values_debug_check['enable_debugging'] : ''; 283 $debug_ips = isset($home_values_debug_check['debug_ips']) ? $home_values_debug_check['debug_ips'] : ''; 284 285 $home_values_debug = array( 286 'enable_debugging' => !empty($enable_debugging) ? $enable_debugging : 0, 287 'debug_ips' => !empty($debug_ips) ? $debug_ips : get_site_option('eightb\home_value\Home_Value_debug_ips'), 288 ); 289 290 update_site_option('home_values_debug', $home_values_debug); 40 291 } else { 41 $this->set_default_settings(); 292 293 294 // Migrate options 295 296 // Check if already configured 297 $home_values_general_check = home_values_get_setting('general'); 298 $api_key = isset($home_values_general_check['api_key']) ? $home_values_general_check['api_key'] : ''; 299 $google_api_key = isset($home_values_general_check['google_api_key']) ? $home_values_general_check['google_api_key'] : ''; 300 $adjust_values = isset($home_values_general_check['adjust_values']) ? $home_values_general_check['adjust_values'] : ''; 301 $lead_pool_blog = isset($home_values_general_check['lead_pool_blog']) ? $home_values_general_check['lead_pool_blog'] : ''; 302 $webhooks = isset($home_values_general_check['webhooks']) ? $home_values_general_check['webhooks'] : ''; 303 $credits = isset($home_values_general_check['credits']) ? $home_values_general_check['credits'] : ''; 304 $next_refill_date = isset($home_values_general_check['next_refill_date']) ? $home_values_general_check['next_refill_date'] : ''; 305 $renewal_url = isset($home_values_general_check['renewal_url']) ? $home_values_general_check['renewal_url'] : ''; 306 $cancel_url = isset($home_values_general_check['cancel_url']) ? $home_values_general_check['cancel_url'] : ''; 307 308 309 $home_values_general = array( 310 'api_key' => !empty($api_key) ? $api_key : get_option('Home_Value_home_value_api_key'), 311 'google_api_key' => !empty($google_api_key) ? $google_api_key : get_option('Home_Value_google_api_key'), 312 'adjust_values' => !empty($adjust_values) ? $adjust_values : get_option('Home_Value_home_extra_value'), 313 'lead_pool_blog' => !empty($lead_pool_blog) ? $lead_pool_blog : get_option('Home_Value_lead_pool_blog'), 314 'load_css' => get_option('Home_Value_load_css') === 'on' || get_option('Home_Value_load_css') == 1 ? 1 : 0, 315 'webhooks' => !empty($webhooks) ? $webhooks : get_option('Home_Value_new_lead_webhooks'), 316 'credits' => !empty($credits) ? $credits : get_option('Home_Value_results_left'), 317 'next_refill_date' => !empty($next_refill_date) ? $next_refill_date : get_option('Home_Value_refill_date'), 318 'renewal_url' => !empty($renewal_url) ? $renewal_url : 'https://homevalueplugin.com/renew?key=' . get_option('Home_Value_home_value_api_key', ''), 319 'cancel_url' => !empty($cancel_url) ? $cancel_url : 'https://homevalueplugin.com/cancel?key=' . get_option('Home_Value_home_value_api_key', ''), 320 ); 321 322 update_option('home_values_general', $home_values_general); 323 324 // Check if already configured 325 $home_values_forms_check = home_values_get_setting('forms'); 326 $address_field_placeholder = isset($home_values_forms_check['address_field_placeholder']) ? $home_values_forms_check['address_field_placeholder'] : ''; 327 $submit_button_text = isset($home_values_forms_check['submit_button_text']) ? $home_values_forms_check['submit_button_text'] : ''; 328 $email_field_placeholder = isset($home_values_forms_check['email_field_placeholder']) ? $home_values_forms_check['email_field_placeholder'] : ''; 329 $first_name_field_placeholder = isset($home_values_forms_check['first_name_field_placeholder']) ? $home_values_forms_check['first_name_field_placeholder'] : ''; 330 $last_name_field_placeholder = isset($home_values_forms_check['last_name_field_placeholder']) ? $home_values_forms_check['last_name_field_placeholder'] : ''; 331 $phone_number_placeholder = isset($home_values_forms_check['phone_number_placeholder']) ? $home_values_forms_check['phone_number_placeholder'] : ''; 332 $lead_form_submit_button_text = isset($home_values_forms_check['lead_form_submit_button_text']) ? $home_values_forms_check['lead_form_submit_button_text'] : ''; 333 $address_found_messaging = isset($home_values_forms_check['address_found_messaging']) ? $home_values_forms_check['address_found_messaging'] : ''; 334 $address_not_found_messaging = isset($home_values_forms_check['address_not_found_messaging']) ? $home_values_forms_check['address_not_found_messaging'] : ''; 335 $form_thank_you_message = isset($home_values_forms_check['form_thank_you_message']) ? $home_values_forms_check['form_thank_you_message'] : ''; 336 337 $home_values_forms = array( 338 'address_field_placeholder' => get_option('Home_Value_address_search_form_address_input_placeholder') === 'No text' ? $address_field_placeholder : get_option('Home_Value_address_search_form_address_input_placeholder'), 339 'submit_button_text' => get_option('Home_Value_address_search_form_submit_button_text') === 'No text' ? $submit_button_text : get_option('Home_Value_address_search_form_submit_button_text'), 340 'email_field_placeholder' => !empty($email_field_placeholder) ? $email_field_placeholder : get_option('Home_Value_lead_form_email_placeholder'), 341 'show_first_name_field' => get_option('Home_Value_lead_form_first_name_visible') === 'on' || get_option('Home_Value_lead_form_first_name_visible') == 1 ? 1 : 0, 342 'require_first_name' => get_option('Home_Value_lead_form_first_name_required') === 'on' || get_option('Home_Value_lead_form_first_name_required') == 1 ? 1 : 0, 343 'first_name_field_placeholder' => get_option('Home_Value_lead_form_first_name_placeholder') === 'No text' ? $first_name_field_placeholder : get_option('Home_Value_lead_form_first_name_placeholder'), 344 'show_last_name_field' => get_option('Home_Value_lead_form_last_name_visible') === 'on' || get_option('Home_Value_lead_form_last_name_visible') == 1 ? 1 : 0, 345 'require_last_name_field' => get_option('Home_Value_lead_form_last_name_required') === 'on' || get_option('Home_Value_lead_form_last_name_required') == 1 ? 1 : 0, 346 'last_name_field_placeholder' => get_option('Home_Value_lead_form_last_name_placeholder') === 'No text' ? $last_name_field_placeholder : get_option('Home_Value_lead_form_last_name_placeholder'), 347 'show_phone_number_field' => get_option('Home_Value_lead_form_phone_visible') === 'on' || get_option('Home_Value_lead_form_phone_visible') == 1 ? 1 : 0, 348 'require_phone_number' => get_option('Home_Value_lead_form_phone_required') === 'on' || get_option('Home_Value_lead_form_phone_required') == 1 ? 1 : 0, 349 'phone_number_placeholder' => get_option('Home_Value_lead_form_phone_placeholder') === 'No text' ? $phone_number_placeholder : get_option('Home_Value_lead_form_phone_placeholder'), 350 'lead_form_submit_button_text' => get_option('Home_Value_lead_form_submit_button_text') === 'No text' ? $lead_form_submit_button_text : get_option('Home_Value_lead_form_submit_button_text'), 351 'address_found_messaging' => get_option('Home_Value_lead_form_address_found_text') === 'No text' ? $address_found_messaging : get_option('Home_Value_lead_form_address_found_text'), 352 'address_not_found_messaging' => get_option('Home_Value_lead_form_address_not_found_text') === 'No text' ? $address_not_found_messaging : get_option('Home_Value_lead_form_address_not_found_text'), 353 'form_thank_you_message' => get_option('Home_Value_no_address_page_text') === 'No text' ? $form_thank_you_message : get_option('Home_Value_no_address_page_text'), 354 ); 355 356 update_option('home_values_forms', $home_values_forms); 357 358 // Check if the home values emails option exists 359 $home_values_emails_check = home_values_get_setting('emails'); 360 $sender_email = isset($home_values_emails_check['sender_email']) ? $home_values_emails_check['sender_email'] : ''; 361 $sender_name = isset($home_values_emails_check['sender_name']) ? $home_values_emails_check['sender_name'] : ''; 362 $new_lead_recipients = isset($home_values_emails_check['new_lead_recipients']) ? $home_values_emails_check['new_lead_recipients'] : ''; 363 $new_lead_subject = isset($home_values_emails_check['new_lead_subject']) ? $home_values_emails_check['new_lead_subject'] : ''; 364 $new_lead_email = isset($home_values_emails_check['new_lead_email']) ? $home_values_emails_check['new_lead_email'] : ''; 365 366 367 $home_values_emails = array( 368 'sender_email' => !empty($sender_email) ? $sender_email : get_option('Home_Value_email_new_lead_sender_email'), 369 'sender_name' => !empty($sender_name) ? $sender_name : get_option('Home_Value_email_new_lead_sender_name'), 370 'new_lead_recipients' => !empty($new_lead_recipients) ? $new_lead_recipients : get_option('Home_Value_email_new_lead_recipients'), 371 'new_lead_subject' => get_option('Home_Value_email_new_lead_subject') === 'No text' ? $new_lead_subject : get_option('Home_Value_email_new_lead_subject'), 372 'new_lead_email' => get_option('Home_Value_email_new_lead_text') === 'No text' ? $new_lead_email : get_option('Home_Value_email_new_lead_text'), 373 ); 374 375 update_option('home_values_emails', $home_values_emails); 376 377 // Check if the home values debug option exists 378 $home_values_debug_check = home_values_get_setting('debug'); 379 $enable_debugging = isset($home_values_debug_check['enable_debugging']) ? $home_values_debug_check['enable_debugging'] : ''; 380 $debug_ips = isset($home_values_debug_check['debug_ips']) ? $home_values_debug_check['debug_ips'] : ''; 381 382 $home_values_debug = array( 383 'enable_debugging' => !empty($enable_debugging) ? $enable_debugging : 0, 384 'debug_ips' => !empty($debug_ips) ? $debug_ips : get_option('Home_Value_debug_ips'), 385 ); 386 387 update_option('home_values_debug', $home_values_debug); 42 388 } 43 389 } 390 44 391 45 392 private function set_default_settings() … … 48 395 $current_user = wp_get_current_user(); 49 396 50 $address_found_messaging = '<h3>Getting Your Value...</h3> Please complete the short form below to receive your instant home valuation!'; 51 $address_not_found_messaging = '<h3>Almost There!</h3> Please complete the quick form below to receive your detailed property evaluation!'; 52 53 $lead_email = '<p style="font-family: Arial;">New Value Requested for [8b_home_value_searched_address]</p> 54 <p style="font-family: Arial; line-height: 1.5;">Additional Details:</p> 55 <p style="font-family: Arial; line-height: 1.5;">Phone: [8b_home_value_phone]</p> 56 <p style="font-family: Arial; line-height: 1.5;">Email: [8b_home_value_email]</p> 57 <p style="font-family: Arial; line-height: 1.5;">Suggested Value: $[8b_home_value_data_valuation_medium]</p> 58 <p style="font-family: Arial; line-height: 1.5;">Home Specs: [8b_home_value_data_size]sqft [8b_home_value_data_beds] bed [8b_home_value_data_baths] bath</p> 59 '; 397 $address_found_messaging = '<p>We found your address!</p>'; 398 $address_not_found_messaging = '<p>We could not find your address.</p>'; 399 400 $lead_email = `<table width="100%" border="0" cellpadding="25" cellspacing="0" style="text-align:center;font-family: Helvetica Neue, Helvetica, Arial,' sans-serif';"> 401 <tbody> 402 <tr> 403 <td> 404 <table width="400" border="0" cellpadding="0" cellspacing="0"> 405 <tbody> 406 <tr style="background:#2969b0;"> 407 <td style="padding:20px; font-size: 22px;color:#fff;font-weight:bold; text-align:center;">New Value Request!</td> 408 </tr> 409 <tr> 410 <td style="text-align:center; background:#fafafa; border:1px solid #ddd; border-width: 0 1px"><p style="margin-top:40px">From:<br /> 411 <span style="font-size: 18px;font-weight:bold;">[8b_home_value_first_name] [8b_home_value_last_name]</span></p> 412 <p>Email:<br /> 413 <span style="font-size: 18px;font-weight:bold;">[8b_home_value_email]</span></p> 414 <p>Phone:<br /> 415 <span style="font-weight:bold;">[8b_home_value_phone]</span></p> 416 <p>Property Address:<br /> 417 <span style="font-weight:bold;">[8b_home_value_searched_address]</span></p> 418 <p>Median Value:<br /> 419 <span style="font-weight:bold;">$[8b_home_value_data_valuation_medium]</span></p> 420 <p style="margin-bottom: 50px">Home Specs:<br /> 421 <span style="font-weight:bold;">[8b_home_value_data_size]sqft | [8b_home_value_data_beds] bed | [8b_home_value_data_baths] bath</p> 422 423 </td> 424 </tr> 425 <tr style="background:#2969b0; height: 5px"> 426 <td> </td> 427 </tr> 428 </tbody> 429 </table> 430 </td> 431 </tr> 432 </tbody> 433 </table> 434 `; 60 435 61 436 $lead_admin_email = '<p style="font-family: Arial;">New Value Requested from [8b_home_value_first_name] [8b_home_value_last_name]!</p> … … 67 442 <p style="font-family: Arial; line-height: 1.5;">Home Specs: [8b_home_value_data_size]sqft [8b_home_value_data_beds] bed [8b_home_value_data_baths] bath</p>'; 68 443 69 $home_values_general = 70 array( 71 'api_key' => '', 72 'google_api_key' => 'AIzaSyAiWYbPJcpcZ95q8HLgHTbGNu7zWLBrDxY', 73 'adjust_values' => 0, 74 'lead_pool_blog' => 0, 75 'load_css' => 1, 76 'webhooks' => '', 77 'credits' => 0, 78 ); 79 $home_values_forms = 80 array( 81 'address_field_placeholder' => 'Address', 82 'submit_button_text' => 'Search', 83 'email_field_placeholder' => 'Email Address', 84 'show_first_name_field' => 1, 85 'require_first_name' => 0, 86 'first_name_field_placeholder' => 'First Name', 87 'show_last_name_field' => 1, 88 'require_last_name_field' => 0, 89 'last_name_field_placeholder' => 'Last Name', 90 'show_phone_number_field' => 1, 91 'require_phone_number' => 0, 92 'phone_number_placeholder' => 'Phone #', 93 'address_found_messaging' => $address_found_messaging, 94 'address_not_found_messaging' => $address_not_found_messaging, 95 'form_thank_you_message' => '<h4>Thank you very much for your submission!</h4>', 96 ); 97 $home_values_emails = 98 array( 99 'sender_email' => $current_user->user_email, 100 'sender_name' => get_bloginfo('name'), 101 'new_lead_recipients' => $current_user->user_email, 102 'new_lead_subject' => 'New Home Value Request from [8b_home_value_first_name] [8b_home_value_last_name]!', 103 'new_lead_email' => $lead_admin_email, 104 ); 444 445 $home_values_general = array( 446 'api_key' => '', 447 'google_api_key' => 'AIzaSyAiWYbPJcpcZ95q8HLgHTbGNu7zWLBrDxY', 448 'adjust_values' => 0, 449 'lead_pool_blog' => 0, 450 'load_css' => 1, 451 'webhooks' => '', 452 'credits' => 0, 453 'next_refill_date' => '', 454 'renewal_url' => 'https://homevalueplugin.com/renew', 455 'contact_url' => '', 456 ); 457 458 $home_values_forms = array( 459 'address_field_placeholder' => 'Address', 460 'submit_button_text' => 'Submit', 461 'email_field_placeholder' => 'Email Address', 462 'show_first_name_field' => 1, 463 'require_first_name' => 1, 464 'first_name_field_placeholder' => 'First Name', 465 'show_last_name_field' => 1, 466 'require_last_name_field' => 1, 467 'last_name_field_placeholder' => 'Last Name', 468 'show_phone_number_field' => 1, 469 'require_phone_number' => 1, 470 'phone_number_placeholder' => 'Phone Number', 471 'lead_form_submit_button_text' => 'Get My Values!', 472 'address_found_messaging' => $address_found_messaging, 473 'address_not_found_messaging' => $address_not_found_messaging, 474 'form_thank_you_message' => '<h4>Thank you very much for your submission!</h4>', 475 ); 476 477 $home_values_emails = array( 478 'sender_email' => $current_user->user_email, 479 'sender_name' => get_bloginfo('name'), 480 'new_lead_recipients' => $current_user->user_email, 481 'new_lead_subject' => 'New Home Value Request from [8b_home_value_first_name] [8b_home_value_last_name]!', 482 'new_lead_email' => $lead_admin_email, 483 ); 484 485 $home_values_debug = array( 486 'enable_debugging' => 0, 487 'debug_ips' => '', 488 ); 105 489 106 490 … … 113 497 switch_to_blog($blog_id); // Switch to each blog 114 498 115 // get current options 116 $current_home_values_general = $this->get_current_option_values()['home_values_general']; 117 $current_home_values_forms = $this->get_current_option_values()['home_values_forms']; 118 $current_home_values_emails = $this->get_current_option_values()['home_values_emails']; 119 120 // Fill in the blanks 121 foreach ($current_home_values_general as $key => $value) { 122 if (!isset($current_home_values_general[$key]) || $current_home_values_general[$key] == '') { 123 $current_home_values_general[$key] = $home_values_general[$key]; 124 } 125 } 126 foreach ($current_home_values_forms as $key => $value) { 127 if (!isset($current_home_values_forms[$key]) || $current_home_values_forms[$key] == '') { 128 $current_home_values_forms[$key] = $home_values_forms[$key]; 129 } 130 } 131 foreach ($current_home_values_emails as $key => $value) { 132 if (!isset($current_home_values_emails[$key]) || $current_home_values_emails[$key] == '') { 133 $current_home_values_emails[$key] = $home_values_emails[$key]; 134 } 135 } 136 137 write_log('Migrating Blog Settings'); 499 // Update options 500 update_option('home_values_general', $home_values_general); 501 update_option('home_values_forms', $home_values_forms); 502 update_option('home_values_emails', $home_values_emails); 503 update_option('home_values_debug', $home_values_debug); 504 505 write_log('Setting Defaults for blog: ' . $blog_id . ''); 138 506 write_log($blog_id); 139 write_log($current_home_values_general); 140 write_log($current_home_values_forms); 141 write_log($current_home_values_emails); 142 143 144 // Migrate options 145 update_option('home_values_general', array_merge($home_values_general, $current_home_values_general)); 146 update_option('home_values_forms', array_merge($home_values_forms, $current_home_values_forms)); 147 update_option('home_values_emails', array_merge($home_values_emails, $current_home_values_emails)); 507 write_log($home_values_general); 508 write_log($home_values_forms); 509 write_log($home_values_emails); 148 510 } 149 511 restore_current_blog(); // Switch back to the current blog 150 512 151 // Migrate Site settings 152 // get current options 153 $current_home_values_general = $this->get_current_option_values(true)['home_values_general']; 154 $current_home_values_forms = $this->get_current_option_values(true)['home_values_forms']; 155 $current_home_values_emails = $this->get_current_option_values(true)['home_values_emails']; 156 157 // Fill in the blanks 158 foreach ($current_home_values_general as $key => $value) { 159 if (!isset($current_home_values_general[$key]) || $current_home_values_general[$key] == '') { 160 $current_home_values_general[$key] = $home_values_general[$key]; 161 } 162 } 163 foreach ($current_home_values_forms as $key => $value) { 164 if (!isset($current_home_values_forms[$key]) || $current_home_values_forms[$key] == '') { 165 $current_home_values_forms[$key] = $home_values_forms[$key]; 166 } 167 } 168 foreach ($current_home_values_emails as $key => $value) { 169 if (!isset($current_home_values_emails[$key]) || $current_home_values_emails[$key] == '') { 170 $current_home_values_emails[$key] = $home_values_emails[$key]; 171 } 172 } 173 174 write_log('Migrating Site Settings'); 175 write_log($current_home_values_general); 176 write_log($current_home_values_forms); 177 write_log($current_home_values_emails); 178 179 // Migrate options 180 update_site_option('home_values_general', array_merge($home_values_general, $current_home_values_general)); 181 update_site_option('home_values_forms', array_merge($home_values_forms, $current_home_values_forms)); 182 update_site_option('home_values_emails', array_merge($home_values_emails, $current_home_values_emails)); 513 // Update Site Options 514 update_site_option('home_values_general', $home_values_general); 515 update_site_option('home_values_forms', $home_values_forms); 516 update_site_option('home_values_emails', $home_values_emails); 517 update_site_option('home_values_debug', $home_values_debug); 183 518 } else { 184 519 185 // Migrate options 186 // get current options 187 $current_home_values_general = $this->get_current_option_values()['home_values_general']; 188 $current_home_values_forms = $this->get_current_option_values()['home_values_forms']; 189 $current_home_values_emails = $this->get_current_option_values()['home_values_emails']; 190 191 // Fill in the blanks 192 foreach ($current_home_values_general as $key => $value) { 193 if (!isset($current_home_values_general[$key]) || $current_home_values_general[$key] == '') { 194 $current_home_values_general[$key] = $home_values_general[$key]; 195 } 196 } 197 foreach ($current_home_values_forms as $key => $value) { 198 if (!isset($current_home_values_forms[$key]) || $current_home_values_forms[$key] == '') { 199 $current_home_values_forms[$key] = $home_values_forms[$key]; 200 } 201 } 202 foreach ($current_home_values_emails as $key => $value) { 203 if (!isset($current_home_values_emails[$key]) || $current_home_values_emails[$key] == '') { 204 $current_home_values_emails[$key] = $home_values_emails[$key]; 205 } 206 } 207 208 // Migrate options 209 update_option('home_values_general', array_merge($home_values_general, $current_home_values_general)); 210 update_option('home_values_forms', array_merge($home_values_forms, $current_home_values_forms)); 211 update_option('home_values_emails', array_merge($home_values_emails, $current_home_values_emails)); 520 // Update Options 521 update_option('home_values_general', $home_values_general); 522 update_option('home_values_forms', $home_values_forms); 523 update_option('home_values_emails', $home_values_emails); 524 update_option('home_values_debug', $home_values_debug); 212 525 } 213 526 } 214 215 private function migrate_settings()216 {217 218 // if is multisite update site options as well219 if (is_multisite()) {220 // Get all blog ids221 $blog_ids = get_sites(array('fields' => 'ids'));222 223 foreach ($blog_ids as $blog_id) {224 switch_to_blog($blog_id); // Switch to each blog225 226 $old_values = $this->get_old_option_values();227 228 // Migrate options229 update_option('home_values_general', $old_values['home_values_general']);230 update_option('home_values_forms', $old_values['home_values_forms']);231 update_option('home_values_emails', $old_values['home_values_emails']);232 }233 restore_current_blog(); // Switch back to the current blog234 235 $old_values = $this->get_old_option_values();236 237 // Migrate Site settings238 update_site_option('home_values_general', $old_values['home_values_general']);239 update_site_option('home_values_forms', $old_values['home_values_forms']);240 update_site_option('home_values_emails', $old_values['home_values_emails']);241 } else {242 243 $old_values = $this->get_old_option_values();244 // Migrate options245 update_option('home_values_general', $old_values['home_values_general']);246 update_option('home_values_forms', $old_values['home_values_forms']);247 update_option('home_values_emails', $old_values['home_values_emails']);248 }249 }250 251 public function get_old_option_values()252 {253 $home_values_general =254 array(255 'api_key' => hv_get_old_option('home_value_api_key') ? hv_get_old_option('home_value_api_key') : '',256 'google_api_key' => hv_get_old_option('google_api_key') ? hv_get_old_option('google_api_key') : 'AIzaSyAiWYbPJcpcZ95q8HLgHTbGNu7zWLBrDxY',257 'adjust_values' => hv_get_old_option('home_extra_value') ? hv_get_old_option('home_extra_value') : 0,258 'lead_pool_blog' => hv_get_old_option('lead_pool_blog') ? hv_get_old_option('lead_pool_blog') : 0,259 'load_css' => hv_get_old_option('load_css') ? hv_get_old_option('load_css') : 1,260 'webhooks' => hv_get_old_option('new_lead_webhooks') ? hv_get_old_option('new_lead_webhooks') : '',261 'next_refill_date' => hv_get_old_option('refill_date') ? hv_get_old_option('refill_date') : '',262 'credits' => hv_get_old_option('results_left') ? hv_get_old_option('results_left') : 0,263 );264 $home_values_forms =265 array(266 'address_field_placeholder' => hv_get_old_option('address_search_form_address_input_placeholder') ? hv_get_old_option('address_search_form_address_input_placeholder') : 'Address',267 'submit_button_text' => hv_get_old_option('address_search_form_submit_button_text') ? hv_get_old_option('address_search_form_submit_button_text') : 'Search',268 'email_field_placeholder' => hv_get_old_option('lead_form_email_placeholder') ? hv_get_old_option('lead_form_email_placeholder') : 'Email Address',269 'show_first_name_field' => hv_get_old_option('lead_form_first_name_visible') == 'on' ? 1 : 1,270 'require_first_name' => hv_get_old_option('lead_form_first_name_required') == 'on' ? 1 : 0,271 'first_name_field_placeholder' => hv_get_old_option('lead_form_first_name_placeholder') ? hv_get_old_option('lead_form_first_name_placeholder') : 'First Name',272 'show_last_name_field' => hv_get_old_option('lead_form_last_name_visible') == 'on' ? 1 : 1,273 'require_last_name_field' => hv_get_old_option('lead_form_last_name_required') == 'on' ? 1 : 0,274 'last_name_field_placeholder' => hv_get_old_option('lead_form_last_name_placeholder') ? hv_get_old_option('lead_form_last_name_placeholder') : '',275 'show_phone_number_field' => hv_get_old_option('lead_form_phone_visible' == 'on') ? 1 : 1,276 'require_phone_number' => hv_get_old_option('lead_form_phone_required') == 'on' ? 1 : 0,277 'phone_number_placeholder' => hv_get_old_option('lead_form_phone_placeholder') ? hv_get_old_option('lead_form_phone_placeholder') : '',278 'address_found_messaging' => hv_get_old_option('lead_form_address_found_text') ? hv_get_old_option('lead_form_address_found_text') : '',279 'address_not_found_messaging' => hv_get_old_option('lead_form_address_not_found_text') ? hv_get_old_option('lead_form_address_not_found_text') : '',280 'form_thank_you_message' => '',281 );282 $home_values_emails =283 array(284 'sender_email' => hv_get_old_option('email_new_lead_sender_email') ? hv_get_old_option('email_new_lead_sender_email') : '',285 'sender_name' => hv_get_old_option('email_new_lead_sender_name') ? hv_get_old_option('email_new_lead_sender_name') : '',286 'new_lead_recipients' => hv_get_old_option('email_new_lead_recipients') ? hv_get_old_option('email_new_lead_recipients') : '',287 'new_lead_subject' => hv_get_old_option('email_new_lead_subject') ? hv_get_old_option('email_new_lead_subject') : '',288 'new_lead_email' => hv_get_old_option('email_new_lead_text') ? hv_get_old_option('email_new_lead_text') : '',289 );290 291 return array(292 'home_values_general' => $home_values_general,293 'home_values_forms' => $home_values_forms,294 'home_values_emails' => $home_values_emails,295 );296 }297 298 function get_current_option_values($multisite = false)299 {300 if ($multisite) {301 $home_values_general = get_site_option('home_values_general', array());302 $home_values_forms = get_site_option('home_values_forms', array());303 $home_values_emails = get_site_option('home_values_emails', array());304 } else {305 $home_values_general = get_option('home_values_general', array());306 $home_values_forms = get_option('home_values_forms', array());307 $home_values_emails = get_option('home_values_emails', array());308 }309 310 return array(311 'home_values_general' => $home_values_general,312 'home_values_forms' => $home_values_forms,313 'home_values_emails' => $home_values_emails,314 );315 }316 527 } -
home-value/trunk/includes/home-values-functions.php
r2931195 r2931593 191 191 { 192 192 $plugin_name = 'home_values'; 193 194 // Combine the plugin name and the settings tab.195 193 $full_settings_tab = $plugin_name . '_' . $settings_tab; 196 194 $local_options = get_option($full_settings_tab); 197 198 // if the option name is empty, return the entire settings tab. 195 $site_options = get_site_option($full_settings_tab); 196 199 197 if (empty($option_name)) { 200 // if the local options are set, return them.201 198 if (false !== $local_options && !empty($local_options)) { 202 return $local_options; 203 } 204 205 // If the local options are not set or 'use site option' is selected, return the site options. 206 $site_options = get_site_option($full_settings_tab); 199 // Merge with custom logic 200 foreach ($local_options as $key => $value) { 201 if (!empty($value)) { 202 $site_options[$key] = $value; 203 } 204 } 205 return $site_options; 206 } 207 207 return $site_options; 208 208 } else { 209 // Check if the local option is set.210 209 $local_option = $local_options[$option_name] ?? false; 211 212 // If the local option is set, return it.213 210 if (false !== $local_option && !empty($local_option)) { 214 211 return $local_option; 215 212 } 216 217 // If the local option is not set or 'use site option' is selected, return the site option.218 $site_options = get_site_option($full_settings_tab);219 213 $site_option = $site_options[$option_name] ?? $default; 220 214 return $site_option; 221 215 } 222 223 return false; 224 } 216 return !empty($default) ? $default : false; 217 } 218 225 219 226 220 function home_values_update_setting($settings_tab, $option_name, $option_value) -
home-value/trunk/public/_notes/dwsync.xml
r2931195 r2931593 2 2 <dwsync> 3 3 <file name="class-home-values-public.php" server="45.63.90.215" local="133269412740000000" remote="133269412740000000" Dst="0" /> 4 <file name="class-home-values-shortcodes.php" server="45.63.90.215" local="1333 11687410000000" remote="133311687410000000" Dst="0" />4 <file name="class-home-values-shortcodes.php" server="45.63.90.215" local="133323817980000000" remote="133323817980000000" Dst="0" /> 5 5 <file name="index.php" server="45.63.90.215" local="133265851640000000" remote="133265851640000000" Dst="0" /> 6 6 </dwsync> -
home-value/trunk/public/class-home-values-shortcodes.php
r2931195 r2931593 24 24 add_action('wp_ajax_home_value_search_form', array($this, 'ajax_generate_8b_home_value_shortcode')); 25 25 add_action('wp_ajax_nopriv_home_value_search_form', array($this, 'ajax_generate_8b_home_value_shortcode')); 26 27 // set cookie 28 add_action('init', array($this, 'set_session_cookie')); 29 } 30 31 public function set_session_cookie() 32 { 33 start_hv_session(); 26 34 } 27 35 … … 72 80 } 73 81 } 74 75 start_hv_session();76 82 77 83 ob_start(); -
home-value/trunk/public/css/_notes/dwsync.xml
r2931195 r2931593 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="home-values-public.css" server="45.63.90.215" local="13332 0299890000000" remote="133320299890000000" Dst="0" />3 <file name="home-values-public.css" server="45.63.90.215" local="133323827302434509" remote="133323827310000000" Dst="0" /> 4 4 </dwsync> -
home-value/trunk/readme.txt
r2931195 r2931593 80 80 == Changelog == 81 81 82 = 3.0.3 20230627 = 83 84 * Array and session fixes along with Wordpress MU updates 85 82 86 = 3.0.1 20230626 = 83 87 -
home-value/trunk/templates/forms/_notes/dwsync.xml
r2931195 r2931593 2 2 <dwsync> 3 3 <file name="address-search-page.php" server="45.63.90.215" local="133311624980000000" remote="133311624980000000" Dst="0" /> 4 <file name="lead-form.php" server="45.63.90.215" local="133 280711740000000" remote="133280711740000000" Dst="0" />4 <file name="lead-form.php" server="45.63.90.215" local="133323690480000000" remote="133323690480000000" Dst="0" /> 5 5 <file name="results-page.php" server="45.63.90.215" local="133322989040000000" remote="133322989040000000" Dst="0" /> 6 6 <file name="lead-info-page.php" server="45.63.90.215" local="133275570930000000" remote="133275570930000000" Dst="0" /> -
home-value/trunk/templates/forms/lead-form.php
r2931195 r2931593 23 23 <div class="form_item hv_submit button-primary"> 24 24 25 <input class="button-primary submit" id="button_submit" name="8b_home_value[submit]" type="submit" value="Submit"> 25 <input class="button-primary submit" id="button_submit" name="8b_home_value[submit]" type="submit" value="<?php $submit_label = !empty($lead_form_submit_button_text) ? $lead_form_submit_button_text : 'Get My Values!'; 26 echo $submit_label; ?>"> 26 27 27 28 </div>
Note: See TracChangeset
for help on using the changeset viewer.