<?php
/*
Plugin Name: WP FDroid
-Plugin URI: http://f-droid.org/repository
+Plugin URI: https://f-droid.org/
Description: An FDroid repository browser
Author: Ciaran Gultnieks
-Version: 0.01
+Version: 0.02
Author URI: http://ciarang.com
Revision history
+0.02 - 2014-04-17: It's changed somewhat since then
0.01 - 2010-12-04: Initial development version
-*/
+ */
include('android-permissions.php');
+
+// Widget for displaying latest apps.
+class FDroidLatestWidget extends WP_Widget {
+
+ function FDroidLatestWidget() {
+ parent::__construct(false, 'F-Droid Latest Apps');
+ }
+
+ function widget( $args, $instance ) {
+ extract($args);
+ $title = apply_filters('widget_title', $instance['title']);
+ echo $before_widget;
+ echo $before_title . $title . $after_title;
+
+ $handle = fopen(getenv('DOCUMENT_ROOT').'/repo/latestapps.dat', 'r');
+ if ($handle) {
+ while (($buffer = fgets($handle, 4096)) !== false) {
+ $app = explode("\t", $buffer);
+ echo '<div style="width:100%">';
+ if(isset($app[2]) && trim($app[2])) {
+ echo '<img src="' . site_url() . '/repo/icons/'.$app[2].'" style="width:32px;border:none;float:right;" />';
+ }
+ echo '<p style="margin:0px;"><a href="/repository/browse/?fdid='.$app[0].'">';
+ echo $app[1].'</a><br/>';
+ if(isset($app[3]) && trim($app[3])) {
+ echo '<span style="color:#BBBBBB;">'.$app[3].'</span></p>';
+ }
+ echo '</div>';
+ }
+ fclose($handle);
+ }
+ echo $after_widget;
+ }
+
+ function update($new_instance, $old_instance) {
+ $instance = array();
+ $instance['title'] = (!empty($new_instance['title'])) ? strip_tags($new_instance['title']) : '';
+ return $instance;
+ }
+
+ function form($instance) {
+ if (isset($instance['title'])) {
+ $title = $instance['title'];
+ }
+ else {
+ $title = __('New title', 'text_domain');
+ }
+ ?>
+ <p>
+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+ <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>">
+ </p>
+ <?php
+ }
+}
+
+
class FDroid
{
// Constructor
function FDroid() {
- // Add filters etc here!
add_shortcode('fdroidrepo',array($this, 'do_shortcode'));
add_filter('query_vars',array($this, 'queryvars'));
$this->inited=false;
$this->site_path=getenv('DOCUMENT_ROOT');
+ add_action('widgets_init', function() {
+ register_widget('FDroidLatestWidget');
+ });
}
// Register additional query variables. (Handler for the 'query_vars' filter)
function queryvars($qvars) {
$qvars[]='fdfilter';
+ $qvars[]='fdcategory';
$qvars[]='fdid';
$qvars[]='fdpage';
$qvars[]='fdstyle';
}
}
- // Santiy check query vars
+ // Sanity check and standardise all query variables...
if(!isset($query_vars['fdpage']) || !is_numeric($query_vars['fdpage']) || $query_vars['fdpage'] <= 0) {
$query_vars['fdpage'] = 1;
+ } else {
+ $query_vars['fdpage'] = strval(intval($query_vars['fdpage']));
+ }
+ if(isset($query_vars['fdstyle']) && ($query_vars['fdstyle'] != 'list' && $query_vars['fdstyle'] != 'grid')) {
+ $query_vars['fdstyle'] = 'list';
+ }
+ if(isset($query_vars['fdcategory'])) {
+ if($query_vars['fdcategory'] == 'All categories') {
+ unset($query_vars['fdcategory']);
+ } else {
+ $query_vars['fdcategory'] = sanitize_text_field($query_vars['fdcategory']);
+ }
+ }
+ if(isset($query_vars['fdfilter'])) {
+ $query_vars['fdfilter'] = sanitize_text_field($query_vars['fdfilter']);
+ } else {
+ if(isset($attribs['search'])) {
+ $query_vars['fdfilter'] = '';
+ }
+ }
+ if(isset($query_vars['fdid'])) {
+ $query_vars['fdid'] = sanitize_text_field($query_vars['fdid']);
}
$out = '';
- if(isset($attribs['search']) && $query_vars['fdfilter']===null) {
- $query_vars['fdfilter'] = '';
- }
-
if($query_vars['fdid']!==null) {
$out.=$this->get_app($query_vars);
} else {
- if($query_vars['fdfilter'] !== null)
- $out.=$this->show_search($query_vars);
+ $out.='<form name="searchform" action="" method="get">';
+ $out.='<p><input name="fdfilter" type="text" value="'.esc_attr($query_vars['fdfilter']).'" size="30"> ';
+ $out.='<input type="hidden" name="fdpage" value="1">';
+ $out.='<input type="submit" value="Search"></p>';
+ $out.=$this->makeformdata($query_vars);
+ $out.='</form>'."\n";
$out.=$this->get_apps($query_vars);
}
}
+ // Get a URL for a full description of a license, as given by one of our
+ // pre-defined license abbreviations. This is a temporary function, as this
+ // needs to be data-driven so the same information can be used by the client,
+ // the web site and the documentation.
+ function getlicenseurl($license) {
+ switch($license) {
+ case 'MIT':
+ return 'https://www.gnu.org/licenses/license-list.html#X11License';
+ case 'NewBSD':
+ return 'https://www.gnu.org/licenses/license-list.html#ModifiedBSD';
+ case 'BSD':
+ return 'https://www.gnu.org/licenses/license-list.html#OriginalBSD';
+ case 'GPLv3':
+ case 'GPLv3+':
+ return 'https://www.gnu.org/licenses/license-list.html#GNUGPLv3';
+ case 'GPLv2':
+ case 'GPLv2+':
+ return 'https://www.gnu.org/licenses/license-list.html#GPLv2';
+ case 'AGPLv3':
+ case 'AGPLv3+':
+ return 'https://www.gnu.org/licenses/license-list.html#AGPLv3.0';
+ case 'LGPL':
+ return 'https://www.gnu.org/licenses/license-list.html#LGPL';
+ case 'LGPL':
+ case 'LGPLv3':
+ return 'https://www.gnu.org/licenses/license-list.html#LGPLv3';
+ case 'LGPLv2.1':
+ return 'https://www.gnu.org/licenses/license-list.html#LGPLv2.1';
+ case 'Apache2':
+ return 'https://www.gnu.org/licenses/license-list.html#apache2';
+ case 'WTFPL':
+ return 'https://www.gnu.org/licenses/license-list.html#WTFPL';
+ default:
+ return null;
+ }
+ }
+ 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";
+ case 19: return "4.4";
+ case 18: return "4.3";
+ case 17: return "4.2";
+ case 16: return "4.1";
+ case 15: return "4.0.3";
+ case 14: return "4.0";
+ case 13: return "3.2";
+ case 12: return "3.1";
+ case 11: return "3.0";
+ case 10: return "2.3.3";
+ case 9: return "2.3";
+ case 8: return "2.2";
+ case 7: return "2.1";
+ case 6: return "2.0.1";
+ case 5: return "2.0";
+ case 4: return "1.6";
+ case 3: return "1.5";
+ case 2: return "1.1";
+ case 1: return "1.0";
+ default: return "?";
+ }
+ }
+
function get_app($query_vars) {
global $permissions_data;
$permissions_object = new AndroidPermissions($this->site_path.'/wp-content/plugins/wp-fdroid/AndroidManifest.xml',
$apks=array();;
foreach($app->children() as $el) {
switch($el->getName()) {
- case "name":
- $name=$el;
- break;
- case "icon":
- $icon=$el;
- break;
- case "summary":
- $summary=$el;
- break;
- case "description":
- $desc=$el;
- break;
- case "license":
- $license=$el;
- break;
- case "source":
- $source=$el;
- break;
- case "tracker":
- $issues=$el;
- break;
- case "donate":
- $donate=$el;
- break;
- case "web":
- $web=$el;
- break;
- case "antifeatures";
- $antifeatures=$el;
- break;
- case "package":
- $thisapk=array();
- foreach($el->children() as $pel) {
- switch($pel->getName()) {
- case "version":
- $thisapk['version']=$pel;
- break;
- case "vercode":
- $thisapk['vercode']=$pel;
- break;
- case "apkname":
- $thisapk['apkname']=$pel;
- break;
- case "srcname":
- $thisapk['srcname']=$pel;
- break;
- case "hash":
- $thisapk['hash']=$pel;
- break;
- case "size":
- $thisapk['size']=$pel;
- break;
- case "sdkver":
- $thisapk['sdkver']=$pel;
- break;
- case "permissions":
- $thisapk['permissions']=$pel;
- break;
- }
+ case "name":
+ $name=$el;
+ break;
+ case "icon":
+ $icon=$el;
+ break;
+ case "summary":
+ $summary=$el;
+ break;
+ case "desc":
+ $desc=$el;
+ break;
+ 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;
+ case "flattr":
+ $flattr=$el;
+ break;
+ case "web":
+ $web=$el;
+ break;
+ case "antifeatures":
+ $antifeatures=$el;
+ break;
+ case "requirements":
+ $requirements=$el;
+ break;
+ case "package":
+ $thisapk=array();
+ foreach($el->children() as $pel) {
+ switch($pel->getName()) {
+ case "version":
+ $thisapk['version']=$pel;
+ break;
+ case "vercode":
+ $thisapk['vercode']=$pel;
+ break;
+ case "added":
+ $thisapk['added']=$pel;
+ break;
+ case "apkname":
+ $thisapk['apkname']=$pel;
+ break;
+ case "srcname":
+ $thisapk['srcname']=$pel;
+ break;
+ case "hash":
+ $thisapk['hash']=$pel;
+ break;
+ case "size":
+ $thisapk['size']=$pel;
+ break;
+ case "sdkver":
+ $thisapk['sdkver']=$pel;
+ break;
+ case "maxsdkver":
+ $thisapk['maxsdkver']=$pel;
+ break;
+ case "nativecode":
+ $thisapk['nativecode']=$pel;
+ break;
+ case "permissions":
+ $thisapk['permissions']=$pel;
+ break;
}
- $apks[]=$thisapk;
+ }
+ $apks[]=$thisapk;
}
}
// Output app information
$out='<div id="appheader">';
- $out.='<div style="float:left;padding-right:10px;"><img src="http://f-droid.org/repo/icons/'.$icon.'" width=48></div>';
+ $out.='<div style="float:left;padding-right:10px;"><img src="' . site_url() . '/repo/icons/'.$icon.'" width=48></div>';
$out.='<p><span style="font-size:20px">'.$name."</span>";
$out.="<br>".$summary."</p>";
$out.="</div>";
- $out.="<p>".$desc."</p>";
+ $out.=str_replace('href="fdroid.app:', 'href="/repository/browse/?fdid=', $desc);
if(isset($antifeatures)) {
$antifeaturesArray = explode(',',$antifeatures);
foreach($antifeaturesArray as $antifeature) {
- $antifeatureDesctiption = $this->get_antifeature_description($antifeature);
- $out.='<p style="border:3px solid #CC0000;background-color:#FFDDDD;padding:5px;"><strong>'.$antifeatureDesctiption['name'].'</strong><br />';
- $out.=$antifeatureDesctiption['description'].'</p>';
+ $antifeatureDescription = $this->get_antifeature_description($antifeature);
+ $out.='<p style="border:3px solid #CC0000;background-color:#FFDDDD;padding:5px;"><strong>'.$antifeatureDescription['name'].'</strong><br />';
+ $out.=$antifeatureDescription['description'].' <a href="/wiki/page/Antifeature:'.$antifeature.'">more...</a></p>';
}
}
- $out.="<p><b>License:</b> ".$license."</p>";
+ $out.="<p>";
+ $licenseurl=$this->getlicenseurl($license);
+ $out.="<b>License:</b> ";
+ if($licenseurl)
+ $out.='<a href="'.$licenseurl.'" target="_blank">';
+ $out.=$license;
+ if($licenseurl)
+ $out.='</a>';
+
+ if(isset($requirements)) {
+ $out.='<br /><b>Additional requirements:</b> '.$requirements;
+ }
+ $out.="</p>";
$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($donate && strlen($donate)>0)
+ 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)
+ $out.='<b>Flattr:</b> <a href="https://flattr.com/thing/'.$flattr.'"><img src="/wp-content/uploads/flattr-badge-large.png" style="border:0" /></a><br />';
$out.="</p>";
+ $out.="<p>For full details and additional technical information, see ";
+ $out.="<a href=\"/wiki/page/".$query_vars['fdid']."\">this application's page</a> on the F-Droid wiki.</p>";
+
$out.='<script type="text/javascript">';
$out.='function showHidePermissions(id) {';
$out.=' if(document.getElementById(id).style.display==\'none\')';
$out.='</script>';
$out.="<h3>Packages</h3>";
+
+ $out.='<div style="float:right; margin-left:10px;"><a id="downloadbutton" href="https://f-droid.org/FDroid.apk"><span>Download F-Droid</span></a></div>';
+ $out.="<p>Although APK downloads are available below to give ";
+ $out.="you the choice, you should be aware that by installing that way you ";
+ $out.="will not receive update notifications, and it's a less secure way ";
+ $out.="to download. ";
+ $out.="We recommend that you install the F-Droid client and use that.</p>";
+
$i=0;
foreach($apks as $apk) {
$first = $i+1==count($apks);
- $out.="<p><b>Version ".$apk['version']."</b><br />";
- $out.='<a href="http://f-droid.org/repo/'.$apk['apkname'].'">download apk</a> ';
+ $out.="<p><b>Version ".$apk['version']."</b>";
+ $out.=" - Added on ".$apk['added']."<br />";
+
+ $hasminsdk = isset($apk['sdkver']);
+ $hasmaxsdk = isset($apk['maxsdkver']);
+ if($hasminsdk && $hasmaxsdk) {
+ $out.="<p>This version requires Android ".$this->androidversion($apk['sdkver'])." up to ".$this->androidversion($apk['maxsdkver'])."</p>";
+ } elseif($hasminsdk) {
+ $out.="<p>This version requires Android ".$this->androidversion($apk['sdkver'])." or newer.</p>";
+ } elseif($hasmaxsdk) {
+ $out.="<p>This version requires Android ".$this->androidversion($apk['maxsdkver'])." or old.</p>";
+ }
+
+ $hasabis = isset($apk['nativecode']);
+ if($hasabis) {
+ $abis = str_replace(',', ' ', $apk['nativecode']);
+ $out.="<p>This version uses native code and is built for: ".$abis."</p>";
+ }
+
+ // Is this source or binary?
+ $srcbuild = isset($apk['srcname']) && file_exists($this->site_path.'/repo/'.$apk['srcname']);
+
+ $out.="<p>This version is built and signed by ";
+ if($srcbuild) {
+ $out.="F-Droid, and guaranteed to correspond to the source tarball below.</p>";
+ } else {
+ $out.="the original developer.</p>";
+ }
+ $out.='<a href="https://f-droid.org/repo/'.$apk['apkname'].'">download apk</a> ';
$out.=$this->human_readable_size($apk['size']);
$diffSize = $apk['diff']['size'];
if(abs($diffSize) > 500) {
$out.=$diffSize>0?'+':'';
$out.=$this->human_readable_size($diffSize, 1).')</span>';
}
- if(isset($apk['srcname']) && file_exists($this->site_path.'/repo/'.$apk['srcname'])) {
- $out.='<br /><a href="http://f-droid.org/repo/'.$apk['srcname'].'">source tarball</a> ';
+ if(file_exists($this->site_path.'/repo/'.$apk['apkname'].'.asc')) {
+ $out.=' <a href="https://f-droid.org/repo/'.$apk['apkname'].'.asc">GPG Signature</a> ';
+ }
+ if($srcbuild) {
+ $out.='<br /><a href="https://f-droid.org/repo/'.$apk['srcname'].'">source tarball</a> ';
$out.=$this->human_readable_size(filesize($this->site_path.'/repo/'.$apk['srcname']));
}
/*if($i==0)
$divStyleDisplay='block';
else*/
- $divStyleDisplay='none';
+ $divStyleDisplay='none';
$divId='permissions'.$i;
$out.='<br /><a href="javascript:void(0);" onClick="showHidePermissions(\''.$divId.'\');">view permissions</a>';
$out.=' <span style="color:#AAAAAA;">['.$summary.']</span>';
}
$summary = '';
- foreach($summaryCount as $protectionLevel => $count) {
- $summary .= $this->get_permission_protection_level_icon($protectionLevel, 'regular').' '.$count;
- $summary .= ', ';
+ if(isset($summaryCount)) {
+ foreach($summaryCount as $protectionLevel => $count) {
+ $summary .= $this->get_permission_protection_level_icon($protectionLevel, 'regular').' '.$count;
+ $summary .= ', ';
+ }
}
$summary = substr($summary,0,-2);
$iconString .= '<span style="color:#DD9900;';
if($size=='adjusted')
$iconString .= 'font-size:150%;';
- $iconString .= '">⚠</span>';
+ $iconString .= '">⚠</span>'; // WARNING SIGN
}
elseif($protection_level=='normal') {
$iconString .= '<span style="color:#6666FF;';
if($size=='adjusted')
$iconString .= 'font-size:110%;';
- $iconString .= '">ⓘ</span>';
+ $iconString .= '">ⓘ</span>'; // CIRCLED LATIN SMALL LETTER I
+ }
+ elseif($protection_level=='signature') {
+ $iconString .= '<span style="color:#33AAAA;';
+ if($size=='adjusted')
+ $iconString .= 'font-size:140%;';
+ $iconString .= '">✽</span>'; // HEAVY TEARDROP-SPOKED ASTERISK
+ }
+ elseif($protection_level=='signatureOrSystem') {
+ $iconString .= '<span style="color:#DD66DD;';
+ if($size=='adjusted')
+ $iconString .= 'font-size:140%;';
+ $iconString .= '">⚛</span>'; // ATOM SYMBOL
}
else {
$iconString .= '<span style="color:#33AA33';
if($size=='adjusted')
$iconString .= ';font-size:130%;';
- $iconString .= '">⚙</span>';
+ $iconString .= '">⚙</span>'; // GEAR
}
return $iconString;
private function human_readable_size($size, $minDiv=0) {
$si_prefix = array('bytes','kB','MB');
- $div = 1000;
+ $div = 1024;
for($i=0;(abs($size) > $div && $i < count($si_prefix)) || $i<$minDiv;$i++) {
$size /= $div;
private function get_antifeature_description($antifeature) {
// Anti feature names and descriptions
- $antifeatureDesctiption['ads']['name'] = 'Advertising';
- $antifeatureDesctiption['ads']['description'] = 'This application contains advertising';
- $antifeatureDesctiption['tracking']['name'] = 'Tracks You';
- $antifeatureDesctiption['tracking']['description'] = 'This application tracks and reports your activity to somewhere';
- $antifeatureDesctiption['nonfreenet']['name'] = 'Non-Free Network Services';
- $antifeatureDesctiption['nonfreenet']['description'] = 'This application promotes a non-Free network service';
- $antifeatureDesctiption['nonfreeadd']['name'] = 'Non-Free Addons';
- $antifeatureDesctiption['nonfreeadd']['description'] = 'This application promotes non-Free add-ons';
- $antifeatureDesctiption['nonfreedep']['name'] = 'Non-Free Dependencies';
- $antifeatureDesctiption['nonfreedep']['description'] = 'This application depends on another non-Free application';
-
- $antifeatureLower = strtolower($antifeature);
- if(isset($antifeatureDesctiption[$antifeatureLower])) {
- return $antifeatureDesctiption[$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.';
+ $antifeatureDescription['NonFreeAssets']['name'] = 'Non-Free Assets';
+ $antifeatureDescription['NonFreeAssets']['description'] = 'This application contains non-free assets.';
+
+ if(isset($antifeatureDescription[$antifeature])) {
+ return $antifeatureDescription[$antifeature];
}
return array('name'=>$antifeature);
}
if(($query_vars['fdfilter']===null || $query_vars['fdfilter']!='') && $numpages>0)
{
$out.='<div style="float:left;">';
- if($query_vars['fdfilter']===null)
- $out.="All applications";
- else
- $out.='Applications matching "'.$query_vars['fdfilter'].'"';
+ if($query_vars['fdfilter']===null) {
+
+ $categories = array('All categories');
+ $handle = fopen(getenv('DOCUMENT_ROOT').'/repo/categories.txt', 'r');
+ if ($handle) {
+ while (($buffer = fgets($handle, 4096)) !== false) {
+ $categories[] = rtrim($buffer);
+ }
+ fclose($handle);
+ }
+
+ $out.='<form name="categoryform" action="" method="get">';
+ $out.=$this->makeformdata($query_vars);
+
+ $out.='<select name="fdcategory" style="color:#333333;" onChange="document.categoryform.submit();">';
+ foreach($categories as $category) {
+ $out.='<option';
+ if(isset($query_vars['fdcategory']) && $category==$query_vars['fdcategory'])
+ $out.=' selected';
+ $out.='>'.$category.'</option>';
+ }
+ $out.='</select>';
+
+ $out.='</form>'."\n";
+ }
+ else {
+ $out.='Applications matching "'.esc_attr($query_vars['fdfilter']).'"';
+ }
$out.="</div>";
$out.='<div style="float:right;">';
- $out.='<a href="'.makelink($query_vars, array('fdstyle'=>'list','fdpage'=>'1')).'">List</a> | ';
- $out.='<a href="'.makelink($query_vars, array('fdstyle'=>'grid','fdpage'=>'1')).'">Grid</a>';
+ $out.='<a href="'.makelink($query_vars, array('fdstyle'=>'list', 'fdpage'=>1)).'">List</a> | ';
+ $out.='<a href="'.makelink($query_vars, array('fdstyle'=>'grid', 'fdpage'=>1)).'">Grid</a>';
$out.='</div>';
$out.='<br break="all"/>';
}
- function show_search($query_vars) {
+ function makeformdata($query_vars) {
$out='';
- $out.='<form name="searchform" action="" method="get">';
- $out.='<p><input name="fdfilter" type="text" value="'.$query_vars['fdfilter'].'" size="30"> ';
- $out.='<input type="submit" value="Search"></p>';
- $out.='<input type="hidden" name="page_id" value="'.get_query_var('page_id').'">';
+ $out.='<input type="hidden" name="page_id" value="'.(int)get_query_var('page_id').'">';
foreach($query_vars as $name => $value) {
- if($value !== null && $name != 'fdfilter')
- $out.='<input type="hidden" name="'.$name.'" value="'.$value.'">';
+ if($value !== null && $name != 'fdfilter' && $name != 'fdpage')
+ $out.='<input type="hidden" name="'.esc_attr($name).'" value="'.esc_attr($value).'">';
}
- $out.='</form>'."\n";
-
return $out;
}
$appinfo['id']=$appinfo['attrs']['id'];
foreach($app->children() as $el) {
switch($el->getName()) {
- case "name":
- $appinfo['name']=$el;
- break;
- case "icon":
- $appinfo['icon']=$el;
- break;
- case "summary":
- $appinfo['summary']=$el;
- break;
- case "description":
- $appinfo['description']=$el;
- break;
- case "license":
- $appinfo['license']=$el;
- break;
+ case "name":
+ $appinfo['name']=$el;
+ break;
+ case "icon":
+ $appinfo['icon']=$el;
+ break;
+ case "summary":
+ $appinfo['summary']=$el;
+ break;
+ case "desc":
+ $appinfo['description']=$el;
+ break;
+ case "license":
+ $appinfo['license']=$el;
+ break;
+ case "category":
+ $appinfo['category']=$el;
+ break;
}
}
- if($query_vars['fdfilter']===null || $query_vars['fdfilter']!='' && (stristr($appinfo['name'],$query_vars['fdfilter']) || stristr($appinfo['summary'],$query_vars['fdfilter']) || stristr($appinfo['description'],$query_vars['fdfilter']))) {
+ if(($query_vars['fdfilter']===null || $query_vars['fdfilter']!='' && (stristr($appinfo['name'],$query_vars['fdfilter']) || stristr($appinfo['id'],$query_vars['fdfilter']) || stristr($appinfo['summary'],$query_vars['fdfilter']) || stristr($appinfo['description'],$query_vars['fdfilter']))) && (!isset($query_vars['fdcategory']) || $query_vars['fdcategory'] && $query_vars['fdcategory']==$appinfo['category'])) {
if($skipped<($query_vars['fdpage']-1)*$outputter->perpage) {
$skipped++;
} else if($got<$outputter->perpage) {
function outputEntry($query_vars, $appinfo) {
$out="";
- $out.="<hr>\n";
+ $out.='<hr style="clear:both;" />'."\n";
+ $out.='<a href="'.makelink($query_vars, array('fdid'=>$appinfo['id'])).'">';
$out.='<div id="appheader">';
- $out.='<div style="float:left;padding-right:10px;"><img src="http://f-droid.org/repo/icons/'.$appinfo['icon'].'" style="width:48px;"></div>';
+ $out.='<div style="float:left;padding-right:10px;"><img src="' . site_url() . '/repo/icons/'.$appinfo['icon'].'" style="width:48px;border:none;"></div>';
$out.='<div style="float:right;">';
- $out.='<p><a href="';
- $out.=makelink($query_vars, array('fdid'=>$appinfo['id']));
- $out.='">Details...</a>';
- $out.="</p>";
+ $out.='<p>Details...</p>';
$out.="</div>\n";
- $out.='<p><span style="font-size:20px">'.$appinfo['name']."</span>";
+ $out.='<p style="color:#000000;"><span style="font-size:20px;">'.$appinfo['name']."</span>";
$out.="<br>".$appinfo['summary']."</p>\n";
$out.="</div>\n";
+ $out.='</a>';
return $out;
}
$out.='<div id="appheader" style="text-align:center;width:110px;">';
$out.='<a href="'.$link.'" style="border-bottom-style:none;">';
- $out.='<img src="http://f-droid.org/repo/icons/'.$appinfo['icon'].'" style="width:48px;border-width:0;padding-top:5px;padding-bottom:5px;"><br/>';
+ $out.='<img src="' . site_url() . '/repo/icons/'.$appinfo['icon'].'" style="width:48px;border-width:0;padding-top:5px;padding-bottom:5px;"><br/>';
$out.=$appinfo['name'].'<br/>';
$out.='</a>';
// Make a link to this page, with the current query vars attached and desired params added/modified
function makelink($query_vars, $params=array()) {
$link=get_permalink();
- $vars=linkify(array_merge($query_vars, $params));
+
+ $p = array_merge($query_vars, $params);
+
+ // Page 1 is the default, don't clutter urls with it...
+ if($p['fdpage'] == 1)
+ unset($p['fdpage']);
+ // Likewise for list style...
+ if($p['fdstyle'] == 'list')
+ unset($p['fdstyle']);
+
+ $vars=linkify($p);
if(strlen($vars)==0)
return $link;
if(strpos($link,'?')===false)
$retvar = '';
foreach($vars as $k => $v) {
if($k!==null && $v!==null && $v!='')
- $retvar .= $k.'='.$v.'&';
+ $retvar .= $k.'='.urlencode($v).'&';
}
return substr($retvar,0,-1);
}
-
$wp_fdroid = new FDroid();
~ianmdlvl / fdroidserver.git / blobdiff