Make pppoe reset work again with new <if> naming scheme.

Previous commit also moved pppoe reset functions to interfaces.inc
so we don't have to duplicate in interfaces.php and interfaces_ppps_edit.php

Also, add code so that when ppp config section gets deleted, associated <cron>
item gets deleted for pppoe-reset cron items.

2 files changed, 2 insertions, 1 deletions

diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php
index 63287b6..9c76179 100644
--- a/usr/local/www/interfaces_ppps.php
+++ b/usr/local/www/interfaces_ppps.php
@@ -62,6 +62,8 @@ if ($_GET['act'] == "del") {
 	if (ppp_inuse($_GET['id'])) {
 		$input_errors[] = "This point-to-point link cannot be deleted because it is still being used as an interface.";
 	} else {
+		unset($a_ppps[$_GET['id']]['pppoe-reset-type']);
+		handle_pppoe_reset($a_ppps[$_GET['id']]);
 		unset($a_ppps[$_GET['id']]);
 		write_config();
 		header("Location: interfaces_ppps.php");
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index 402868e..78ae49c 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -44,7 +44,6 @@
 require("guiconfig.inc");
 require("functions.inc");
 
-define("CRON_PPPOE_CMD_FILE", "{$g['varetc_path']}/pppoe_restart_");
 define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
 define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
 define("CRON_DAILY_PATTERN", "0 0 * * *");