From: Ciaran Gultnieks Date: Wed, 27 Nov 2013 10:49:44 +0000 (+0000) Subject: Tidy up a few antifeature-related things in web repo browser X-Git-Tag: 0.1~137 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2ce0b14d9227d185d16b6f6562e4b03cda665584;p=fdroidserver.git Tidy up a few antifeature-related things in web repo browser --- diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php index 5db6a52f..c837c024 100644 --- a/wp-fdroid/wp-fdroid.php +++ b/wp-fdroid/wp-fdroid.php @@ -490,22 +490,21 @@ class FDroid private function get_antifeature_description($antifeature) { // Anti feature names and descriptions - $antifeatureDescription['ads']['name'] = 'Advertising'; - $antifeatureDescription['ads']['description'] = 'This application contains advertising'; - $antifeatureDescription['tracking']['name'] = 'Tracks You'; - $antifeatureDescription['tracking']['description'] = 'This application tracks and reports your activity to somewhere'; - $antifeatureDescription['nonfreenet']['name'] = 'Non-Free Network Services'; - $antifeatureDescription['nonfreenet']['description'] = 'This application promotes a non-Free network service'; - $antifeatureDescription['nonfreeadd']['name'] = 'Non-Free Addons'; - $antifeatureDescription['nonfreeadd']['description'] = 'This application promotes non-Free add-ons'; - $antifeatureDescription['nonfreedep']['name'] = 'Non-Free Dependencies'; - $antifeatureDescription['nonfreedep']['description'] = 'This application depends on another non-Free application'; - $antifeatureDescription['upstreamnonfree']['name'] = 'Upstream Non-Free'; - $antifeatureDescription['nonfreedep']['description'] = 'The upstream source code is non-free'; - - $antifeatureLower = strtolower($antifeature); - if(isset($antifeatureDescription[$antifeatureLower])) { - return $antifeatureDescription[$antifeatureLower]; + $antifeatureDescription['Ads']['name'] = 'Advertising'; + $antifeatureDescription['Ads']['description'] = 'This application contains advertising.'; + $antifeatureDescription['Tracking']['name'] = 'Tracks You'; + $antifeatureDescription['Tracking']['description'] = 'This application tracks and reports your activity to somewhere.'; + $antifeatureDescription['NonFreeNet']['name'] = 'Non-Free Network Services'; + $antifeatureDescription['NonFreeNet']['description'] = 'This application promotes a non-Free network service.'; + $antifeatureDescription['NonFreeAdd']['name'] = 'Non-Free Addons'; + $antifeatureDescription['NonFreeAdd']['description'] = 'This application promotes non-Free add-ons.'; + $antifeatureDescription['NonFreeDep']['name'] = 'Non-Free Dependencies'; + $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.'; + + if(isset($antifeatureDescription[$antifeature])) { + return $antifeatureDescription[$antifeature]; } return array('name'=>$antifeature); }