Add Author Name and Author Email fields. (Closes: #90)

[fdroidserver.git] / wp-fdroid / wp-fdroid.php

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 03028217b001f396a4edad14776167216d433e39..12cc02e6601d8009756617433a43f2df79014e30 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -222,6 +222,7 @@ class FDroid
        }
        function androidversion($sdkLevel) {
                switch ($sdkLevel) {
+                       case 23: return "6.0";
                        case 22: return "5.1";
                        case 21: return "5.0";
                        case 20: return "4.4W";
@@ -279,12 +280,21 @@ class FDroid
                                        case "license":
                                                $license=$el;
                                                break;
+                                       case "author":
+                                               $author=$el;
+                                               break;
+                                       case "email":
+                                               $email=$el;
+                                               break;
                                        case "source":
                                                $source=$el;
                                                break;
                                        case "tracker":
                                                $issues=$el;
                                                break;
+                                       case "changelog":
+                                               $changelog=$el;
+                                               break;
                                        case "donate":
                                                $donate=$el;
                                                break;
@@ -395,10 +405,17 @@ class FDroid
                                $out.="<p>";
                                if(strlen($web)>0)
                                        $out.='<b>Website:</b> <a href="'.$web.'">'.$web.'</a><br />';
+                               if(isset($author) && strlen($author)>0)
+                                       if(isset($email) && strlen($email)>0)
+                                               $out.='<b>Author(s):</b> <a href="mailto:'.$email.'">'.$author.'</a><br />';
+                                       else
+                                               $out.='<b>Author(s):</b> '.$author.'<br />';
                                if(strlen($issues)>0)
                                        $out.='<b>Issue Tracker:</b> <a href="'.$issues.'">'.$issues.'</a><br />';
                                if(strlen($source)>0)
                                        $out.='<b>Source Code:</b> <a href="'.$source.'">'.$source.'</a><br />';
+                               if(strlen($changelog)>0)
+                                       $out.='<b>Changelog:</b> <a href="'.$changelog.'">'.$changelog.'</a><br />';
                                if(isset($donate) && strlen($donate)>0)
                                        $out.='<b>Donate:</b> <a href="'.$donate.'">'.$donate.'</a><br />';
                                if(isset($flattr) && strlen($flattr)>0)
@@ -446,7 +463,7 @@ class FDroid
                                        $hasabis = isset($apk['nativecode']);
                                        if($hasabis) {
                                                $abis = str_replace(',', ' ', $apk['nativecode']);
-                                               $out.="<p>This version uses native code and will only run on: ".$abis."</p>";
+                                               $out.="<p>This version uses native code and is built for: ".$abis."</p>";
                                        }
 
                                        // Is this source or binary?
@@ -647,6 +664,8 @@ class FDroid
                $antifeatureDescription['NonFreeDep']['description'] = 'This application depends on another non-Free application.';
                $antifeatureDescription['UpstreamNonFree']['name'] = 'Upstream Non-Free';
                $antifeatureDescription['UpstreamNonFree']['description'] = 'The upstream source code is non-free.';
+               $antifeatureDescription['NonFreeAssets']['name'] = 'Non-Free Assets';
+               $antifeatureDescription['NonFreeAssets']['description'] = 'This application contains non-free assets.';
 
                if(isset($antifeatureDescription[$antifeature])) {
                        return $antifeatureDescription[$antifeature];