olav
/
site
forked from team/site
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some tidying

This commit is contained in:
Ben Harris 2022-01-15 16:52:46 -05:00
parent 032c6459e0
commit e14c1f7a39
20 changed files with 128 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -1,5 +1,11 @@
{
"require": {
"tildeteam/wiki": "^1.0.0"
"tildeteam/wiki": "^1.0.0",
"ext-openssl": "*",
"ext-json": "*",
"ext-shmop": "*",
"ext-sockets": "*",
"ext-posix": "*",
"ext-mbstring": "*"
}
}

12
css/dracula.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -352,6 +352,8 @@ end</pre>
<option>5</option>
</select>
<br>
<label>
Sample Dropdown
<select multiple="" class="form-control">
<option>1</option>
<option>2</option>
@ -359,6 +361,7 @@ end</pre>
<option>4</option>
<option>5</option>
</select>
</label>
</div>
</div>
<div class="form-group">
@ -409,7 +412,10 @@ end</pre>
<label class="control-label">Input addons</label>
<div class="input-group">
<span class="input-group-addon">$</span>
<label>
Text Input
<input class="form-control" type="text">
</label>
<span class="input-group-btn">
<button class="btn btn-default" type="button">Button</button>
</span>
@ -794,8 +800,8 @@ end</pre>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<!-- Github stars script -->
<script>jQuery(document).ready(function ($) {

12
css/index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -352,6 +352,8 @@ end</pre>
<option>5</option>
</select>
<br>
<label>
Sample Dropdown
<select multiple="" class="form-control">
<option>1</option>
<option>2</option>
@ -359,6 +361,7 @@ end</pre>
<option>4</option>
<option>5</option>
</select>
</label>
</div>
</div>
<div class="form-group">
@ -409,7 +412,10 @@ end</pre>
<label class="control-label">Input addons</label>
<div class="input-group">
<span class="input-group-addon">$</span>
<label>
Text Input
<input class="form-control" type="text">
</label>
<span class="input-group-btn">
<button class="btn btn-default" type="button">Button</button>
</span>
@ -794,8 +800,8 @@ end</pre>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<!-- Github stars script -->
<script>jQuery(document).ready(function ($) {

2
news/pages/002_dns_redirects.md
View File

@ -14,4 +14,4 @@ there are no ssl certs for these subdomains, so you will have to request those w
edit: there is now a wildcard cert from letsencrypt for *.tilde.team, so you can use https with your username as a subdomain!! :)
edit2: there are now more than one domains that will server your user page. see [the wiki article about it](/wiki/?page=tildepages)
edit2: there are now more than one domains that will server your user page. see [the wiki article about it](/wiki/tildepages)

2
news/pages/015_migration.md
View File

@ -10,4 +10,4 @@ tilde.team is now on a beefy vps! 4cores, 6gb ram, and 100gb ssd space!
everything is where you left it, but you will get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 104.223.31.252 and the ECDSA fingerprint is: `SHA256:CoJQp1mGtYJOZscJul6Ba94o2NsuzZTUI/b76JLGy3A` for your verification purposes.
edit: it wasn't as stable as i thought... see [part 2](?page=020_migration_again)
edit: it wasn't as stable as i thought... see [part 2](020_migration_again)

2
news/pages/016_tildemail.md
View File

@ -5,4 +5,4 @@ title: tildemail
author: ben
---
what started as an initiative to get local mail working ended up with us just setting up a full mailserver with smtp and imap. see the [email wiki](/wiki/?page=email) for more info and [webmail](https://mail.tilde.team) for easy access.
what started as an initiative to get local mail working ended up with us just setting up a full mailserver with smtp and imap. see the [email wiki](/wiki/email) for more info and [webmail](https://mail.tilde.team) for easy access.

2
news/pages/019_gopher.md
View File

@ -5,6 +5,6 @@ title: tilde.team gopher server and proxy
author: ben
---
we're now running a [gopher server](/wiki/?page=gopher) and [http proxy](https://gopher.tilde.team)! connect to [gopher://tilde.team](gopher://tilde.team) or use [our http proxy](https://gopher.tilde.team) for when you don't have a gopher-capable browser handy
we're now running a [gopher server](/wiki/gopher) and [http proxy](https://gopher.tilde.team)! connect to [gopher://tilde.team](gopher://tilde.team) or use [our http proxy](https://gopher.tilde.team) for when you don't have a gopher-capable browser handy
to get started in gopherspace, check out [gopher.zone](https://gopher.zone) or use [`bb`](https://tildegit.org/team/bashblog), [`feels`](https://github.com/modgethanc/ttbp), or [`burrow`](https://github.com/tilde-team/burrow) at the shell!

2
news/pages/020_migration_again.md
View File

@ -7,4 +7,4 @@ author: khuxkm
tilde.team is now on an even beeeeefier rig. bare metal this time! 4cores (8 threads), 64gb ram!
just like [last time](/news/?page=015_migration), everything is where you left it, but you **will** get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 195.201.242.48 and the ECDSA fingerprint is: `SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres` for your verification purposes.
just like [last time](/news/015_migration), everything is where you left it, but you **will** get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 195.201.242.48 and the ECDSA fingerprint is: `SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres` for your verification purposes.

2
news/pages/021_discord_lockdown.md
View File

@ -13,6 +13,6 @@ How this affects you:
The behavior of some users in the tilde.chat Discord has been unacceptable and does not comply with our code of conduct. Upon further review, we have decided that managing the Discord server is a bit more than we can handle without discussing moderation in-depth. As such, ben and I (khuxkm) have decided to make it READ-ONLY until we have come to a more permanent decision (which may be to close it permanently).
If you have any thoughts/ideas for the future of the discord bridge, please drop a line to ben or myself on IRC or by email (@tilde.team [or any of the other domains](/wiki/?page=email)). We can be found in the #sudoers channel.
If you have any thoughts/ideas for the future of the discord bridge, please drop a line to ben or myself on IRC or by email (@tilde.team [or any of the other domains](/wiki/email)). We can be found in the #sudoers channel.
Thanks for <del>flying tildeverse</del> being a member of the tildeverse and working with us to figure out a chat solution that works for everyone!

4
ring/index.php
View File

@ -41,13 +41,13 @@ else {
// keep this as a string so we can escape it easily with htmlspecialchars()
$snippet = '<!-- tilde.team ring fragment-->
<div id="newring">
<center>
<div style="text-align: center;">
[<a href="https://tilde.team/ring/?action=prev&me=USERNAME">previous</a>]
[<a href="https://tilde.team/ring/?action=random&me=USERNAME">random</a>]
[<a href="https://tilde.team/ring/?action=next&me=USERNAME">next</a>]
<br>
<a href="https://tilde.team/ring/">how to join this webring</a>
</center>
</div>
</div>';
$title = "webring - how to join";

19
signup/email/Net/DNS2.php
View File

@ -231,7 +231,6 @@ class Net_DNS2
break;
default:
;
}
}
@ -538,7 +537,7 @@ class Net_DNS2
$x = (8 - (count($part[0]) + count($part[1])));
for ($i = 0; $i < $x; $i++) {
array_push($missing, '0000');
$missing[] = '0000';
}
$missing = array_merge($part[0], $missing);
@ -1153,15 +1152,15 @@ class Net_DNS2_BitMap
$bitstr = '';
for ($i=0; $i<$bm[$window]['length'] * 8; $i++) {
if (isset($bm[$window][$i])) {
for ($i=0; $i< $bitdata['length'] * 8; $i++) {
if (isset($bitdata[$i])) {
$bitstr .= '1';
} else {
$bitstr .= '0';
}
}
$output .= pack('CC', $window, $bm[$window]['length']);
$output .= pack('CC', $window, $bitdata['length']);
$output .= pack('H*', self::bigBaseConvert($bitstr));
}
@ -1358,7 +1357,7 @@ class Net_DNS2_Cache
return null;
}
};
}
?><?php
@ -3767,7 +3766,7 @@ class Net_DNS2_Cache_File extends Net_DNS2_Cache
fclose($fp);
}
}
};
}
?><?php
@ -3978,7 +3977,7 @@ class Net_DNS2_Cache_Shm extends Net_DNS2_Cache
fclose($fp);
}
}
};
}
?><?php
@ -5781,7 +5780,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
break;
case self::GATEWAY_TYPE_DOMAIN:
;
break;
default:
@ -5798,7 +5796,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
case self::ALGORITHM_DSA:
case self::ALGORITHM_RSA:
;
break;
default:
@ -5905,7 +5902,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
//
switch($this->gateway_type) {
case self::GATEWAY_TYPE_NONE:
;
break;
case self::GATEWAY_TYPE_IPV4:
@ -5926,7 +5922,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
//
switch($this->algorithm) {
case self::ALGORITHM_NONE:
;
break;
case self::ALGORITHM_DSA:

1
signup/email/ipaddr.php
View File

@ -207,4 +207,3 @@
return true;
}
}
?>

