WordPress plugin: more info on the app detail page

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 2aaba2e824db6d0dbb2e35d11815ac9261e44516..4de4cdeaf409db3ad1ddf815043ca1278a320375 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -68,7 +68,8 @@ class FDroid
 \r
        // Handler for the 'fdroidrepo' shortcode.\r
        //  $attribs - shortcode attributes\r
-       //  $content - optional content enclosed between the starting and ending shortcode\r
+       //  $content - optional content enclosed between the starting and\r
+       //             ending shortcode\r
        // Returns the generated content.\r
        function do_shortcode($attribs,$content=null) {\r
                global $wp_query,$wp_rewrite;\r
@@ -100,6 +101,7 @@ class FDroid
 \r
                        $attrs=$app->attributes();\r
                        if($attrs['id']==$id) {\r
+                               $apks=array();;\r
                                foreach($app->children() as $el) {\r
                                        switch($el->getName()) {\r
                                                case "name":\r
@@ -111,24 +113,78 @@ class FDroid
                                                case "summary":\r
                                                        $summary=$el;\r
                                                        break;\r
+                                               case "description":\r
+                                                       $desc=$el;\r
+                                                       break;\r
                                                case "license":\r
                                                        $license=$el;\r
                                                        break;\r
                                                case "source":\r
                                                        $source=$el;\r
                                                        break;\r
-                                               case "issues":\r
+                                               case "tracker":\r
                                                        $issues=$el;\r
                                                        break;\r
                                                case "web":\r
                                                        $web=$el;\r
                                                        break;\r
+                                               case "package":\r
+                                                       $thisapk=array();\r
+                                                       foreach($el->children() as $pel) {\r
+                                                               switch($pel->getName()) {\r
+                                                               case "version":\r
+                                                                       $thisapk['version']=$pel;\r
+                                                                       break;\r
+                                                               case "vercode":\r
+                                                                       $thisapk['vercode']=$pel;\r
+                                                                       break;\r
+                                                               case "apkname":\r
+                                                                       $thisapk['apkname']=$pel;\r
+                                                                       break;\r
+                                                               case "hash":\r
+                                                                       $thisapk['hash']=$pel;\r
+                                                                       break;\r
+                                                               case "size":\r
+                                                                       $thisapk['size']=$pel;\r
+                                                                       break;\r
+                                                               case "sdkver":\r
+                                                                       $thisapk['sdkver']=$pel;\r
+                                                                       break;\r
+                                                               case "permissions":\r
+                                                                       $thisapk['permissions']=$pel;\r
+                                                                       break;\r
+                                                               }\r
+                                                       }\r
+                                                       $apks[]=$thisapk;\r
+\r
                                        }\r
                                }\r
                                $out="<h2>".$name."</h2>";\r
                                $out.='<p><img src="http://f-droid.org/repo/icons/'.$icon.'" width=40>';\r
                                $out.=$summary;\r
                                $out.="</p>";\r
+\r
+                               $out.="<p>".$desc."</p>";\r
+\r
+                               $out.="<p><b>License:</b> ".$license."</p>";\r
+\r
+                               $out.="<p><b>Links:</b> ";\r
+                               if(strlen($web)>0)\r
+                                       $out.='<a href="'.$web.'">Website</a> ';\r
+                               if(strlen($issues)>0)\r
+                                       $out.='<a href="'.$issues.'">Issue Tracker</a> ';\r
+                               if(strlen($source)>0)\r
+                                       $out.='<a href="'.$source.'">Source Code</a>';\r
+                               $out.="</p>";\r
+\r
+                               $out.="<h3>Packages</h3>";\r
+                               foreach($apks as $apk) {\r
+                                       $out.="<p><b>Version ".$apk['version']."</b> - ";\r
+                                       $out.='<a href="http://f-droid.org/repo/'.$apk['apkname'].'">download</a> ';\r
+                                       $out.=$apk['size']." bytes";\r
+                                       $out.="</p>";\r
+                               }\r
+\r
                                return $out;\r
                        }\r
                }\r