diff --git a/html/includes/forms/update-config-item.inc.php b/html/includes/forms/update-config-item.inc.php index e76a412576..dff681cebd 100644 --- a/html/includes/forms/update-config-item.inc.php +++ b/html/includes/forms/update-config-item.inc.php @@ -44,11 +44,11 @@ elseif ($action == 'update-textarea') { $db_id[] = dbInsert(array('config_name' => 'alert.transports.boxcar.'.$config_id.'.'.$k, 'config_value' => $v, 'config_group' => 'alerting', 'config_sub_group' => 'transports', 'config_default' => $v, 'config_descr' => 'Boxcar Transport'), 'config'); } elseif ($config_type == 'clickatell') { - $db_id[] = dbInsert(array('config_name' => 'alert.transports.clickatell.'.$config_id.'.to.'.$x, 'config_value' => $k, 'config_group' => 'alerting', 'config_sub_group' => 'transports', 'config_default' => $v, 'config_descr' => 'Clickatell Transport'), 'config'); + $db_id[] = dbInsert(array('config_name' => 'alert.transports.clickatell.to.'.$x, 'config_value' => $k, 'config_group' => 'alerting', 'config_sub_group' => 'transports', 'config_default' => $v, 'config_descr' => 'Clickatell Transport'), 'config'); $x++; } elseif ($config_type == 'playsms') { - $db_id[] = dbInsert(array('config_name' => 'alert.transports.playsms.'.$config_id.'.to.'.$x, 'config_value' => $k, 'config_group' => 'alerting', 'config_sub_group' => 'transports', 'config_default' => $v, 'config_descr' => 'PlaySMS Transport'), 'config'); + $db_id[] = dbInsert(array('config_name' => 'alert.transports.playsms.to.'.$x, 'config_value' => $k, 'config_group' => 'alerting', 'config_sub_group' => 'transports', 'config_default' => $v, 'config_descr' => 'PlaySMS Transport'), 'config'); $x++; } } @@ -73,10 +73,10 @@ elseif ($action == 'update-textarea') { dbDelete('config', "(`config_name` LIKE 'alert.transports.boxcar.$config_id.%' AND (`config_name` != 'alert.transports.boxcar.$config_id.access_token' AND `config_name` != 'alert.transports.boxcar.$config_id.userkey') AND `config_id` NOT IN ($db_inserts))"); } elseif ($config_type == 'clickatell') { - dbDelete('config', "(`config_name` LIKE 'alert.transports.clickatell.$config_id.%' AND (`config_name` != 'alert.transports.clickatell.$config_id.token') AND `config_id` NOT IN ($db_inserts))"); + dbDelete('config', "(`config_name` LIKE 'alert.transports.clickatell.to.%' AND `config_id` NOT IN ($db_inserts))"); } elseif ($config_type == 'playsms') { - dbDelete('config', "(`config_name` LIKE 'alert.transports.playsms.$config_id.%' AND (`config_name` != 'alert.transports.playsms.$config_id.url' AND `config_name` != 'alert.transports.playsms.$config_id.from' AND `config_name` != 'alert.transports.playsms.$config_id.user' AND `config_name` != 'alert.transports.playsms.$config_id.token') AND `config_id` NOT IN ($db_inserts))"); + dbDelete('config', "(`config_name` LIKE 'alert.transports.playsms.to.%' AND `config_id` NOT IN ($db_inserts))"); } } diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php index c8ca74e6dc..d75feec06b 100644 --- a/html/pages/settings/alerting.inc.php +++ b/html/pages/settings/alerting.inc.php @@ -173,74 +173,6 @@ $no_refresh = true; - - - - - - - - - + '; + +$clickatell = get_config_by_name('alert.transports.clickatell.token'); +$mobiles = get_config_like_name('alert.transports.clickatell.to.%'); +$new_mobiles = array(); +foreach ($mobiles as $mobile) { + $new_mobiles[] = $mobile['config_value']; +} +$upd_mobiles = implode(PHP_EOL, $new_mobiles); + +echo '

@@ -796,63 +738,34 @@ echo '
-
-
- +
+ +
+ +
-
'; -$clickatells = get_config_like_name('alert.transports.clickatell.%.token'); -foreach ($clickatells as $clickatell) { - $to = get_config_like_name('alert.transports.clickatell.'.$clickatell['config_id'].'.to.'); - $new_extra = array(); - unset($upd_extra); - foreach ($to as $number) { - $split_extra = explode('.', $number['config_name']); - if ($split_extra[4] != 'token') { - $new_extra[] = $number['config_value']; - } - } - $upd_extra = implode(PHP_EOL, $new_extra); - echo '
-
- -
- - -
-
- -
-
-
-
- - -
-
-
'; -}//end foreach - -echo '
-
- -
- - -
-
- -
-
-
-
- -
+
+
+ +
+ +
-
+
'; +$playsms_url = get_config_by_name('alert.transports.playsms.url'); +$playsms_user = get_config_by_name('alert.transports.playsms.user'); +$playsms_token = get_config_by_name('alert.transports.playsms.token'); +$playsms_from = get_config_by_name('alert.transports.playsms.from'); +$mobiles = get_config_like_name('alert.transports.playsms.to.%'); +$new_mobiles = array(); +foreach ($mobiles as $mobile) { + $new_mobiles[] = $mobile['config_value']; +} +$upd_mobiles = implode(PHP_EOL, $new_mobiles); +echo '

