From fbd9166854b80b437b266b40dcbe0b6133bd4b48 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Thu, 17 Feb 2022 13:55:19 -0500
Subject: [PATCH] fix some problems

just a general tidy-up
---
 css/dracula.html                  |  2 +-
 footer.php                        |  2 +-
 humans.txt                        |  5 ++---
 index.php                         |  2 +-
 news/pages/003_mastodon.md        |  4 ++--
 news/pages/023_tilde.team_down.md |  2 +-
 news/pages/024_mailing_list.md    |  2 +-
 news/pages/030_ubuntu20.04.md     |  2 +-
 signup/index.php                  |  3 ++-
 signup/signup-handler.php         | 14 +++++++++-----
 wiki/pages/domains.md             |  1 -
 wiki/pages/goals-roadmap.md       |  4 ++--
 wiki/pages/irc.md                 |  8 ++++----
 wiki/pages/lua.md                 |  4 ++--
 wiki/pages/mailing_lists.md       |  4 ++--
 wiki/pages/public-git-repo.md     |  8 ++++----
 wiki/pages/ssh.md                 |  2 +-
 wiki/pages/tildepages.md          |  1 -
 wiki/pages/ttbp.md                |  2 +-
 wiki/pages/xmpp.md                |  2 +-
 20 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/css/dracula.html b/css/dracula.html
index c1a74a1..75a0aae 100644
--- a/css/dracula.html
+++ b/css/dracula.html
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>tilde theme</title>
+    <title>tilde dracula theme</title>
     <link href="dracula.css" rel="stylesheet">
 
     <style>
diff --git a/footer.php b/footer.php
index 004b825..fa2f2c4 100644
--- a/footer.php
+++ b/footer.php
@@ -8,7 +8,7 @@ RSA:     SHA256:JR5oQPfC34ogd/SeIcMpaGR8BiBo4ciI5xWyBVCjj5o</pre>
             </div>
             <a href="https://tildegit.org/team/site">site source</a>
             ~
-            <a href="https://tildegit.org/team/site/src/branch/master/<?=str_ireplace("/var/www/tilde.team/", "", $filepath)?>">page source</a>
+            <a href="https://tildegit.org/team/site/src/branch/master/<?=str_ireplace("/var/www/tilde.team/", "", $filepath ?? "")?>">page source</a>
             ~
             <a href="https://bhh.sh/donate/">donate</a>
             ~
diff --git a/humans.txt b/humans.txt
index ca8bb30..d2136cb 100644
--- a/humans.txt
+++ b/humans.txt
@@ -16,7 +16,7 @@ Site: https://tilde.team/~virtual/ virtual@tilde.team
 Location tildeverse, the internet
 
 Users: tilde.team teammates
-Sites: https://tilde.team/~<username>/ (see https://tilde.team for a list)
+Sites: https://tilde.team/~<username>/ (see https://tilde.team/users/ for a list)
 Location: tildeverse, the internet
 
 
@@ -24,7 +24,6 @@ Location: tildeverse, the internet
 Name: Paul Ford, for inspiring tilde.team through tilde.club
 
 /* SITE */
-Last update: 2018/08/13
+Last update: 2022/02/17
 Components: Bootstrap 3
 Software: PHP
-
diff --git a/index.php b/index.php
index 58180a4..71e1a49 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,7 @@ $parser = wiki::factory(true);
 </p>
 <p>
     i created this tilde after hearing about paul ford's
-    <a href="http://tilde.club/">tilde.club</a>. when i was unable
+    <a href="https://tilde.club/">tilde.club</a>. when i was unable
     to join due to the waitlist, i decided to create my own tilde.
 </p>
 
diff --git a/news/pages/003_mastodon.md b/news/pages/003_mastodon.md
index ea94280..a2cf856 100644
--- a/news/pages/003_mastodon.md
+++ b/news/pages/003_mastodon.md
@@ -5,6 +5,6 @@ title: mastodon
 author: ben
 ---
 
-hey tilders, there's a mastodon instance out there at <a href="https://social.tilde.team/">social.tilde.team</a> for members of the tilde community (and any others who are interested in an actually <em>social</em> social network. see you on there!
+hey tilders, there's a mastodon instance out there at <a href="https://social.tilde.team/">social.tilde.team</a> for members of the tilde community (and any others who are interested in an actually <em>social</em> social network). see you on there!
 