9
signup/email/smtp.php
View File

@ -1283,7 +1283,7 @@
{
if (trim($line) !== "")
{
if ($line{0} !== "\xFF" && (($tagname === "/ul" && $line{0} !== "-") || ($tagname === "/ol" && !(int)$line{0}))) $prefix2 = "\xFF\xFF";
if ($line[0] !== "\xFF" && (($tagname === "/ul" && $line[0] !== "-") || ($tagname === "/ol" && !(int)$line[0]))) $prefix2 = "\xFF\xFF";
else $prefix2 = "";
$lines[$num] = $prefix . $prefix2 . trim($line);
@ -1373,8 +1373,7 @@
if ($htmlmessage == "" && !count($attachments))
{
// Plain-text e-mail.
$destheaders = "";
$destheaders .= $messagefromaddr;
$destheaders = $messagefromaddr;
if ($headers != "") $destheaders .= $headers;
$destheaders .= "MIME-Version: 1.0\r\n";
if (!isset($options["usemail"]) || !$options["usemail"]) $destheaders .= $messagetoaddr;
@ -1391,8 +1390,7 @@
{
// MIME e-mail (HTML, text, attachments).
$mimeboundary = "--------" . self::MIME_RandomString(25);
$destheaders = "";
$destheaders .= $messagefromaddr;
$destheaders = $messagefromaddr;
if ($headers != "") $destheaders .= $headers;
$destheaders .= "MIME-Version: 1.0\r\n";
if (!isset($options["usemail"]) || !$options["usemail"]) $destheaders .= $messagetoaddr;
@ -1516,4 +1514,3 @@
}
}
}
?>

1
signup/email/utf8.php
View File

@ -205,4 +205,3 @@
return "&#" . $num . ";";
}
}
?>

