From 3db24f37b2616a0c30fd200a6d79fd31afd03f2b Mon Sep 17 00:00:00 2001
From: Ben Harris <bharris@hagerty.com>
Date: Mon, 29 Jan 2018 14:00:45 -0500
Subject: [PATCH] update email verification things and pull from api

---
 .gitignore                      |   0
 css/font-awesome.css            |   0
 css/hacker.css                  |   0
 discord/index.php               |   0
 fonts/FontAwesome.otf           | Bin
 fonts/fontawesome-webfont.eot   | Bin
 fonts/fontawesome-webfont.svg   |   0
 fonts/fontawesome-webfont.ttf   | Bin
 fonts/fontawesome-webfont.woff  | Bin
 fonts/fontawesome-webfont.woff2 | Bin
 index.php                       |   9 ++++++++-
 news.php                        |   0
 news/000_first_post.json        |   0
 news/001_new_news.json          |   0
 news/002_dns_redirects.json     |   0
 news/003_mastodon.json          |   0
 news/006_tilde_theme.json       |   0
 news/007_happy_new_year.json    |   0
 news/008_tildegit.json          |   0
 news/009_paperwork_notepad.json |   0
 news/post_template.json         |   0
 signup/index.php                |  29 ++++++++++-------------------
 users.php                       |   7 +++----
 23 files changed, 21 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 css/font-awesome.css
 mode change 100644 => 100755 css/hacker.css
 mode change 100644 => 100755 discord/index.php
 mode change 100644 => 100755 fonts/FontAwesome.otf
 mode change 100644 => 100755 fonts/fontawesome-webfont.eot
 mode change 100644 => 100755 fonts/fontawesome-webfont.svg
 mode change 100644 => 100755 fonts/fontawesome-webfont.ttf
 mode change 100644 => 100755 fonts/fontawesome-webfont.woff
 mode change 100644 => 100755 fonts/fontawesome-webfont.woff2
 mode change 100644 => 100755 index.php
 mode change 100644 => 100755 news.php
 mode change 100644 => 100755 news/000_first_post.json
 mode change 100644 => 100755 news/001_new_news.json
 mode change 100644 => 100755 news/002_dns_redirects.json
 mode change 100644 => 100755 news/003_mastodon.json
 mode change 100644 => 100755 news/006_tilde_theme.json
 mode change 100644 => 100755 news/007_happy_new_year.json
 mode change 100644 => 100755 news/008_tildegit.json
 mode change 100644 => 100755 news/009_paperwork_notepad.json
 mode change 100644 => 100755 news/post_template.json
 mode change 100644 => 100755 users.php

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/css/font-awesome.css b/css/font-awesome.css
old mode 100644
new mode 100755
diff --git a/css/hacker.css b/css/hacker.css
old mode 100644
new mode 100755
diff --git a/discord/index.php b/discord/index.php
old mode 100644
new mode 100755
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 14736cf..3ca0372
--- a/index.php
+++ b/index.php
@@ -92,7 +92,14 @@
                 <h1>~users~</h1>
                 <em><a href="https://tilde.team/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em>
                 <br><br>
-                <?php echo file_get_contents("https://tilde.team/users.php"); ?>
+                <?php $users = json_decode(file_get_contents("https://tilde.team/~ben/api/?users"));
+                foreach ($users as $user): ?>
+                    <div class="list-group">
+                        <a href="https://tilde.team/~<?=$user?>/" class="list-group-item">
+                            <h5 class="list-group-item-heading">~<?=$user?></h5>
+                        </a>
+                    </div>
+                <?php endforeach; ?>
             </div>
         </div>
 