-edit: the mastodon instance is now at [tilde.zone](https://tilde.zone)
+update: the mastodon instance is at [tilde.zone](https://tilde.zone)
diff --git a/news/pages/023_tilde.team_down.md b/news/pages/023_tilde.team_down.md
index d3fd03f..d5388e5 100644
--- a/news/pages/023_tilde.team_down.md
+++ b/news/pages/023_tilde.team_down.md
@@ -13,4 +13,4 @@ later!
 
 update: i've written up a [post mortem](/~ben/blog/november-13-post-mortem.html) ~ben
 
-update 2: i've written a [article from my perspective](https://tilde.team/~fosslinux/blog/on-november-13th-i-made-a-bit-of-an-oops.html) ~fosslinux
+update 2: i've written an [article from my perspective](https://tilde.team/~fosslinux/blog/on-november-13th-i-made-a-bit-of-an-oops.html) ~fosslinux
diff --git a/news/pages/024_mailing_list.md b/news/pages/024_mailing_list.md
index 4c554e5..6fb4421 100644
--- a/news/pages/024_mailing_list.md
+++ b/news/pages/024_mailing_list.md
@@ -9,7 +9,7 @@ we now have new mailing lists for the tildeverse :D
 
 ~teamers, you are automatically signed up to the ~team mailing list.
 
-see [the list archives](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/) for topics that you've missed, or just send an email to the list directly (tildeteam@lists.tildeverse.org) to start a new thread/topic.
+see [the list archives](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/) for topics that you've missed, or just email the list directly (tildeteam@lists.tildeverse.org) to start a new thread/topic.
 
 all lists and settings can be found at https://lists.tildeverse.org
 
diff --git a/news/pages/030_ubuntu20.04.md b/news/pages/030_ubuntu20.04.md
index c4bdf8e..c49e957 100644
--- a/news/pages/030_ubuntu20.04.md
+++ b/news/pages/030_ubuntu20.04.md
@@ -7,7 +7,7 @@ author: ben
 
 i've been preparing a large upgrade for tilde.team to ubuntu 20.04 focal fossa.
 
-the new vm has a fresh install and will help to address some of the long-standing
+the new vm has a fresh install and will help to address some long-standing
 issues that i've been wanting to fix for quite some time now
 
 ---
diff --git a/signup/index.php b/signup/index.php
index 34ecd01..ccd77bf 100644
--- a/signup/index.php
+++ b/signup/index.php
@@ -2,7 +2,8 @@
 $filepath = __FILE__;
 include __DIR__.'/../header.php';
 
-function esc($v) {
+function esc($v): string
+{
     return isset($_REQUEST[$v]) ? htmlspecialchars($_REQUEST[$v]) : "";
 }
 ?>
diff --git a/signup/signup-handler.php b/signup/signup-handler.php
index f0b5f9b..461bdae 100644
--- a/signup/signup-handler.php
+++ b/signup/signup-handler.php
@@ -22,7 +22,8 @@ function add_ban_info($name, $email) {
     file_put_contents("/var/signups_banned", $user_info.PHP_EOL, FILE_APPEND);
 }
 
-function forbidden_name($name) {
+function forbidden_name($name): bool
+{
     $badnames = [
         '0x0',
         'abuse',
@@ -88,14 +89,17 @@ function forbidden_name($name) {
     );
 }
 
-function forbidden_email($email) {
+function forbidden_email($email): bool
+{
     $femail = file("/var/banned_emails.txt", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
     return in_array($email, $femail);
 }
 
-function forbidden_sshkey($sshkey) {
+function forbidden_sshkey($sshkey): bool
+{
     $fsshkey = file("/var/banned_sshkeys.txt", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-    foreach ($fsshkey as $line_num => $line) {
+    $fsk = [];
+    foreach ($fsshkey as $line) {
         $fsk_line = explode(' ',trim($line));
         $fsk[] = $fsk_line[1];
     }
@@ -113,7 +117,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
     if ($name == "")
         $message .= "<li>fill in your desired username</li>\n";
     else {
-        if ($name != "" && strlen($name) < 2)
+        if (strlen($name) < 2)
             $message .= "<li>username is too short (2 character min)</li>\n";
 
         if (strlen($name) > 32)
diff --git a/wiki/pages/domains.md b/wiki/pages/domains.md
index 53e4f41..17788fd 100644
--- a/wiki/pages/domains.md
+++ b/wiki/pages/domains.md
@@ -13,7 +13,6 @@ because [~ben](https://tilde.team/~ben/) hoards domain names, the following doma
 * [nand.sh](https://nand.sh/) - alias
 * [ttm.sh](https://ttm.sh/) - url shortener
 * [tild3.org](https://tild3.org/) - alias
-* [tildə.net](https://tildə.net/) - alias
 * [tilde.chat](https://tilde.chat/) - irc net
 * [tilde.life](http://tilde.life/) - redirect
 * [tilde.news](https://tilde.news/) - lobste.rs clone
diff --git a/wiki/pages/goals-roadmap.md b/wiki/pages/goals-roadmap.md
index 94b38bb..4825f5b 100644
--- a/wiki/pages/goals-roadmap.md
+++ b/wiki/pages/goals-roadmap.md
@@ -10,9 +10,9 @@ category:
 [living draft of this document](https://pad.tildeverse.org/code/#/2/code/edit/RFBUqXec+9+MlZzx4mnhU3ps/)
 
 these ideas are partly about building one system (in this case, tilde.team) but also about supporting a 
-broader ecosystem of inter-connected systems.
+broader ecosystem of interconnected systems.
 
-1. develop a clear system identity as an alternative social environment for the techncially-inclined; 
+1. develop a clear system identity as an alternative social environment for the technically-inclined; 
 specifically, serving as a non-commercial alternative to the mainstream, corporate-owned media and social media. 
 the dual points of (1) an alternative social/communications medium and (2) technically inclined user base are  
 important because, together, they put the users in the role of protecting (and enjoying!) the tools of 
diff --git a/wiki/pages/irc.md b/wiki/pages/irc.md
index 8445a40..e28680b 100644
--- a/wiki/pages/irc.md
+++ b/wiki/pages/irc.md
@@ -64,14 +64,14 @@ location (`~/.weechat/relay_socket`). to get started using it, follow these step
 ## znc 
 
 the system znc authenticates using your shell password (same as with email and
-[nextcloud](https://cloud.tilde.team). reach out to an admin on irc or send an
-email to [sudoers@tilde.team](mailto:sudoers@tilde.team).
+[nextcloud](https://cloud.tilde.team)). reach out to an admin on irc or
+email [sudoers@tilde.team](mailto:sudoers@tilde.team).
 
-the webadmin interface is available at [znc.tilde.team](https://znc.tilde.team).
+the web interface is available at [znc.tilde.team](https://znc.tilde.team).
 
 client connections are on port 6699 with ssl.
 
-you can add network connections (up to 10) via webadmin or via a direct client
+you can add network connections (up to 10) via web or via a direct client
 connection.
 
 see the [znc wiki](https://wiki.znc.in/Connecting_to_ZNC) for more information.
diff --git a/wiki/pages/lua.md b/wiki/pages/lua.md
index 123445e..1f83658 100644
--- a/wiki/pages/lua.md
+++ b/wiki/pages/lua.md
@@ -12,7 +12,7 @@ This page will explain how to set up your tilde.team account for
 ## Luarocks
 
 [Luarocks](https://luarocks.org/) is a package manager for the Lua, similar to
-Python's PIP, Perl's PPM, and other programming laguages' package mangers. To
+Python's PIP, Perl's PPM, and other programming languages' package mangers. To
 download and install a package from the Luarocks repository type the following
 into a terminal:
 `luarocks install [package-name] --local`
@@ -23,7 +23,7 @@ rather than the default path of '/usr/local/', which tilde.team users do not
 have write access to.
 
 Lua uses the environment variables 'LUA_PATH' and 'LUA_CPATH' to find installed
-packages. By default these paths do not include the paths that Luarocks installs
+packages. By default, these paths do not include the paths that Luarocks installs
 package to, so the Lua interpreter will not be able to find installed packages.
 The `luarocks path` command can be used to modify the LUA_PATH and LUA_CPATH
 environment variables to include the paths that Luarocks installs packages to.
diff --git a/wiki/pages/mailing_lists.md b/wiki/pages/mailing_lists.md
index 14ec158..e81884d 100644
--- a/wiki/pages/mailing_lists.md
+++ b/wiki/pages/mailing_lists.md
@@ -19,9 +19,9 @@ there.
 some email clients have popularized email usage patterns which are considered
 poor form on many mailing lists. please review some of our suggestions for
 participating more smoothly in discussions on the tildeverse.  this advice will
-likely serve you well outside of the tildeverse as well.
+likely serve you well outside the tildeverse as well.
 
-if you have any troubles following this guides or don't know how to configure
+if you have any troubles following these guides or don't know how to configure
 your email client for this purpose, ask on irc (#meta or #team), you'll find
 always somebody willing to help.
 
diff --git a/wiki/pages/public-git-repo.md b/wiki/pages/public-git-repo.md
index d1650af..40163c7 100644
--- a/wiki/pages/public-git-repo.md
+++ b/wiki/pages/public-git-repo.md
@@ -7,7 +7,7 @@ category:
     - main
 ---
 
-Besides the [Gitea instance][1] of tildeverse, you could easily setup a
+Besides the [Gitea instance][1] of tildeverse, you could easily set up a
 read-only clone URL fetchable using git clone similar to this one:
 
 ```
@@ -213,8 +213,8 @@ Note that the output will be empty if `my_repo` has no commits. In general, use
 $ stagit-index repo_dir1 repo_dir2 ... > index.html
 ```
 
-to generate index for multiple repositories. You should also copy over or
-symlink some of the assets files in stagit's repository, such as `style.css`,
+to generate index for multiple repositories. you should also copy over or
+symlink some asset files in stagit's repository, such as `style.css`,
 `logo.png`, etc. to
 
 ```
@@ -290,7 +290,7 @@ $ git am < <patch>
 ```
 
 See the [blog post][14] of Drew DeVault for using git with mutt, and check out
-[aerc][15] if you want an modern alternative for mutt built from such workflow.
+[aerc][15] if you want a modern alternative for mutt built from such workflow.
 
 [1]: https://tildegit.org/
 [2]: https://tilde.team/~kst/git/grm.tilde/file/README.html
diff --git a/wiki/pages/ssh.md b/wiki/pages/ssh.md
index 4d0d87d..829a8af 100644
--- a/wiki/pages/ssh.md
+++ b/wiki/pages/ssh.md
@@ -88,7 +88,7 @@ SSH supports a handful of types of cryptographic keys. The most used are [RSA](
 
 RSA is the de-facto standard and is supported everywhere (just choose a big
 enough key like 4096 bits to be secure). Ed25519 is designed to be faster and
-smaller withouth sacrificing security, so is best suited for embedded devices
+smaller without sacrificing security, so is best suited for embedded devices
 or machines with low resources. It's supported on tilde (and really on any
 modern system) but you may find older systems which do not support it.
 
diff --git a/wiki/pages/tildepages.md b/wiki/pages/tildepages.md
index ea6aa91..83a9bb4 100644
--- a/wiki/pages/tildepages.md
+++ b/wiki/pages/tildepages.md
@@ -16,7 +16,6 @@ see also the [master list of domains](domains).
 * nand.sh
 * ttm.sh
 * tild3.org
-* tildə.net
 * tilde.ninja
 * tilde.site
 * tilde.team
diff --git a/wiki/pages/ttbp.md b/wiki/pages/ttbp.md
index bda36e6..50b9d7a 100644
--- a/wiki/pages/ttbp.md
+++ b/wiki/pages/ttbp.md
@@ -89,7 +89,7 @@ designed to give individuals control over their content.
 when you start your ttbp, you have the option of publishing or not publishing
 your blog.
 
-if you opt to not publish, your entires will never be accessible from outside of
+if you opt to not publish, your entries will never be accessible from outside
 the tilde.team network; other tilde.team users will still be able to read your
 entries through the ttbp interface, or by directly accessing your
 `~/.ttbp/entries` directory.
diff --git a/wiki/pages/xmpp.md b/wiki/pages/xmpp.md
index d5b9302..f730eb0 100644
--- a/wiki/pages/xmpp.md
+++ b/wiki/pages/xmpp.md
@@ -24,7 +24,7 @@ recommended clients are:
 if you have a recommended client for mac platforms, feel free to discuss
 and add it to this list.
 
-we have a tilde.team MUC (multi user chat) at [team@conference.tilde.team](
+we have a tilde.team MUC (multi-user chat) at [team@conference.tilde.team](
 xmpp:team@conference.tilde.team?join), feel free to stop by!
 
 ## biboumi