16
signup/index.php
View File

@ -24,23 +24,31 @@ function esc($v) {
<?php include 'signup-handler.php'; ?>
<div>
<p>your desired username (numbers and lowercase letters only, no spaces)</p>
<label>
your desired username (numbers and lowercase letters only, no spaces)
<input class="form-control" name="username" value="<?=esc("username")?>" type="text" required>
</label>
</div>
<div>
<p>email to contact you with account info</p>
<label>
email to contact you with account info
<input class="form-control" name="email" value="<?=esc("email")?>" type="text" required>
</label>
</div>
<div>
<p>what interests you about tilde.team? we want to make sure you're a real human being :)</p>
<label>
what interests you about tilde.team? we want to make sure you're a real human being :)
<textarea required class="form-control" name="interest" id="" cols="40" rows="7"><?=esc("interest")?></textarea>
</label>
</div>
<div>
<p>SSH public key</p>
<label>
SSH public key
<textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=esc("sshkey")?></textarea>
</label>
<p>if you don't have a key, don't worry! <a href="/wiki/ssh">check out our guide to ssh keys</a> and make sure that you only put your pubkey here</p>
</div>

6
signup/signup-handler.php
View File

@ -149,8 +149,8 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
$sshkey = trim($_REQUEST["sshkey"]);
if ($sshkey == "" || (mb_substr($sshkey, 0, 4) !== "ssh-" && mb_substr($sshkey, 0, 11) !== "ecdsa-sha2-"))
$message .= '<li>ssh key required: please create one and submit the public key. '
. 'see our <a href="https://tilde.team/wiki/?page=ssh">ssh wiki</a> or '
. 'hop on <a href="https://web.tilde.chat/?join=team">irc</a> and ask for help</li>';
. 'see our <a href="https://tilde.team/wiki/ssh">ssh wiki</a> or '
. 'hop on <a href="https://tilde.chat/kiwi/#team">irc</a> and ask for help</li>';
else {
if ($name != "" && $email != "") {
if (forbidden_sshkey($sshkey)) {
@ -163,7 +163,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
// no validation errors
if ($message == "") {
$makeuser = "makeuser {$_REQUEST["username"]} {$_REQUEST["email"]} \"{$sshkey}\"";
$makeuser = "makeuser {$_REQUEST["username"]} {$_REQUEST["email"]} \"$sshkey\"";
$msgbody = "
username: {$_REQUEST["username"]}

2
users/index.php
View File

@ -25,7 +25,7 @@ $total_users = shell_exec("members team | wc -w");
$user = basename($user); ?>
<li style="list-style: none; margin-left: -40px;">
<a href="/~<?=$user?>/" class="list-group-item">
<h6 class="list-group-item-heading">~<?=$user?></h5>
<h6 class="list-group-item-heading">~<?=$user?></h6>
</a>
</li>
<?php endforeach; ?>

2
wiki/pages/irc.md
View File

@ -12,7 +12,7 @@ category:
hi teammates!
the tilde.chat irc network is available publicly at irc.tilde.chat:6697 (with ssl) as a round robin of
[available nodes](https://tilde.chat/wiki/?page=servers).
[available nodes](https://tilde.chat/wiki/servers).
to connect directly to our node, you can use the following addresses:
- localhost port 6667 when at your shell or via ssh port-forwarding

6
wiki/pages/other-tildes.md
View File

@ -12,8 +12,10 @@ category:
if you're starting a tilde and want to be added to this list, [open a PR :)](
https://tildegit.org/team/site/src/branch/master/wiki/pages/other-tildes.md)
also see the [known tildes](https://tilde.wiki/wiki/Known_tildes) section on tilde.wiki.
| tilde name | description | where to join | notes |
| --- | --- | --- | ---|
|------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|
| [breadpunk.club](https://breadpunk.club) | breadpunk.club is a small tilde focused on bread-making and community-building. see the [manifesto](https://breadpunk.club/docs/manifesto/) for more information on our mission. | [signup information here](https://breadpunk.club/join/) | |
| [cosmic.voyage](https://cosmic.voyage) | cosmic.voyage is an Ubuntu server focused on collaborative sci-fi storytelling. The background story is visible on the homepage. New authors are welcome to join and take on the voice of various ships, outposts, and colonies scattered across the universe, sending text messages back to a relay at Earth's L4 point. | [signup information here](https://cosmic.voyage/join.html) | |
| [ctrl-c.club](http://ctrl-c.club) | A place for the curious to poke around and play. SSH access, web pages, games, and programming languages on tap. | [signup form](http://goo.gl/forms/oviL1wYSrV) | |
@ -50,6 +52,6 @@ https://tildegit.org/team/site/src/branch/master/wiki/pages/other-tildes.md)
| [ttylde](https://ttylde.karx.xyz) | ttylde is an experimental tilde running FreeBSD. Currently seeking new members! | [signup form](https://ttylde.karx.xyz/signup.php) | |
| [unix.lgbt](https://unix.lgbt) | unix.lgbt is an explictly LGBTQ+ friendly public unix/tilde! we offer web, gemini, irc and various other community services. | [signup form](https://unix.lgbt/register.php) | |
| [wilde.ftp.sh](http://wilde.ftp.sh/) | The world's first (and possibly only) Windows-based tilde! | [signup form](http://wilde.ftp.sh/signup.php) | down |
| [xhec.one](https://xhec.one) | A brand new ~ running on Arch Linux. Seeking members and suggestions for content :) | [signup instructions](https://xhec.one)
| [xhec.one](https://xhec.one) | A brand new ~ running on Arch Linux. Seeking members and suggestions for content :) | [signup instructions](https://xhec.one) | |
| [yourtilde.com](https://yourtilde.com) | If you're looking for a new ~, to learn and play, come check us out. | [signup form](https://yourtilde.com/sign-up) | |
| [xinu.me](https://xinu.me) | Experimental community for socializing, developing digital skills and collaborating through the system shell. In Spanish, mainly. | [signup instructions](https://xinu.me/inscripcion.html) | |

2
wiki/pages/ssh.md
View File

@ -103,7 +103,7 @@ a password any time you used them (impractical) or use something like [ssh-agent
We don't have documentation for this [(yet)](https://tildegit.org/team/site/src/branch/master/wiki)
so either go with no password keys, or ask on IRC ([#team](https://web.tilde.chat/?join=team)) for help.
pick your fighter: [[mac](#mac)] | [[windows](#windows)] | [[linux](#linux)]
pick your fighter: [[mac](#mac)] | [[windows](#windows-10)] | [[linux](#linux)]
---