diff --git a/news.php b/news.php
old mode 100644
new mode 100755
diff --git a/news/000_first_post.json b/news/000_first_post.json
old mode 100644
new mode 100755
diff --git a/news/001_new_news.json b/news/001_new_news.json
old mode 100644
new mode 100755
diff --git a/news/002_dns_redirects.json b/news/002_dns_redirects.json
old mode 100644
new mode 100755
diff --git a/news/003_mastodon.json b/news/003_mastodon.json
old mode 100644
new mode 100755
diff --git a/news/006_tilde_theme.json b/news/006_tilde_theme.json
old mode 100644
new mode 100755
diff --git a/news/007_happy_new_year.json b/news/007_happy_new_year.json
old mode 100644
new mode 100755
diff --git a/news/008_tildegit.json b/news/008_tildegit.json
old mode 100644
new mode 100755
diff --git a/news/009_paperwork_notepad.json b/news/009_paperwork_notepad.json
old mode 100644
new mode 100755
diff --git a/news/post_template.json b/news/post_template.json
old mode 100644
new mode 100755
diff --git a/signup/index.php b/signup/index.php
index 6d369af..6564894 100644
--- a/signup/index.php
+++ b/signup/index.php
@@ -32,41 +32,32 @@
         <form method="post">
 
             <?php
-            if ($_SERVER["SERVER_NAME"] != "localhost") {
+            if ($_SERVER["SERVER_NAME"] != "localhost")
                 require_once "/home/ben/ultimate-email/support/smtp.php";
-            }
 
             $message = "";
             if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
                 // Check the name.
                 $name = trim($_REQUEST["username"]);
-                if ($name == "") {
+                if ($name == "")
                     $message .= "<li>please fill in your desired username</li>";
-                }
-                if (strlen($name) > 32) {
+                if (strlen($name) > 32)
                     $message .= "<li>username too long (32 character max)</li>";
-                }
-                if (preg_match("/([a-z_][a-z0-9_]{0,30})/", $name) == 1) {
-                    echo '';
-                } else {
+                if (preg_match("/([a-z_][a-z0-9_]{0,30})/", $name) != 1)
                     $message .= "<li>username contains invalid characters (lowercase only)</li>";
-                }
-
-                if (posix_getpwnam($name)) {
+                if (posix_getpwnam($name))
                     $message .= "<li>sorry, the username $name is unavailable</li>";
-                }
 
                 // Check the e-mail address.
                 $email = trim($_REQUEST["email"]);
-                if ($email == "")  {
+                if ($email == "")
                     $message .= "<li>please fill in your email address</li>";
-                } else {
+                else {
                     $result = SMTP::MakeValidEmailAddress($_REQUEST["email"]);
-                    if (!$result["success"]) {
+                    if (!$result["success"])
                         $message .= "<li>invalid email address: " . htmlspecialchars($result["error"]) . "</li>";
-                    } elseif ($result["email"] != $email) {
+                    elseif ($result["email"] != $email)
                         $message .= "<li>invalid email address. did you mean:  " . htmlspecialchars($result["email"]) . "</li>";
-                    }
                 }
 
                 if ($message == "") {
@@ -105,7 +96,7 @@
             ?>
 
             <div class="form-group">
-                <label>your desired username (numbers and letters only, no spaces)</label>
+                <label>your desired username (numbers and lowercase letters only, no spaces)</label>
                 <input v-model="username" class="form-control" name="username" value="<?=$_REQUEST["username"] ?? ""?>" type="text" required>
             </div>
 
diff --git a/users.php b/users.php
old mode 100644
new mode 100755
index c5b7828..be9c3ab
--- a/users.php
+++ b/users.php
@@ -1,10 +1,9 @@
-<?php foreach (scandir("/home") as $user):
-    if (!is_dir("/home/$user/public_html")) continue; ?>
-
+<?php
+$users = json_decode(file_get_contents("https://tilde.team/~ben/api/?users"));
+foreach ($users as $user): ?>
     <div class="list-group">
         <a href="https://tilde.team/~<?=$user?>/" class="list-group-item">
             <h5 class="list-group-item-heading">~<?=$user?></h5>
         </a>
     </div>
-
 <?php endforeach;