Donate links (for apps that have them) into the index, and on the web site

diff --git a/metadata.py b/metadata.py
index acc4a162f56072c6fefad08228a655d11add45ae..2d3d3cf49251aabfeb75eff59c9dbf5829cc70e4 100644 (file)
--- a/metadata.py
+++ b/metadata.py
@@ -34,7 +34,7 @@ def read_metadata():
         thisinfo['web'] = ''
         thisinfo['source'] = ''
         thisinfo['tracker'] = ''
-        thisinfo['donate'] = ''
+        thisinfo['donate'] = None
         thisinfo['disabled'] = None
         thisinfo['antifeatures'] = None
         thisinfo['marketversion'] = ''

diff --git a/update.py b/update.py
index a2fb8c23b9e37fd06d69ecb1b3b9021be3420244..588258157380446bb00391020cff1066b9ff6b7d 100644 (file)
--- a/update.py
+++ b/update.py
@@ -255,6 +255,8 @@ for app in apps:
         addElement('web', app['web'], doc, apel)
         addElement('source', app['source'], doc, apel)
         addElement('tracker', app['tracker'], doc, apel)
+        if app['donate'] != None:
+            addElement('donate', app['donate'], doc, apel)
         addElement('marketversion', app['marketversion'], doc, apel)
         addElement('marketvercode', app['marketvercode'], doc, apel)
         if not (app['antifeatures'] is None):

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 7cb186eeaa8437d0154c54d24e0fe3b0b53274b4..d6c556f3a85806c3ec1873cc77a8e77d70999641 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -18,7 +18,7 @@ class FDroid
     // Our text domain, for internationalisation\r
     var $textdom='wp-fdroid';\r
 \r
-        var $site_path = "/var/www/fdroid";\r
+    var $site_path = "/home/fdroid/public_html";\r
 \r
     // Constructor\r
     function FDroid() {\r
@@ -127,6 +127,9 @@ class FDroid
                         case "tracker":\r
                             $issues=$el;\r
                             break;\r
+                        case "donate":\r
+                            $donate=$el;\r
+                            break;\r
                         case "web":\r
                             $web=$el;\r
                             break;\r
@@ -179,6 +182,8 @@ class FDroid
                     $out.='<b>Issue Tracker:</b> <a href="'.$issues.'">'.$issues.'</a><br />';\r
                 if(strlen($source)>0)\r
                     $out.='<b>Source Code:</b> <a href="'.$source.'">'.$source.'</a><br />';\r
+                if($donate && strlen($donate)>0)\r
+                    $out.='<b>Donate:</b> <a href="'.$donate.'">'.$donate.'</a><br />';\r
                 $out.="</p>";\r
 \r
                 $out.="<h3>Packages</h3>";\r