Log Message:
-----------
Correct flag locations
Modified Files:
--------------
www/pgadmin3/cnt:
cnt_mirrors.php (r1.13 -> r1.14)
Index: cnt_mirrors.php
===================================================================
RCS file: /projects/www/pgadmin3/cnt/cnt_mirrors.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lpgadmin3/cnt/cnt_mirrors.php -Lpgadmin3/cnt/cnt_mirrors.php -u -w -r1.13
-r1.14
--- pgadmin3/cnt/cnt_mirrors.php
+++ pgadmin3/cnt/cnt_mirrors.php
@@ -21,14 +21,13 @@
$prompt = _('Please select a download mirror:');
// Temporary fix to allow for the fact that the mirrors aren't updating whilst
hub.org is down.
-// $query = "SELECT 'ftp' || CASE WHEN mirror_index = 0 THEN ''::text ELSE
mirror_index::text END || '.' || country_code || '.postgresql.org' AS hostname,
host_port AS port, host_path AS path, country_name AS country FROM mirrors
WHERE mirror_type = 'ftp' AND mirror_active = TRUE AND mirror_private = FALSE
AND mirror_dns = TRUE AND mirror_last_rsync > (now() - '48 hrs'::interval)
ORDER BY country_name, mirror_index;";
- $query = "SELECT 'ftp' || CASE WHEN mirror_index = 0 THEN ''::text ELSE
mirror_index::text END || '.' || country_code || '.postgresql.org' AS hostname,
host_port AS port, host_path AS path, country_name AS country FROM mirrors
WHERE mirror_type = 'ftp' AND mirror_active = TRUE AND mirror_private = FALSE
AND mirror_dns = TRUE ORDER BY country_name, mirror_index;";
+ $query = "SELECT 'ftp' || CASE WHEN mirror_index = 0 THEN ''::text ELSE
mirror_index::text END || '.' || country_code || '.postgresql.org' AS hostname,
host_port AS port, host_path AS path, country_name AS country FROM mirrors
WHERE mirror_type = 'ftp' AND mirror_active = TRUE AND mirror_private = FALSE
AND mirror_dns = TRUE AND mirror_last_rsync > (now() - '48 hrs'::interval)
ORDER BY country_name, mirror_index;";
$res = pg_query($conn,$query);
if(!$res) {
echo _("Could not connect to the mirror table.")."<br><br>";
- echo sprintf(_("Feel free to download pgAdmin from <a
href='%s'>PostgreSQL primary FTP site</a>."),
"http://www.postgresql.org/ftpsite";)."<br>";
+ echo sprintf(_("Feel free to download pgAdmin from <a
href='%s'>PostgreSQL primary FTP site</a>."),
"http://www.postgresql.org/ftp/pgadmin3/";)."<br>";
$_error = true;
}
}
@@ -44,7 +43,7 @@
$ii = pg_num_rows($res);
if($ii == 0) {
echo _("No mirrors could be found.")."<br><br>";
- echo sprintf(_("Feel free to download pgAdmin from <a href='%s'>PostgreSQL
primary FTP site</a>."), "http://www.postgresql.org/ftpsite/pgadmin3/";)."<br>";
+ echo sprintf(_("Feel free to download pgAdmin from <a href='%s'>PostgreSQL
primary FTP site</a>."), "http://www.postgresql.org/ftp/pgadmin3/";)."<br>";
} else {
$content = "<table width='100%'><tr><td colspan=$numcells align=left><font
size=4>$prompt<br><br></font></td>\n";
@@ -62,9 +61,9 @@
}
if ($row[1] == "") {
- $content .= "<td align='center' valign='top' width='" . 100 /
$numcells . "%'><a href='ftp://$row[0]$path'><img
src='http://www.postgresql.org/images/flags/$img' border=1 alt='" .
ucwords($row[3]) . "' width='32' height='21'><br>" . ucwords($row[3]) .
"</a><br> </td>\n";
+ $content .= "<td align='center' valign='top' width='" . 100 /
$numcells . "%'><a href='ftp://$row[0]$path'><img
src='http://www.postgresql.org/layout/images/flags/$img' border=1 alt='" .
ucwords($row[3]) . "' width='32' height='21'><br>" . ucwords($row[3]) .
"</a><br> </td>\n";
} else {
- $content .= "<td align='center' valign='top' width='" . 100 /
$numcells . "%'><a href='ftp://$row[0]:$row[1]$path'><img
src='http://www.postgresql.org/images/flags/$img' border=1 alt='$row[3]'
width='32' height='21'><br>" . ucwords($row[3]) . "</a><br> </td>\n";
+ $content .= "<td align='center' valign='top' width='" . 100 /
$numcells . "%'><a href='ftp://$row[0]:$row[1]$path'><img
src='http://www.postgresql.org/layout/images/flags/$img' border=1 alt='$row[3]'
width='32' height='21'><br>" . ucwords($row[3]) . "</a><br> </td>\n";
}
}
$ii = $numcells - ($x%$numcells);
---------------------------(end of broadcast)---------------------------
TIP 8: explain analyze is your friend
