From 06adcbb168b7b54e18f651c074cfc4793e0e4119 Mon Sep 17 00:00:00 2001
From: creme <creme@envs.net>
Date: Sat, 18 Jan 2020 00:44:22 +0100
Subject: [PATCH] small site update - add agree checkbox to signup form and
 optimze it - add id for a float left container - some more small css changes
 - add note for required reg. a nick to join #meta in irc - add link user to
 users

---
 chat/etiquette/index.php |  2 +-
 chat/index.php           |  3 +--
 chat/irc/index.php       |  3 +++
 css/css_style.css        |  8 +++++++-
 signup-mailer.php        |  3 +++
 signup.php               | 12 +++++++-----
 user.php                 |  1 +
 7 files changed, 23 insertions(+), 9 deletions(-)
 create mode 120000 user.php

diff --git a/chat/etiquette/index.php b/chat/etiquette/index.php
index f80ce14..920921d 100644
--- a/chat/etiquette/index.php
+++ b/chat/etiquette/index.php
@@ -13,7 +13,7 @@ include '../../header.php';
       </div>
 
       <div id="main" style="padding-bottom: 4em;">
-<div class="block">
+<div class="block_head">
 <pre>
 <h1><em>etiquette guidelines</em></h1>
 
diff --git a/chat/index.php b/chat/index.php
index ada809c..270a788 100644
--- a/chat/index.php
+++ b/chat/index.php
@@ -13,7 +13,7 @@ include '../header.php';
       </div>
 
       <div id="main">
-<div class="block">
+<div class="block_head">
 <pre>
 <h1><em>chat</em></h1>
 
@@ -25,7 +25,6 @@ envs.net has two chat options. we can be reached via irc and matrix.
 </div>
 
 <pre>
-
 <h3>&#35; more informations about our</h3>
 &nbsp;&nbsp;<strong><a href="/chat/matrix">&gt; matrix chat</a></strong>
 &nbsp;&nbsp;<strong><a href="/chat/irc">&gt; irc chat</a></strong>
diff --git a/chat/irc/index.php b/chat/irc/index.php
index 99d6606..69e5000 100644
--- a/chat/irc/index.php
+++ b/chat/irc/index.php
@@ -31,6 +31,9 @@ as a round robin of <a href="https://tilde.chat/wiki/?page=servers" target="_bla
 tilde.chat is meant to be a space for all tilde members to hang out, share, teach, and learn.
 Hang out in <strong>#meta</strong> the tilde general channel. =)
 
+<strong>note</strong> you must register with <code>nickserv</code> to talk in <code>#meta</code>:
+<code>/msg nickserv register &lt;password&gt; &lt;email&gt;<code>
+
 <h3>&#35; here are some options to connect</h3>
 <ul>
 <li><code>weechat</code> (<em>when logged in with ssh</em>) / <code>irssi</code> (<em>needs to configure</em>)</li>
diff --git a/css/css_style.css b/css/css_style.css
index fdc623b..08c3500 100644
--- a/css/css_style.css
+++ b/css/css_style.css
@@ -36,6 +36,11 @@ footer {
 	padding: 0 2.5em 2.5em 0;
 }
 
+#left_box {
+	float: left;
+	padding-right: 1em;
+}
+
 a {
 	outline: none;
 	border-bottom-color: transparent;
@@ -81,7 +86,7 @@ pre.banner {
 h1, h2, h3, h4, h5, h6 {
 	display: block;
 	line-height: 0;
-	margin-top: 1em;
+	margin-top: 0.8em;
 	margin-bottom: -0.4em;
 	margin-left: 0;
 	margin-right: 0
@@ -194,6 +199,7 @@ button:hover {
 	margin: 0.8em 0 1em 0;
 	padding: 0.8em 0 0.8em 4em;
 }
+/* use when content starts with a headline */
 .block_head {
 	border-left: solid 4px #e5e5e5;
 	margin: 0.8em 0 2em 0;
diff --git a/signup-mailer.php b/signup-mailer.php
index 52fea26..b4efaff 100644
--- a/signup-mailer.php
+++ b/signup-mailer.php
@@ -86,6 +86,9 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
     if ($_REQUEST["sshkey"] == "" || substr($_REQUEST["sshkey"], 0, 4) !== "ssh-")
         $message .= "<li>ssh key required: please submit the public key.</li>\n";
 
+    if ($_REQUEST["iagree"] == "")
+        $message .= "<li>you need to agree to our terms.</li>\n";
+
     // no validation errors
     if ($message == "") {
 
diff --git a/signup.php b/signup.php
index 4fc754e..e8fe071 100644
--- a/signup.php
+++ b/signup.php
@@ -25,15 +25,15 @@ include 'header.php';
 
 <form method="post">
 <label>desired username:<br />
-<input class="form-control" name="username" value="<?=$_REQUEST["username"] ?? ""?>" type="text" maxlength="32" style="width: 260px;"></label><br />
+<input class="form-control" type="text" name="username" value="<?=$_REQUEST["username"] ?? ""?>" maxlength="32" style="width: 260px;"></label><br />
 <br />
-<div style="float: left; padding-right: 1em;">
+<div id="left_box">
 	<label>e-mail for account informations:<br />
-	<input class="form-control" name="email" value="<?=$_REQUEST["email"] ?? ""?>" type="text" style="width: 260px;"></label>
+	<input class="form-control" type="text" name="email" value="<?=$_REQUEST["email"] ?? ""?>" style="width: 260px;"></label>
 </div>
 <div>
 	<label>confirm:<br />
-	<input class="form-control" name="emailconfirm" value="<?=$_REQUEST["emailconfirm"] ?? ""?>" type="text" style="width: 260px;"></label>
+	<input class="form-control" type="text" name="emailconfirm" value="<?=$_REQUEST["emailconfirm"] ?? ""?>" style="width: 260px;"></label>
 </div>
 <br />
 <label>what interests you about envs.net?<br />
@@ -45,9 +45,11 @@ include 'header.php';
 if you don't have a key, don't worry! check out our <a href="https://help.envs.net/help/#ssh" target="blank">help page</a>
 to ssh keys and make sure that you only put your pubkey here.
 
-signing up implies that you agree to abide by our <a href="/coc/" target="blank">code of conduct</a>
+signing up implies that you agree to abide by our <a href="/coc/" target="blank">code of conduct</a>,
 no drama. be respectful. have fun. we're all trying, and we're all in this together :)
 
+<input class="form-control" type="checkbox" name="iagree" value="check" /> i agree! i have read and understood the terms and conditions.
+
 <input class="form-control" type="submit" value="submit">
 </pre>
 </form>
diff --git a/user.php b/user.php
new file mode 120000
index 0000000..8d81c7d
--- /dev/null
+++ b/user.php
@@ -0,0 +1 @@
+users.php
\ No newline at end of file