diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-06-22 19:03:47 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-06-22 19:03:47 +0000 |
| commit | f3c5f1b571104d1f3028db44cb477ca72dca042f (patch) | |
| tree | 2a35b1d94bf6aea6e98780fd2a6983ddc82d38d0 /net/rtg/files/patch-etc-rtg.php | |
| parent | Update to 1.5.0. (diff) | |
- Update to use PHP mysqli extensions (as mysql extension is deprecated
these days)
- Fix runtime dependencies to pull in perl's DBI and DBD::mysql modules for
target maker.
- Add some options to pull in dependencies for mysql server and php web
modules if needed.
PR: 191276
Submitted by: Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)
Notes
Notes:
svn path=/head/; revision=358821
Diffstat (limited to 'net/rtg/files/patch-etc-rtg.php')
| -rw-r--r-- | net/rtg/files/patch-etc-rtg.php | 91 |
1 files changed, 86 insertions, 5 deletions
diff --git a/net/rtg/files/patch-etc-rtg.php b/net/rtg/files/patch-etc-rtg.php index 1e9edaffb9ef..f8e8cf5d0ae3 100644 --- a/net/rtg/files/patch-etc-rtg.php +++ b/net/rtg/files/patch-etc-rtg.php @@ -1,6 +1,82 @@ ---- etc/rtg.php.orig 2010-07-04 03:49:22.836351752 +0100 -+++ etc/rtg.php 2010-07-04 03:54:55.955519331 +0100 -@@ -171,6 +171,9 @@ +--- etc/rtg.php.orig 2003-09-24 21:42:03.000000000 +0100 ++++ etc/rtg.php 2014-06-22 15:25:22.471477252 +0100 +@@ -4,10 +4,8 @@ + print "<HTML>\n<!-- RTG Version $VERSION -->\n<HEAD>\n"; + + /* Connect to RTG MySQL Database */ +- $dbc=@mysql_connect ($host, $user, $pass) or +- $dbc=@mysql_connect ("$host:/var/lib/mysql/mysql.sock", $user, $pass) or ++ $dbc=@mysqli_connect ($host, $user, $pass, $db) or + die ("MySQL Connection Failed, Check Configuration."); +- mysql_select_db($db,$dbc); + + if ($PHP_SELF == "") { + $PHP_SELF = "rtg.php"; +@@ -37,17 +35,17 @@ + # Determine router, interface names as necessary + if ($rid && $iid) { + $selectQuery="SELECT a.name, a.description, a.speed, b.name AS router FROM interface a, router b WHERE a.rid=b.rid AND a.rid=$rid AND a.id=$iid[0]"; +- $selectResult=mysql_query($selectQuery, $dbc); +- $selectRow=mysql_fetch_object($selectResult); +- $interfaces = mysql_num_rows($selectResult); ++ $selectResult=mysqli_query($dbc, $selectQuery); ++ $selectRow=mysqli_fetch_object($selectResult); ++ $interfaces = mysqli_num_rows($selectResult); + $name = $selectRow->name; + $description = $selectRow->description; + $speed = ($selectRow->speed)/1000000; + $router = $selectRow->router; + } else if ($rid && !$iid) { + $selectQuery="SELECT name AS router from router where rid=$rid"; +- $selectResult=mysql_query($selectQuery, $dbc); +- $selectRow=mysql_fetch_object($selectResult); ++ $selectResult=mysqli_query($dbc, $selectQuery); ++ $selectRow=mysqli_fetch_object($selectResult); + $router = $selectRow->router; + } + +@@ -71,8 +69,8 @@ + if (!$rid && !$iid) { + echo "<SELECT NAME=\"rid\" SIZE=10>\n"; + $selectQuery="SELECT DISTINCT name, rid FROM router ORDER BY name"; +- $selectResult=mysql_query($selectQuery, $dbc); +- while ($selectRow=mysql_fetch_object($selectResult)){ ++ $selectResult=mysqli_query($dbc, $selectQuery); ++ while ($selectRow=mysqli_fetch_object($selectResult)){ + echo "<OPTION VALUE=\"$selectRow->rid\">$selectRow->name\n"; + } + echo "</SELECT>\n"; +@@ -91,8 +89,8 @@ + + echo "<SELECT MULTIPLE NAME=\"iid[]\" SIZE=10>\n"; + $selectQuery="SELECT id, name, description FROM interface WHERE rid=$rid ORDER BY name"; +- $selectResult=mysql_query($selectQuery, $dbc); +- while ($selectRow=mysql_fetch_object($selectResult)){ ++ $selectResult=mysqli_query($dbc, $selectQuery); ++ while ($selectRow=mysqli_fetch_object($selectResult)){ + echo "<OPTION VALUE=\"$selectRow->id\">$selectRow->name ($selectRow->description)\n"; + } + echo "</SELECT>\n"; +@@ -152,8 +150,8 @@ + $range="$range AND id=$iid[0]"; + + $selectQuery="SELECT description, name, speed FROM interface WHERE rid=$rid AND id=$iid[0]"; +- $selectResult=mysql_query($selectQuery, $dbc); +- $selectRow=mysql_fetch_object($selectResult); ++ $selectResult=mysqli_query($dbc, $selectQuery); ++ $selectRow=mysqli_fetch_object($selectResult); + echo "<TABLE BORDER=0>\n"; + echo "<TD><I>Device</I>:</TD><TD>$router ($rid)</TD><TR>\n"; + echo "<TD><I>Interface</I>:</TD><TD>$selectRow->name ($iid[0])</TD><TR>\n"; +@@ -165,12 +163,15 @@ + echo "<P>\n"; + + #$selectQuery="SELECT DISTINCT id FROM ifInOctets_$rid WHERE $range"; +- #$selectResult=mysql_query($selectQuery, $dbc); +- #if (mysql_num_rows($selectResult) <= 0) { ++ #$selectResult=mysqli_query($dbc, $selectQuery); ++ #if (mysqli_num_rows($selectResult) <= 0) { + # print "<BR>No Data Found on Interface for Given Range.<BR>\n"; #} #else { $args = "t1=ifInOctets_$rid&t2=ifOutOctets_$rid&begin=$bt&end=$et&units=bits/s&factor=8"; @@ -10,7 +86,7 @@ foreach ($iid as $value) { $args="$args&iid=$value"; } -@@ -181,8 +184,11 @@ +@@ -181,8 +182,11 @@ if ($borderb) $args = "$args&borderb=$borderb"; if ($aggr) $args = "$args&aggr=yes"; if ($percentile) $args = "$args&percentile=$nth"; @@ -23,7 +99,7 @@ foreach ($iid as $value) { $args="$args&iid=$value"; } -@@ -192,9 +198,13 @@ +@@ -192,13 +196,17 @@ if ($borderb) $args = "$args&borderb=$borderb"; if ($aggr) $args = "$args&aggr=yes"; if ($percentile) $args = "$args&percentile=$nth"; @@ -39,3 +115,8 @@ # } } +-mysql_close($dbc); ++mysqli_close($dbc); + ?> + + <P> |