Merge pull request #28 from Hypolite/issue/#25

wrong download link
This commit is contained in:
Hypolite Petovan 2017-08-03 21:43:24 -04:00 committed by GitHub
commit 386e70fd1f
7 changed files with 73 additions and 59 deletions

View file

@ -79,4 +79,6 @@ function directory_content(App $a)
'results' => $r, 'results' => $r,
'filter' => $forums ? 'forums' : '', 'filter' => $forums ? 'forums' : '',
)); ));
killme();
} }

View file

@ -1,10 +1,13 @@
<?php <?php
use Friendica\Directory\Rendering\View; use Friendica\Directory\Rendering\View;
if (!function_exists('help_content')) { if (!function_exists('help_content')) {
function help_content(&$a) { function help_content(&$a)
{
$view = new View('help'); $view = new View('help');
$view->output(); $view->output();
}
}
killme();
}
}

View file

@ -14,4 +14,5 @@ function home_content(&$a) {
'profiles' => $profiles 'profiles' => $profiles
)); ));
killme();
}} }}

View file

@ -94,4 +94,6 @@ function search_content(App $a)
'filter' => $filter, 'filter' => $filter,
'query' => x($_GET, 'query') ? $_GET['query'] : '' 'query' => x($_GET, 'query') ? $_GET['query'] : ''
)); ));
killme();
} }

View file

@ -5,7 +5,6 @@ use Friendica\Directory\Rendering\View;
require_once 'include/site-health.php'; require_once 'include/site-health.php';
function servers_content(&$a) { function servers_content(&$a) {
$sites = array(); $sites = array();
//Find the user count per site. //Find the user count per site.
@ -14,8 +13,9 @@ function servers_content(&$a) {
foreach ($r as $rr) { foreach ($r as $rr) {
$site = parse_site_from_url($rr['homepage']); $site = parse_site_from_url($rr['homepage']);
if ($site) { if ($site) {
if(!isset($sites[$site])) if (!isset($sites[$site])) {
$sites[$site] = 0; $sites[$site] = 0;
}
$sites[$site] ++; $sites[$site] ++;
} }
} }
@ -38,17 +38,20 @@ function servers_content(&$a) {
arsort($sites_with_health); arsort($sites_with_health);
$total = 0; $total = 0;
$public_sites = array(); $public_sites = array();
foreach($sites_with_health as $k => $v)
{
foreach ($sites_with_health as $k => $v) {
//Stop at unhealthy sites. //Stop at unhealthy sites.
$site = $site_healths[$k]; $site = $site_healths[$k];
if($site['health_score'] <= 20) break; if ($site['health_score'] <= 20) {
break;
}
//Skip small sites. //Skip small sites.
$users = $sites[$k]; $users = $sites[$k];
if($users < 5) continue; if ($users < 5) {
continue;
}
//Add health score name and user count. //Add health score name and user count.
$site['health_score_name'] = health_score_to_name($site['health_score']); $site['health_score_name'] = health_score_to_name($site['health_score']);
@ -103,7 +106,6 @@ function servers_content(&$a) {
//Count the result. //Count the result.
$total ++; $total ++;
} }
//In case we asked for a surprise, pick a random one from the top 10! :D //In case we asked for a surprise, pick a random one from the top 10! :D
@ -115,7 +117,6 @@ function servers_content(&$a) {
exit; exit;
} }
//Show results. //Show results.
$view = new View('servers'); $view = new View('servers');
@ -124,4 +125,5 @@ function servers_content(&$a) {
'sites' => $public_sites 'sites' => $public_sites
)); ));
killme();
} }

View file

@ -1,10 +1,14 @@
<?php <?php
use Friendica\Directory\Rendering\View; use Friendica\Directory\Rendering\View;
if (!function_exists('stats_content')) { if (!function_exists('stats_content')) {
function stats_content(&$a) { function stats_content(&$a)
{
$view = new View('stats'); $view = new View('stats');
$view->output(); $view->output();
killme();
} }
} }

View file

@ -2,7 +2,7 @@
<div class="sites"> <div class="sites">
<h1>Public servers</h1> <h1>Public servers</h1>
<p class="intro"> <p class="intro">
If you are not interested in <a href="http://friendica.com/download">hosting your own server</a>, you can still use Friendica. If you are not interested in <a href="http://friendi.ca/installation/">hosting your own server</a>, you can still use Friendica.
Here are some public server run by enthousiasts that you can join. Here are some public server run by enthousiasts that you can join.
We recommend these based on their <abbr title="Decent speed, proper security, recent version, etc.">health</abbr>. We recommend these based on their <abbr title="Decent speed, proper security, recent version, etc.">health</abbr>.
</p> </p>