web: tweaks. disable "friends and family email" (abused by spammers)

html/inc/bootstrap.inc

@@ -122,10 +122,8 @@ function sample_navbar($prefix, $user, $fixed) {
     if (defined('NO_COMPUTING')) {
         // this is for projects that don't do computing, e.g. BOSSA-based
         //
-        navbar_menu(tra("Participants"), array(
+        navbar_menu(tra("Participate"), array(
             array(tra("Do work"), $prefix."bossa_apps.php"),
-            array(tra("Your account"), $prefix."home.php", tra("view stats, modify preferences")),
-            array(tra("Teams"), $prefix."team.php", tra("create or join a team"))
         ));
     } else {
         navbar_menu(tra("Project"), array(

html/inc/news.inc

@@ -38,7 +38,7 @@ function news_item($date, $title, $post) {
     ";
     if ($forum_link && !DISABLE_FORUMS) {
         echo "
-            &middot; <a href=\"".url_base()."forum_thread.php?id=$post->thread\"> ".tra("Comment")."</a>
+            &middot; <a href=\"".url_base()."forum_thread.php?id=$post->thread\"> ".tra("Discuss")."</a>
         ";
     }
     echo "</span>

html/user/ffmail_action.php

@@ -18,6 +18,8 @@
 
 require_once("../inc/email.inc");
 
+error_page("This feature is deprecated");
+
 $text = get_str('text');
 $subject = get_str('subject');
 

html/user/ffmail_form.php

@@ -22,6 +22,12 @@
 
 require_once("../inc/util.inc");
 
+// Spammers were abusing this feature,
+// and AFAIK it was never used much.
+// Screw it.
+
+error_page("This feature is deprecated");
+
 $master_url = parse_config(get_config(), "<master_url>");
 
 $user = get_logged_in_user();

html/user/sample_index.php

@@ -112,26 +112,26 @@ function left(){
             echo "</ul>\n";
         }
     );
-}
-
-function news() {
-    include("motd.php");
-    show_news(0, 5);
-}
-
-function right() {
     global $stopped;
     if (!$stopped) {
         $profile = get_current_uotd();
         if ($profile) {
-            echo "
-                <div class=\"media uotd\">
-            ";
+            panel('User of the Day',
+                function() use ($profile) {
                     show_uotd($profile);
-            echo "</div>\n";
+                }
+            );
         }
     }
-    panel('News', 'news');
+}
+
+function right() {
+    panel('News',
+        function() {
+            include("motd.php");
+            show_news(0, 5);
+        }
+    );
 }
 
 page_head(null, null, null, "", file_get_contents("schedulers.txt"));