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

wrong download link

mod/directory.php

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

mod/help.php

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

mod/home.php

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

mod/search.php

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

mod/servers.php

@@ -5,17 +5,17 @@ use Friendica\Directory\Rendering\View;
 require_once 'include/site-health.php';
 
 function servers_content(&$a) {
-
 	$sites = array();
 
 	//Find the user count per site.
 	$r = q("SELECT `homepage` FROM `profile`");
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (count($r)) {
+		foreach ($r as $rr) {
 			$site = parse_site_from_url($rr['homepage']);
-			if($site) {
-				if(!isset($sites[$site]))
+			if ($site) {
+				if (!isset($sites[$site])) {
 					$sites[$site] = 0;
+				}
 				$sites[$site] ++;
 			}
 		}
@@ -26,8 +26,8 @@ function servers_content(&$a) {
 	$site_healths = array();
 
 	$r = q("SELECT * FROM `site-health` WHERE `reg_policy`='REGISTER_OPEN' AND `ssl_state` = 1");
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (count($r)) {
+		foreach ($r as $rr) {
 			if (isset($sites[$rr['base_url']])) {
 				$sites_with_health[$rr['base_url']] = (($sites[$rr['base_url']] / 100) + 10) * intval($rr['health_score']);
 				$site_healths[$rr['base_url']] = $rr;
@@ -38,17 +38,20 @@ function servers_content(&$a) {
 	arsort($sites_with_health);
 	$total = 0;
 	$public_sites = array();
-	foreach($sites_with_health as $k => $v)
-	{
 
+	foreach ($sites_with_health as $k => $v) {
 		//Stop at unhealthy sites.
 		$site = $site_healths[$k];
 
-		if($site['health_score'] <= 20) break;
+		if ($site['health_score'] <= 20) {
+			break;
+		}
 
 		//Skip small sites.
 		$users = $sites[$k];
-		if($users < 5) continue;
+		if ($users < 5) {
+			continue;
+		}
 
 		//Add health score name and user count.
 		$site['health_score_name'] = health_score_to_name($site['health_score']);
@@ -57,7 +60,7 @@ function servers_content(&$a) {
 		//Figure out what this server supports.
 		$plugins = explode("\r\n", $site['plugins']);
 		$site['plugins'] = $plugins;
-		$hasPlugin = function(array $input)use($plugins){
+		$hasPlugin = function (array $input) use ($plugins) {
 			return !!count(array_intersect($input, $plugins));
 		};
 
@@ -92,9 +95,9 @@ function servers_content(&$a) {
 
 		//Get the difference.
 		$site['supports_more'] = 0;
-		foreach ($site['supports'] as $key => $value){
-			if($value && !array_key_exists($key, $site['popular_supports'])){
-				$site['supports_more']++;
+		foreach ($site['supports'] as $key => $value) {
+			if ($value && !array_key_exists($key, $site['popular_supports'])) {
+				$site['supports_more'] ++;
 			}
 		}
 
@@ -103,19 +106,17 @@ function servers_content(&$a) {
 
 		//Count the result.
 		$total ++;
-
 	}
 
 	//In case we asked for a surprise, pick a random one from the top 10! :D
-	if($a->argc > 1 && $a->argv[1] == 'surprise'){
+	if ($a->argc > 1 && $a->argv[1] == 'surprise') {
 		$max = min(count($public_sites), 10);
-		$i = mt_rand(0, $max-1);
+		$i = mt_rand(0, $max - 1);
 		$surpriseSite = $public_sites[$i];
-		header('Location:'.$surpriseSite['base_url'].'/register');
+		header('Location:' . $surpriseSite['base_url'] . '/register');
 		exit;
 	}
 
-
 	//Show results.
 	$view = new View('servers');
 
@@ -124,4 +125,5 @@ function servers_content(&$a) {
 		'sites' => $public_sites
 	));
 
+	killme();
 }

mod/stats.php

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

src/templates/view/servers.php

@@ -2,7 +2,7 @@
     <div class="sites">
         <h1>Public servers</h1>
         <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.
             We recommend these based on their <abbr title="Decent speed, proper security, recent version, etc.">health</abbr>.
         </p>