From 778dfd0c1a8fbc015d0b944e053fb2d7135d49c7 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 8 Nov 2018 10:59:23 +0100
Subject: packages/pkginfo.php: show mysql fields instead of json fields for
 fields where both exist

---
 packages/pkginfo.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/pkginfo.php b/packages/pkginfo.php
index c120578..f00dded 100644
--- a/packages/pkginfo.php
+++ b/packages/pkginfo.php
@@ -284,13 +284,13 @@ require_once BASE . "/lib/style.php";
   while ($row = $mysql_result -> fetch_assoc())
     $elsewhere[] = $row;
 
-  print_header($content["Name"] . " " . $content["Version"] . " (" . $content["Architecture"] . ")");
+  print_header($content["pkgname"] . " " . $content["version"] . " (" . $content["arch"] . ")");
 
 ?>
       <div id="archdev-navbar">
       </div>
       <div id="pkgdetails" class="box">
-        <h2><?php print $content["Name"]." ".$content["Version"]; ?></h2>
+        <h2><?php print $content["pkgname"]." ".$content["version"]; ?></h2>
         <div id="detailslinks" class="listing">
           <div id="actionlist">
             <h4>Package Actions</h4>
@@ -332,18 +332,18 @@ require_once BASE . "/lib/style.php";
               <li>
 <?php
   print "                <a href=\"https://www.archlinux.org/packages/?sort=&q=";
-  print $content["Name"];
+  print $content["pkgname"];
   print "&maintainer=&flagged=\">";
-  print "Search for ".$content["Name"]." upstream";
+  print "Search for ".$content["pkgname"]." upstream";
   print "</a>\n";
 ?>
               </li>
               <li>
 <?php
   print "                <a href=\"https://bugs.archlinux32.org/index.php?string=";
-  print $content["Name"];
+  print $content["pkgname"];
   print "\" title=\"View existing bug tickets for ";
-  print $content["Name"];
+  print $content["pkgname"];
   print "\">Bug Reports</a> / \n";
   print "                <a href=\"https://bugs.archlinux32.org/index.php?do=newtask&project=1&product_category=";
   if ($content["repo_stability_name"]=="stable")
@@ -355,16 +355,16 @@ require_once BASE . "/lib/style.php";
   else
     print "1"; // packages
   print "&item_summary=%5B";
-  print $content["Name"];
+  print $content["pkgname"];
   print "%5D+PLEASE+ENTER+SUMMARY\" title=\"Report new bug for ";
-  print $content["Name"];
+  print $content["pkgname"];
   print "\">Add New Bug</a>\n";
 ?>
               </li>
               <li>
                 <a href="http://pool.mirror.archlinux32.org/i686/<?php 
-  print $content["repo"]."/".$content["pkgname"]."-".$content["Version"]."-".$content["arch"];
-?>.pkg.tar.xz" rel="nofollow" title="Download <?php print $content["Name"]; ?> from mirror">Download From Mirror</a>
+  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>
             </ul>
           </div>
@@ -396,9 +396,9 @@ if (count($elsewhere)>0) {
 ?>
         </div>
         <div itemscope itemtype="http://schema.org/SoftwareApplication">
-          <meta itemprop="name" content="<?php print $content["Name"]; ?>"/>
-          <meta itemprop="version" content="<?php print $content["Version"]; ?>"/>
-          <meta itemprop="softwareVersion" content="<?php print $content["Version"]; ?>"/>
+          <meta itemprop="name" content="<?php print $content["pkgname"]; ?>"/>
+          <meta itemprop="version" content="<?php print $content["version"]; ?>"/>
+          <meta itemprop="softwareVersion" content="<?php print $content["version"]; ?>"/>
           <meta itemprop="fileSize" content="<?php print $content["Download Size"]; ?>"/>
           <meta itemprop="dateCreated" content="<?php print $content["Build Date"]; ?>"/>
           <meta itemprop="datePublished" content="<?php print $content["last_moved"]; ?>"/>
@@ -409,7 +409,7 @@ if (count($elsewhere)>0) {
                 Architecture:
               </th>
               <td>
-                <a href="/?arch=<?php print $content["Architecture"]; ?>" title="Browse packages for <?php print $content["Architecture"]; ?> architecture"><?php print $content["Architecture"]; ?></a>
+                <a href="/?arch=<?php print $content["arch"]; ?>" title="Browse packages for <?php print $content["arch"]; ?> architecture"><?php print $content["arch"]; ?></a>
               </td>
             </tr>
             <tr>
@@ -417,7 +417,7 @@ if (count($elsewhere)>0) {
                 Repository:
               </th>
               <td>
-                <a href="/?repo=<?php print $content["Repository"]; ?>" title="Browse the <?php print $content["Repository"]; ?> repository"><?php print $content["Repository"]; ?></a>
+                <a href="/?repo=<?php print $content["repo"]; ?>" title="Browse the <?php print $content["repo"]; ?> repository"><?php print $content["repo"]; ?></a>
               </td>
             </tr>
             <tr>
@@ -433,7 +433,7 @@ if (count($elsewhere)>0) {
                 Upstream URL:
               </th>
               <td>
-                <a itemprop="url" href="<?php print $content["URL"]; ?>" title="Visit the website for <?php print $content["Name"]; ?>"><?php print $content["URL"]; ?></a>
+                <a itemprop="url" href="<?php print $content["URL"]; ?>" title="Visit the website for <?php print $content["pkgname"]; ?>"><?php print $content["URL"]; ?></a>
               </td>
             </tr>
             <tr>
@@ -486,7 +486,7 @@ if (count($elsewhere)>0) {
         </div>
         <div id="metadata">
           <div id="pkgdeps" class="listing">
-            <h3 title="<?php print $content["Name"]; ?> has the following dependencies">
+            <h3 title="<?php print $content["pkgname"]; ?> has the following dependencies">
               Dependencies (<?php print count($dependencies); ?>)
             </h3>
             <ul id="pkgdepslist">
@@ -535,7 +535,7 @@ if (count($elsewhere)>0) {
             </ul>
           </div>
           <div id="pkgreqs" class="listing">
-            <h3 title="Packages that require <?php print $content["Name"]; ?>">
+            <h3 title="Packages that require <?php print $content["pkgname"]; ?>">
               Required By (<?php print count($dependent); ?>)
             </h3>
             <ul id="pkgreqslist">
@@ -543,7 +543,7 @@ if (count($elsewhere)>0) {
   foreach ($dependent as $dep) {
     print "              <li>\n";
     print "                ";
-    if ($dep["install_target"] != $content["Name"])
+    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"]."/\" ";
@@ -558,7 +558,7 @@ if (count($elsewhere)>0) {
       print " [" . $dep["repo"] . "]";
     if ($dep["is_on_master_mirror"]=="1")
       print "</a>";
-    if ($dep["install_target"] != $content["Name"])
+    if ($dep["install_target"] != $content["pkgname"])
       print ")\n";
     if ($dep["dependency_type"] != "run")
       print "                <span class=\"" . $dep["dependency_type"] . "-dep\">(" . $dep["dependency_type"] . ")</span>";
-- 
cgit v1.2.3-70-g09d2