freifunk/freifunk-versions
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix reference passing, add simple d-link support

Browse source
This commit is contained in:
Martin Schütte 2014-06-26 09:16:09 +00:00
parent d84e4b0e38
commit 755bf74c7b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
freifunk-versions.php
View file

@ -15,9 +15,11 @@ define('FF_HH_CACHETIME', 15);
/* gets metadata from URL, handles caching */ /* gets metadata from URL, handles caching */
function ff_hh_getmanifest ($basedir) { function ff_hh_getmanifest ($basedir) {
// Caching // Caching
if ( false === ( $manifest = get_transient( "ff_hh_manifest" ) ) ) { if ( WP_DEBUG || ( false === ( $manifest = get_transient( "ff_hh_manifest" ) ) ) ) {
$manifest = array(); $manifest = array();
$input = wp_remote_retrieve_body( wp_remote_get($basedir . 'sysupgrade/manifest') ); $url = $basedir . 'sysupgrade/manifest';
$http_response = wp_remote_get( $url ); // TODO: error handling
$input = wp_remote_retrieve_body( $http_response );
foreach ( explode("\n", $input) as $line ) { foreach ( explode("\n", $input) as $line ) {
$ret = sscanf($line, '%s %s %s %s', $hw, $sw_ver, $hash, $filename); $ret = sscanf($line, '%s %s %s %s', $hw, $sw_ver, $hash, $filename);
if ($ret === 4) { if ($ret === 4) {
@ -104,6 +106,10 @@ function ff_hh_shortcode_versions( $atts, $content, $name ) {
$hw = str_replace('-m', ' M2', $hw); $hw = str_replace('-m', ' M2', $hw);
$hw = str_replace('-', ' ', $hw); $hw = str_replace('-', ' ', $hw);
$hw = ucwords($hw); $hw = ucwords($hw);
} elseif (!strncmp($hw, 'd-link', 6)) {
if ($grep) $hw = str_replace($grep, '', $hw);
$hw = str_replace('-', ' ', $hw);
$hw = str_replace('d link dir ', 'D-Link DIR-', $hw);
} }
$outstr .= sprintf("\n<tr><td>%s</td>", $hw); $outstr .= sprintf("\n<tr><td>%s</td>", $hw);