Changeset 1797365
- Timestamp:
- 01/05/2018 02:48:03 AM (8 years ago)
- Location:
- mailtarget-form/trunk
- Files:
-
- 7 edited
-
MailtargetFormPlugin.php (modified) (12 diffs)
-
include/mailtarget_popup.php (modified) (3 diffs)
-
views/admin/form_popup.php (modified) (2 diffs)
-
views/admin/wp_form_add.php (modified) (1 diff)
-
views/admin/wp_form_edit.php (modified) (2 diffs)
-
views/render/popup.php (modified) (2 diffs)
-
views/render/widget.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mailtarget-form/trunk/MailtargetFormPlugin.php
r1797363 r1797365 126 126 register_setting($this->option_group, 'mtg_popup_description'); 127 127 register_setting($this->option_group, 'mtg_popup_submit'); 128 register_setting($this->option_group, 'mtg_popup_redirect'); 128 129 } 129 130 … … 159 160 'mtg_popup_height' => $_POST['popup_height'], 160 161 'mtg_popup_delay' => $_POST['popup_delay'], 162 'mtg_popup_title' => $_POST['popup_title'], 163 'mtg_popup_description' => $_POST['popup_description'], 164 'mtg_popup_redirect' => $_POST['popup_redirect'], 161 165 ); 162 166 update_option('mtg_popup_form_id', $data['mtg_popup_form_id']); … … 165 169 update_option('mtg_popup_height', $data['mtg_popup_height']); 166 170 update_option('mtg_popup_delay', $data['mtg_popup_delay']); 171 update_option('mtg_popup_title', $data['mtg_popup_title']); 172 update_option('mtg_popup_description', $data['mtg_popup_description']); 173 update_option('mtg_popup_redirect', $data['mtg_popup_redirect']); 167 174 wp_redirect('admin.php?page=mailtarget-form-plugin--admin-menu-popup-main'); 168 175 break; … … 180 187 'widget_description' => $_POST['widget_description'], 181 188 'widget_submit_desc' => $_POST['widget_submit_desc'], 189 'widget_redir' => $_POST['widget_redir'], 182 190 )) 183 191 ); … … 198 206 'widget_description' => $_POST['widget_description'], 199 207 'widget_submit_desc' => $_POST['widget_submit_desc'], 208 'widget_redir' => $_POST['widget_redir'], 200 209 )) 201 210 ); … … 226 235 $res = $api->submit($input, $form['url']); 227 236 $res = json_encode($res); 228 if ($res === 'true') wp_redirect(wp_get_referer()); 237 $url = wp_get_referer(); 238 if (isset($_POST['mailtarget_form_mode'])) { 239 $popupUrl = esc_attr(get_option('mtg_popup_redirect')); 240 if ($_POST['mailtarget_form_mode'] == 'popup' and $popupUrl != '') { 241 $url = $popupUrl; 242 } 243 } 244 if (isset($_POST['mailtarget_form_redir'])) $url = $_POST['mailtarget_form_redir']; 245 if ($res === 'true') wp_redirect($url); 229 246 break; 230 247 default: … … 296 313 } 297 314 $valid = $this->is_key_valid(); 298 if ($valid === false) { 299 ?><p>Problem connecting to mailtarget server e</p><?php 300 } else { 315 if ($valid === true) { 301 316 global $wpdb, $forms; 302 317 … … 315 330 } 316 331 $valid = $this->is_key_valid(); 317 if ($valid === false) { 318 ?><p>Problem connecting to mailtarget server e</p><?php 319 } else { 332 if ($valid === true) { 320 333 $api = $this->get_api(); 321 334 if (!$api) return null; … … 335 348 } 336 349 $valid = $this->is_key_valid(); 337 if ($valid === false) { 338 ?><p>Problem connecting to mailtarget server e</p><?php 339 } else { 350 if ($valid === true) { 340 351 if (!isset($_GET['form_id'])) return false; 341 352 $formId = $_GET['form_id']; … … 357 368 } 358 369 $valid = $this->is_key_valid(); 359 if ($valid === false) { 360 ?><p>Problem connecting to mailtarget server e</p><?php 361 } else { 370 if ($valid === true) { 362 371 global $wpdb; 363 372 $widgetId = sanitize_key($_GET['id']); … … 385 394 $valid = $this->is_key_valid(true); 386 395 387 if ($valid === false) { 388 ?><p>Problem connecting to mailtarget server e</p><?php 389 } else { 396 if ($valid !== false) { 390 397 require_once(MAILTARGET_PLUGIN_DIR.'/views/admin/setup.php'); 391 398 } … … 398 405 $valid = $this->is_key_valid(); 399 406 400 if ($valid === false) { 401 ?><p>Problem connecting to mailtarget server e</p><?php 402 } else { 407 if ($valid === true) { 403 408 $formId = ''; 404 409 $formName = ''; -
mailtarget-form/trunk/include/mailtarget_popup.php
r1797362 r1797365 5 5 public static function init () { 6 6 $formId = esc_attr(get_option('mtg_popup_form_id')); 7 $delay = esc_attr(get_option('mtg_popup_delay')) * 1000; 7 8 if ($formId == '') return false; 8 9 require_once MAILTARGET_PLUGIN_DIR . '/include/mailtarget_form.php'; … … 13 14 </div> 14 15 <script> 16 var delay = <?php echo $delay ?>; 15 17 var modal = new tingle.modal({ 16 18 footer: false, … … 30 32 }); 31 33 modal.setContent(document.querySelector('.mtg-popup-modal').innerHTML); 32 modal.open() 34 setTimeout(function () { 35 modal.open() 36 }, delay) 33 37 </script> 34 38 <?php -
mailtarget-form/trunk/views/admin/form_popup.php
r1797363 r1797365 25 25 </tr> 26 26 <tr class="user-rich-editing-wrap"> 27 <th>Title</th> 28 <td> 29 <input type="text" class="regular-text" name="popup_title" value="<?php echo esc_attr(get_option('mtg_popup_title')); ?>"> 30 </td> 31 </tr> 32 <tr class="user-rich-editing-wrap"> 33 <th>Description</th> 34 <td> 35 <textarea class="regular-text" name="popup_description"><?php echo esc_attr(get_option('mtg_popup_description')); ?></textarea> 36 <p>* you may fill with plain text or html</p> 37 </td> 38 </tr> 39 <tr class="user-rich-editing-wrap"> 27 40 <th>Width</th> 28 41 <td> … … 40 53 <td> 41 54 <input type="number" class="regular-text" name="popup_delay" value="<?php echo esc_attr(get_option('mtg_popup_delay')); ?>"> 55 </td> 56 </tr> 57 <tr class="user-rich-editing-wrap"> 58 <th>Redirect Url</th> 59 <td> 60 <input type="text" class="regular-text" name="popup_redirect" value="<?php echo esc_attr(get_option('mtg_popup_redirect')); ?>"> 61 <p>* please fill with a valid url</p> 42 62 </td> 43 63 </tr> -
mailtarget-form/trunk/views/admin/wp_form_add.php
r1797363 r1797365 40 40 </tr> 41 41 42 <tr class="user-rich-editing-wrap"> 43 <th>Redirect Url</th> 44 <td> 45 <input type="text" class="regular-text" name="widget_redir"> 46 </td> 47 </tr> 42 48 <tr> 43 49 <td></td> -
mailtarget-form/trunk/views/admin/wp_form_edit.php
r1797360 r1797365 4 4 $widget_description = ''; 5 5 $widget_submit_desc = ''; 6 $widget_redir = ''; 6 7 7 8 if (isset($data->widget_title)) $widget_title = $data->widget_title; 8 9 if (isset($data->widget_description)) $widget_description = $data->widget_description; 9 10 if (isset($data->widget_submit_desc)) $widget_submit_desc = $data->widget_submit_desc; 11 if (isset($data->widget_redir)) $widget_redir = $data->widget_redir; 10 12 ?> 11 13 <div class="wrap"> … … 49 51 </td> 50 52 </tr> 53 <tr class="user-rich-editing-wrap"> 54 <th>Redirect Url</th> 55 <td> 56 <input type="text" class="regular-text" name="widget_redir" value="<?php echo $widget_redir ?>"> 57 </td> 58 </tr> 51 59 52 60 <tr> -
mailtarget-form/trunk/views/render/popup.php
r1797362 r1797365 1 1 <?php 2 2 $title = esc_attr(get_option('mtg_popup_title')); 3 $description = esc_attr(get_option('mtg_popup_description'));3 $description = get_option('mtg_popup_description'); 4 4 $submitTitle = esc_attr(get_option('mtg_popup_submit')); 5 5 if ($submitTitle === '') $submitTitle = 'Submit'; … … 36 36 <div class="mt-c-form__btn-action"> 37 37 <input type="hidden" value="submit_form" name="mailtarget_form_action"> 38 <input type="hidden" value="popup" name="mailtarget_form_mode"> 38 39 <input type="hidden" value="<?php echo $form['formId'] ?>" name="mailtarget_form_id"> 39 40 <input type="submit" class="mt-o-btn mt-btn-submit" value="<?php echo $submitTitle ?>"> -
mailtarget-form/trunk/views/render/widget.php
r1797356 r1797365 1 1 <?php 2 $title = $widget['data']['widget_title']; 3 $description = $widget['data']['widget_description']; 4 $submitTitle = $widget['data']['widget_submit_desc']; 2 $title = ''; 3 $description = ''; 4 $submitTitle = ''; 5 $redirUlr = ''; 6 7 $data = $widget['data']; 8 if (isset($data['widget_title'])) $title = $data['widget_title']; 9 if (isset($data['widget_description'])) $description = $data['widget_description']; 10 if (isset($data['widget_submit_desc'])) $submitTitle = $data['widget_submit_desc']; 11 if (isset($data['widget_redir'])) $redirUlr = $data['widget_redir']; 12 5 13 if ($submitTitle === '') $submitTitle = 'Submit'; 6 14 ?> … … 36 44 <div class="mt-c-form__btn-action"> 37 45 <input type="hidden" value="submit_form" name="mailtarget_form_action"> 46 <input type="hidden" value="<?php echo $redirUlr ?>" name="mailtarget_form_redir"> 38 47 <input type="hidden" value="<?php echo $form['formId'] ?>" name="mailtarget_form_id"> 39 48 <input type="submit" class="mt-o-btn mt-btn-submit" value="<?php echo $submitTitle ?>">
Note: See TracChangeset
for help on using the changeset viewer.