packages/pkginfo.php: reorder according to new url layout

1 files changed, 7 insertions, 3 deletions

diff --git a/packages/pkginfo.php b/packages/pkginfo.php
index 668e6ea..02251d4 100644
--- a/packages/pkginfo.php
+++ b/packages/pkginfo.php
@@ -420,6 +420,7 @@ require_once BASE . "/lib/style.php";
               </li>
               <li>
                 <a href="http://pool.mirror.archlinux32.org/i686/<?php 
+  // TODO: 'i686' -> $repo_arch
   print $content["repo"]."/".$content["pkgname"]."-".$content["version"]."-".$content["arch"];
 ?>.pkg.tar.xz" rel="nofollow" title="Download <?php print $content["pkgname"]; ?> from mirror">Download From Mirror</a>
               </li>
@@ -434,7 +435,8 @@ if (count($elsewhere)>0) {
     print "            <ul>\n";
     print "              <li>\n";
     if ($subst["is_on_master_mirror"]) {
-      print "                <a href=\"/" . $subst["repo"] . "/" . $subst["arch"] . "/" . $subst["pkgname"] ."/\"";
+      print "                <a href=\"/" . $subst["arch"] . "/" . $subst["repo"] . "/" . $subst["pkgname"] ."/\"";
+      // TODO: arch -> repo_arch
       print " title=\"Package details for " . $subst["pkgname"] ."\">";
     }
     if ($subst["is_to_be_deleted"])
@@ -600,7 +602,8 @@ if ($count > 1 || $content["pkgname"] != $content["pkgbase"]) {
         if (!$first)
           print ", ";
         $first = false;
-        print "<a href=\"/".$d_p["repo"]."/".$d_p["arch"]."/".$d_p["pkgname"]."/\" ";
+        print "<a href=\"/".$d_p["arch"]."/".$d_p["repo"]."/".$d_p["pkgname"]."/\" ";
+        // TODO: $repo -> $repo_arch
         print "title=\"View package details for ".$d_p["pkgname"]."\">";
         if ($d_p["is_to_be_deleted"])
           print "<s>";
@@ -634,7 +637,8 @@ if ($count > 1 || $content["pkgname"] != $content["pkgbase"]) {
     if ($dep["install_target"] != $content["pkgname"])
       print $dep["install_target"] . " (";
     if ($dep["is_on_master_mirror"]=="1") {
-      print "<a href=\"/".$dep["repo"]."/".$dep["arch"]."/".$dep["pkgname"]."/\" ";
+      print "<a href=\"/".$dep["arch"]."/".$dep["repo"]."/".$dep["pkgname"]."/\" ";
+      // TODO: $repo -> $repo_arch
       print "title=\"View package details for ".$dep["pkgname"]."\">";
     }
     if ($dep["is_to_be_deleted"])