Add variable substitutions: $wanip, $lanip to wizard and pkg_edit facilities.

1 files changed, 12 insertions, 1 deletions

diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index eb88a9d..fe95a3a 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -444,6 +444,7 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper) {
 }
 
 function fixup_string($string) {
+	global $config;
 	// fixup #1: $myurl -> http[s]://ip_address:port/
 	$https = "";
 	$port = "";
@@ -453,7 +454,17 @@ function fixup_string($string) {
 	if($config['system']['webguiproto'] == "https") $https = "s";
 	$myurl = "http" . $https . "://" . getenv("HTTP_HOST") . $urlportport;
 	$newstring = str_replace("\$myurl", $myurl, $string);
-	// fixup #2: fix'er'up here.
+	$string = $newstring;
+	// fixup #2: $wanip
+	$curwanip = get_current_wan_address();
+	$newstring = str_replace("\$wanip", $curwanip, $string);
+	$string = $newstring;
+	// fixup #3: $lanip
+	$lancfg = $config['interfaces']['lan'];
+	$lanip = $lancfg['ipaddr'];
+	$newstring = str_replace("\$lanip", $lanip, $string);
+	$string = $newstring;
+	// fixup #4: fix'r'up here.
 	return $newstring;
 }