26bb6a8a by Jeff Balicki

fixed titles

1 parent 06468163
...@@ -69,6 +69,7 @@ function display_page() ...@@ -69,6 +69,7 @@ function display_page()
69 69
70 $type = $_POST['type']; 70 $type = $_POST['type'];
71 $title = $_POST['title']; 71 $title = $_POST['title'];
72
72 $sendto = $_POST['sendto']; 73 $sendto = $_POST['sendto'];
73 $executeDate = ($type == 'scheduled' || $type == 'newsletter') ? $_POST['execute_date'] : '0000-00-00 00:00:00'; 74 $executeDate = ($type == 'scheduled' || $type == 'newsletter') ? $_POST['execute_date'] : '0000-00-00 00:00:00';
74 $trigger = ($type == 'scheduled' || $type == 'newsletter') ? 'scheduled-cron-job' : $_POST['trigger']; 75 $trigger = ($type == 'scheduled' || $type == 'newsletter') ? 'scheduled-cron-job' : $_POST['trigger'];
...@@ -101,7 +102,7 @@ function display_page() ...@@ -101,7 +102,7 @@ function display_page()
101 $system = $_POST[$lang . '_system']; 102 $system = $_POST[$lang . '_system'];
102 103
103 $pushMessageTime = $_POST[$lang . '_push_notifications_time']; 104 $pushMessageTime = $_POST[$lang . '_push_notifications_time'];
104 $title = $_POST[$lang . '_push_notifications_title']; 105 $push_title = $_POST[$lang . '_push_notifications_title'];
105 $message = $_POST[$lang . '_push_notifications_message']; 106 $message = $_POST[$lang . '_push_notifications_message'];
106 $link = $_POST[$lang . '_push_notifications_link']; 107 $link = $_POST[$lang . '_push_notifications_link'];
107 $status = $_POST[$lang . '_push_notifications_status']; 108 $status = $_POST[$lang . '_push_notifications_status'];
...@@ -130,7 +131,7 @@ function display_page() ...@@ -130,7 +131,7 @@ function display_page()
130 $pushMessageData, 131 $pushMessageData,
131 [ 132 [
132 'push_message_time' => $pushMessageTime, 133 'push_message_time' => $pushMessageTime,
133 $lang . '_title' => $title, 134 $lang . '_title' => $push_title,
134 $lang . '_message' => $message, 135 $lang . '_message' => $message,
135 $lang . '_link' => $link, 136 $lang . '_link' => $link,
136 $lang . '_status' => $status, 137 $lang . '_status' => $status,
...@@ -431,7 +432,7 @@ function create_notification() ...@@ -431,7 +432,7 @@ function create_notification()
431 $system = $_POST[$lang . '_system']; 432 $system = $_POST[$lang . '_system'];
432 433
433 $pushMessageTime = $_POST[$lang . '_push_notifications_time']; 434 $pushMessageTime = $_POST[$lang . '_push_notifications_time'];
434 $title = $_POST[$lang . '_push_notifications_title']; 435 $push_title = $_POST[$lang . '_push_notifications_title'];
435 $message = $_POST[$lang . '_push_notifications_message']; 436 $message = $_POST[$lang . '_push_notifications_message'];
436 $link = $_POST[$lang . '_push_notifications_link']; 437 $link = $_POST[$lang . '_push_notifications_link'];
437 $status = $_POST[$lang . '_push_notifications_status']; 438 $status = $_POST[$lang . '_push_notifications_status'];
...@@ -457,7 +458,7 @@ function create_notification() ...@@ -457,7 +458,7 @@ function create_notification()
457 $pushMessageData, 458 $pushMessageData,
458 [ 459 [
459 'push_message_time' => $pushMessageTime, 460 'push_message_time' => $pushMessageTime,
460 $lang . '_title' => $title, 461 $lang . '_title' => $push_title,
461 $lang . '_message' => $message, 462 $lang . '_message' => $message,
462 $lang . '_link' => $link, 463 $lang . '_link' => $link,
463 $lang . '_status' => $status, 464 $lang . '_status' => $status,
......
...@@ -6,6 +6,7 @@ use Tz\WordPress\Tools\Notifications\Settings; ...@@ -6,6 +6,7 @@ use Tz\WordPress\Tools\Notifications\Settings;
6 6
7 function getInputFormValues($validation, $name) 7 function getInputFormValues($validation, $name)
8 { 8 {
9
9 return ($validation->set_value($name) != '') ? $validation->set_value($name) : (!empty($_POST[$name])) ? $_POST[$name] : ''; 10 return ($validation->set_value($name) != '') ? $validation->set_value($name) : (!empty($_POST[$name])) ? $_POST[$name] : '';
10 } 11 }
11 $newsletter = get_posts_with_fallback( 12 $newsletter = get_posts_with_fallback(
......