[35220] trunk/www/ports.php
eridius at macports.org
eridius at macports.org
Thu Mar 20 22:22:48 PDT 2008
Revision: 35220
http://trac.macosforge.org/projects/macports/changeset/35220
Author: eridius at macports.org
Date: 2008-03-20 22:22:47 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
Clean up ports.php some more by converting to double quotes & variable interpolation where appropriate
Modified Paths:
--------------
trunk/www/ports.php
Modified: trunk/www/ports.php
===================================================================
--- trunk/www/ports.php 2008-03-21 04:56:45 UTC (rev 35219)
+++ trunk/www/ports.php 2008-03-21 05:22:47 UTC (rev 35220)
@@ -10,7 +10,7 @@
print_header('The MacPorts Project -- Available Ports', 'utf-8');
$portsdb_info = portsdb_connect($portsdb_host, $portsdb_user, $portsdb_passwd);
- $sql = 'SELECT UNIX_TIMESTAMP(activity_time) FROM ' . $portsdb_name . '.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC';
+ $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM $portsdb_name.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
$result = mysql_query($sql);
if ($result && $row = mysql_fetch_row($result)) {
$date = date('Y-m-d', $row[0]);
@@ -58,7 +58,7 @@
/* If no valid search criteria is specified (by set and not equal to all and a valid substring) we output port categories
as possible searches */
if (!$by || ($by != 'all' && !$substr)) {
- $query = 'SELECT DISTINCT category FROM ' . $portsdb_name . '.categories ORDER BY category';
+ $query = "SELECT DISTINCT category FROM $portsdb_name.categories ORDER BY category";
$result = mysql_query($query);
if ($result) {
$max_entries_per_column = floor($portsdb_info['num_categories']/4);
@@ -68,7 +68,7 @@
$entries_per_colum = 0;
print '<li><ul>';
while ($row = mysql_fetch_assoc($result)) {
- print '<li><a href="' . $_SERVER['PHP_SELF'] . '?by=category&substr=' . urlencode($row['category']) . '">'
+ print "<li><a href=\"$_SERVER[PHP_SELF]?by=category&substr=" . urlencode($row['category']) . '">'
. htmlspecialchars($row['category']) . '</a></li>';
if ($entries_per_colum == $max_entries_per_column) break;
$entries_per_colum++;
@@ -86,26 +86,26 @@
$tables = "$portsdb_name.portfiles AS p";
switch ($by) {
case 'name':
- $criteria = 'p.name LIKE \'%' . mysql_real_escape_string($substr) . '%\'';
+ $criteria = "p.name LIKE '%" . mysql_real_escape_string($substr) . "%'";
break;
case 'category':
$tables .= ", $portsdb_name.categories AS c";
- $criteria = 'c.portfile = p.name AND c.category = \'' . mysql_real_escape_string($substr) . '\'';
+ $criteria = "c.portfile = p.name AND c.category = '" . mysql_real_escape_string($substr) . "'";
break;
case 'maintainer':
$tables .= ", $portsdb_name.maintainers AS m";
- $criteria = 'm.portfile = p.name AND m.maintainer LIKE \'%' . mysql_real_escape_string($substr) . '%\'';
+ $criteria = "m.portfile = p.name AND m.maintainer LIKE '%" . mysql_real_escape_string($substr) . "%'";
break;
case 'library':
- $criteria = 'p.name = \'' . mysql_real_escape_string($substr) . '\'';
+ $criteria = "p.name = '" . mysql_real_escape_string($substr) . "'";
break;
case 'variant':
$tables .= ", $portsdb_name.variants AS v";
- $criteria = 'v.portfile = p.name AND v.variant = \'' . mysql_real_escape_string($substr) . '\'';
+ $criteria = "v.portfile = p.name AND v.variant = '" . mysql_real_escape_string($substr) . "'";
break;
case 'platform':
$tables .= ", $portsdb_name.platforms AS pl";
- $criteria = 'pl.portfile = p.name AND pl.platform = \'' . mysql_real_escape_string($substr) . '\'';
+ $criteria = "pl.portfile = p.name AND pl.platform = '" . mysql_real_escape_string($substr) . "'";
break;
case 'all':
$criteria = '';
@@ -125,7 +125,7 @@
while ($row = mysql_fetch_assoc($result)) {
/* Port name and Portfile URL */
- print '<dt><b><a href="' . $trac_url . 'browser/trunk/dports/' . $row['path'] . '/Portfile">' . htmlspecialchars($row['name'])
+ print "<dt><b><a href=\"${trac_url}browser/trunk/dports/$row[path]/Portfile\">" . htmlspecialchars($row['name'])
. '</a></b> ' . htmlspecialchars($row['version']) . '</dt>';
print '<dd>';
@@ -133,8 +133,8 @@
print htmlspecialchars($row['description']) . '<br />';
/* Maintainers */
- $nquery = 'SELECT maintainer FROM ' . $portsdb_name . '.maintainers WHERE portfile=\'' . mysql_real_escape_string($row['name']) .
- '\' ORDER BY is_primary DESC, maintainer';
+ $nquery = "SELECT maintainer FROM $portsdb_name.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) .
+ "' ORDER BY is_primary DESC, maintainer";
$nresult = mysql_query($nquery);
if ($nresult) {
$primary = 1;
@@ -149,8 +149,8 @@
}
/* Categories */
- $nquery = 'SELECT category FROM ' . $portsdb_name . '.categories WHERE portfile=\'' . mysql_real_escape_string($row['name']) .
- '\' ORDER BY is_primary DESC, category';
+ $nquery = "SELECT category FROM $portsdb_name.categories WHERE portfile='" . mysql_real_escape_string($row['name']) .
+ "' ORDER BY is_primary DESC, category";
$nresult = mysql_query($nquery);
if ($nresult) {
$primary = 1;
@@ -158,7 +158,7 @@
while ($nrow = mysql_fetch_row($nresult)) {
if ($primary) { print ' <b>'; }
else { print ' '; }
- print '<a href="' . $_SERVER['PHP_SELF'] . '?by=category&substr=' . urlencode($nrow[0]) . '">'
+ print "<a href=\"$_SERVER[PHP_SELF]?by=category&substr=" . urlencode($nrow[0]) . '">'
. htmlspecialchars($nrow[0]) . '</a>';
if ($primary) { print '</b>'; }
$primary = 0;
@@ -166,38 +166,38 @@
}
/* Platforms */
- $nquery = 'SELECT platform FROM ' . $portsdb_name . '.platforms WHERE portfile=\'' . mysql_real_escape_string($row['name']) .
- '\' ORDER BY platform';
+ $nquery = "SELECT platform FROM $portsdb_name.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) .
+ "' ORDER BY platform";
$nresult = mysql_query($nquery);
if ($nresult) {
print '<br /><i>Platforms:</i> ';
while ($nrow = mysql_fetch_row($nresult)) {
- print '<a href="' . $_SERVER['PHP_SELF'] . '?by=platform&substr=' . urlencode($nrow[0]) . '">'
+ print "<a href=\"$_SERVER[PHP_SELF]?by=platform&substr=" . urlencode($nrow[0]) . '">'
. htmlspecialchars($nrow[0]) . '</a> ';
}
}
/* Dependencies */
- $nquery = 'SELECT library FROM ' . $portsdb_name . '.dependencies WHERE portfile=\'' . mysql_real_escape_string($row['name']) .
- '\' ORDER BY library';
+ $nquery = "SELECT library FROM $portsdb_name.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) .
+ "' ORDER BY library";
$nresult = mysql_query($nquery);
if ($nresult && mysql_num_rows($nresult) > 0) {
print '<br /><i>Dependencies:</i> ';
while ($nrow = mysql_fetch_row($nresult)) {
$library = eregi_replace('^([^:]*:[^:]*:|[^:]*:)', '', $nrow[0]);
- print '<a href="' . $_SERVER['PHP_SELF'] . '?by=library&substr=' . urlencode($library) . '">'
+ print "<a href=\"$_SERVER[PHP_SELF]?by=library&substr=" . urlencode($library) . '">'
. htmlspecialchars($library) . '</a> ';
}
}
/* Variants */
- $nquery = 'SELECT variant FROM ' . $portsdb_name . '.variants WHERE portfile=\'' . mysql_real_escape_string($row['name']) .
- '\' ORDER BY variant';
+ $nquery = "SELECT variant FROM $portsdb_name.variants WHERE portfile='" . mysql_real_escape_string($row['name']) .
+ "' ORDER BY variant";
$nresult = mysql_query($nquery);
if ($nresult && mysql_num_rows($nresult) > 0) {
print '<br /><i>Variants:</i> ';
while ($nrow = mysql_fetch_row($nresult)) {
- print '<a href="' . $_SERVER['PHP_SELF'] . '?by=variant&substr=' . urlencode($nrow[0]) . '">'
+ print "<a href=\"$_SERVER[PHP_SELF]?by=variant&substr=" . urlencode($nrow[0]) . '">'
. htmlspecialchars($nrow[0]) . '</a> ';
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080320/3d3cc59a/attachment.html
More information about the macports-changes
mailing list