Merge pull request #576 from beardy-unixer/master

Allow directories to stop being directories without killing anyone.

2 files changed, 22 insertions, 15 deletions

diff --git a/mod/achievements.php b/mod/achievements.php
index 1910def73..1d0018b08 100644
--- a/mod/achievements.php
+++ b/mod/achievements.php
@@ -1,6 +1,9 @@
 <?php
 
 function achievements_content(&$a) {
+	// This doesn't work, so
+	if (! is_developer())
+		return;
 
 	if(argc() > 1)
 		$which = argv(1);
@@ -28,6 +31,9 @@ function achievements_content(&$a) {
 	return;
     }
 
+	$newmembertext = t('Some blurb about what to do when you\'re new here');
+
+
 //	By default, all badges are false
 	$contactbadge = false;
 	$profilebadge = false;
@@ -70,15 +76,12 @@ function achievements_content(&$a) {
 	if($r)
 		$keywordsbadge = 1;
 
-// FIXME - stick ths in a template, and make it look pretty.
-	$o .= "Template not implemented";
-	$o .= "If this is one, you get the profile badge" . $profilebadge . "<br>";
-	$o .= "If this is one, you get the contact badge" . $contactbadge . "<br>";
-	$o .= "If this is one you get the keywords badge" . $keywordsbadge . "<br>";
-	$o .= "I haven't done the top level posts badge yet" . $toplevelpostsbadge . "<br>";
-	$o .= "I haven't done the number of channels badge yet" . $channelsbadge;
-	
-	
-return $o;
+    return replace_macros(get_markup_template("achievements.tpl"), array(
+                '$newmembertext' => $newmembertext,
+                '$profilebadge' => $profilebadge,
+                '$contactbadge' => $contactbadge,
+                '$keywordsbadge' => $keywordsbadge,
+                '$channelsbadge' => $channelsbadge
+));
 
 }
diff --git a/mod/chanview.php b/mod/chanview.php
index 449a98bb1..3bf0f3268 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -74,15 +74,19 @@ function chanview_content(&$a) {
 	}
 
 	if(! $a->poi) {
-		notice( t('Channel not found.') . EOL);
-		return;
+//		We don't know who this is, and we can't figure it out from the URL
+//		On the plus side, there's a good chance we know somebody else at that 
+//		hub so sending them there with a Zid will probably work anyway.
+		$url = ($_REQUEST['url']);
+		if($observer)
+			$url = zid($url);
 	}
 
-
+	if ($a->poi) {
 	$url = $a->poi['xchan_url'];
 	if($observer)
 		$url = zid($url);
-
+	}
 	// let somebody over-ride the iframed viewport presentation
 	// or let's just declare this a failed experiment.
 
@@ -97,4 +101,4 @@ function chanview_content(&$a) {
 
 //	return $o;
 
-}
\ No newline at end of file
+}