@@ -861,105 +774,40 @@ echo '
-
-
- -
-
'; -$playsms = get_config_like_name('alert.transports.playsms.%.url'); -foreach ($playsms as $item) { - $playsms_user = get_config_by_name('alert.transports.playsms.'.$item['config_id'].'.user'); - $playsms_token = get_config_by_name('alert.transports.playsms.'.$item['config_id'].'.token'); - $playsms_from = get_config_by_name('alert.transports.playsms.'.$item['config_id'].'.from'); - $to = get_config_like_name('alert.transports.playsms.'.$item['config_id'].'.to.'); - $new_extra = array(); - unset($upd_extra); - foreach ($to as $number) { - $split_extra = explode('.', $number['config_name']); - if ($split_extra[4] != 'url' && $split_extra[4] != 'user' && $split_extra[4] != 'token' && $split_extra[4] != 'from') { - $new_extra[] = $number['config_value']; - } - } - $upd_extra = implode(PHP_EOL, $new_extra); - echo '
-
- -
- - -
-
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- - -
-
-
'; -}//end foreach - -echo '
-
- -
- - -
-
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
+
+ +
+ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
@@ -1198,87 +1046,6 @@ echo '
}); });// End Add Boxcar config - // Add Clickatell config - itemIndex = 0; - $("button#submit-clickatell").click(function(){ - var config_value = $('#clickatell_value').val(); - var config_to = $('#clickatell_to').val(); - $.ajax({ - type: "POST", - url: "ajax_form.php", - data: {type: "config-item", action: 'add-clickatell', config_group: "alerting", config_sub_group: "transports", config_to: config_to, config_value: config_value}, - dataType: "json", - success: function(data){ - if (data.status == 'ok') { - itemIndex++; - var $template = $('#clickatell_token_template'), - $clone = $template - .clone() - .removeClass('hide') - .attr('id',data.config_id) - .attr('clickatell-appkey-index', itemIndex) - .insertBefore($template); - $clone.find('[id="clickatell_token"]').attr('data-config_id',data.config_id); - $clone.find('[id="del-clickatell-call"]').attr('data-config_id',data.config_id); - $clone.find('[name="global-config-input"]').attr('value', config_value); - $clone.find('[id="clickatell_to"]').val(config_to); - $clone.find('[id="clickatell_to"]').attr('data-config_id',data.config_id); - $("#new-config-clickatell").modal('hide'); - } else { - $("#message").html('
' + data.message + '
'); - } - }, - error: function(){ - $("#message").html('
Error creating config item
'); - } - }); - });// End Add Clickatell config - - // Add PlaySMS config - itemIndex = 0; - $("button#submit-playsms").click(function(){ - var config_value = $('#playsms_value').val(); - var config_from = $('#playsms_from').val(); - var config_user = $('#playsms_user').val(); - var config_token = $('#playsms_token').val(); - var config_to = $('#playsms_to').val(); - $.ajax({ - type: "POST", - url: "ajax_form.php", - data: {type: "config-item", action: 'add-playsms', config_group: "alerting", config_sub_group: "transports", config_to: config_to, config_value: config_value, config_from: config_from, config_user: config_user, config_token: config_token}, - dataType: "json", - success: function(data){ - if (data.status == 'ok') { - itemIndex++; - var $template = $('#playsms_template'), - $clone = $template - .clone() - .removeClass('hide') - .attr('id',data.config_id) - .attr('playsms-appkey-index', itemIndex) - .insertBefore($template); - $clone.find('[id="playsms_url"]').attr('data-config_id',data.config_id); - $clone.find('[id="del-playsms-call"]').attr('data-config_id',data.config_id); - $clone.find('[name="global-config-input"]').attr('value', config_value); - $clone.find('[id="playsms_to"]').val(config_to); - $clone.find('[id="playsms_to"]').attr('data-config_id',data.config_id); - $clone.find('[id="playsms_from"]').val(config_from); - $clone.find('[id="playsms_from"]').attr('data-config_id',data.config_id); - $clone.find('[id="playsms_token"]').val(config_token); - $clone.find('[id="playsms_token"]').attr('data-config_id',data.config_id); - $clone.find('[id="playsms_user"]').val(config_user); - $clone.find('[id="playsms_user"]').attr('data-config_id',data.config_id); - $("#new-config-playsms").modal('hide'); - } else { - $("#message").html('
' + data.message + '
'); - } - }, - error: function(){ - $("#message").html('
Error creating config item
'); - } - }); - });// End Add PlaySMS config - // Delete api config $(document).on('click', 'button[name="del-api-call"]', function(event) { var config_id = $(this).data('config_id'); @@ -1384,48 +1151,6 @@ echo '
}); });// End delete Boxcar config - // Delete Clickatell config - $(document).on('click', 'button[name="del-clickatell-call"]', function(event) { - var config_id = $(this).data('config_id'); - $.ajax({ - type: 'POST', - url: 'ajax_form.php', - data: {type: "config-item", action: 'remove-clickatell', config_id: config_id}, - dataType: "json", - success: function (data) { - if (data.status == 'ok') { - $("#"+config_id).remove(); - } else { - $("#message").html('
' + data.message + '
'); - } - }, - error: function () { - $("#message").html('
An error occurred.
'); - } - }); - });// End delete Clickatell config - - // Delete PlaySMS config - $(document).on('click', 'button[name="del-playsms-call"]', function(event) { - var config_id = $(this).data('config_id'); - $.ajax({ - type: 'POST', - url: 'ajax_form.php', - data: {type: "config-item", action: 'remove-playsms', config_id: config_id}, - dataType: "json", - success: function (data) { - if (data.status == 'ok') { - $("#"+config_id).remove(); - } else { - $("#message").html('
' + data.message + '
'); - } - }, - error: function () { - $("#message").html('
An error occurred.
'); - } - }); - });// End delete PlaySMS config - $( 'select[name="global-config-select"]').change(function(event) { event.preventDefault(); var $this = $(this);