Merge branch 'master' of tildegit.org:tildeverse/tilde.chat

stats/index.php

@@ -11,16 +11,16 @@ include __DIR__."/../header.php";
     <?php foreach($members as $member) {
         $chans = explode(", ", $member->channel); ?>
         <div class="btn-group">
-            <a class="btn btn-default" href="<?=$member->link?>"><?=$member->name?></a>
+            <a class="btn btn-default" href="<?=htmlspecialchars($member->link)?>"><?=htmlspecialchars($member->name)?></a>
             <?php foreach ($chans as $chan) { ?>
-                <a class="btn btn-primary" href="https://tilde.chat/kiwi/<?=$chan?>"><?=$chan?></a>
+                <a class="btn btn-primary" href="https://tilde.chat/kiwi/<?=htmlspecialchars($chan)?>"><?=htmlspecialchars($chan)?></a>
             <?php } ?>
         </div>
     <?php } ?>
 
 	<hr>
     <h3>full channel stats</h3>
-	<p>there are <?=$stats->usercount?> users across <?=$stats->channelcount?> channels.</p>
+	<p>there are <?=htmlspecialchars($stats->usercount)?> users across <?=htmlspecialchars($stats->channelcount)?> channels.</p>
 	<p>if the channel is set with <a href="https://docs.inspircd.org/3/modes/#channel-modes">chanmode +s</a> it will be omitted from this list.</p>
     <p>the table is sortable by clicking on the column headers</p>
 
@@ -37,9 +37,9 @@ include __DIR__."/../header.php";
 			<tbody data-link="row" class="rowlink">
 				<?php foreach($stats->channels as $channel): ?>
 					<tr>
-						<td><a href="<?=$channel->webchatlink?>"><?=$channel->name?></a></td>
+						<td><a href="<?=$channel->webchatlink?>"><?=htmlspecialchars($channel->name)?></a></td>
-						<td><?=$channel->usercount?></td>
+						<td><?=htmlspecialchars($channel->usercount)?></td>
-						<td style="word-wrap: break-word; white-space: pre-wrap; max-width:700px"><?=$channel->topic?></td>
+						<td style="word-wrap: break-word; white-space: pre-wrap; max-width:700px"><?=htmlspecialchars($channel->topic)?></td>
 					</tr>
 				<?php endforeach; ?>
 			</tbody>

wiki/README.md

@@ -30,6 +30,11 @@ php -S localhost:9000
 
 this will run your site at http://localhost:9000/
 
+if you are running the development server on your tilde account, you
+will not be able to access it on (hostname):9000 because it only runs
+on localhost, but you can create a tunnel with
+ssh -L 9000:localhost:9000
+to access from your localhost:9000 address
 
 * edit as needed!
 

wiki/index.php

@@ -17,7 +17,17 @@ $additional_head = "
 
 $parser = wiki::factory(true);
 
-if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
+if(isset($_GET["page"])) {
+    $page=$_GET["page"];
+} else {
+    $page="";
+}
+
+if(preg_match("/[^a-z0-9_-]/", $page)) {
+    $page="";
+}
+
+if ($page=="" || !file_exists("pages/$page.md")) {
 
     $title = "tilde.chat~wiki";
     $additional_head .= "
@@ -73,7 +83,7 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
 
 } else {
 
-    $pg = $parser->parse(file_get_contents("pages/{$_GET["page"]}.md"));
+    $pg = $parser->parse(file_get_contents("pages/$page.md"));
     $yml = $pg->getYAML();
     $title = $yml['title'] . " | tilde.chat~wiki";
     $description = $yml['description'] ?? "tilde.chat wiki article {$yml['title']}";
@@ -91,7 +101,7 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
     <hr>
         <?=$pg->getContent()?>
     <hr>
-    <a href="https://tildegit.org/tildeverse/tilde.chat/src/branch/master/wiki/pages/<?=$_GET["page"]?>.md">
+    <a href="https://tildegit.org/tildeverse/tilde.chat/src/branch/master/wiki/pages/<?=$page?>.md">
         <i class="fa fa-edit"></i> source
     </a>
 

wiki/pages/etiquette.md

@@ -59,6 +59,7 @@ if you have something that requires oper attention, please email opers at tilde
 
 Channels participating will share moderation records of warnings/kicks/bans.
 Users' continuing problematic behavior that has been previously addressed will share their Strikes between channels.
+Users that earn multiple channel permabans may earn a network wide ban.
 
 This means that:
 * User warned about bad behavior in one chan

wiki/pages/servers.md

@@ -27,13 +27,11 @@ once you're connected, try `/map` to see the servers listed fully.
 |------------------------|-----------|---------------------------------------------|--------------------------------------------------------------------------------------|
 | aussie.tilde.chat      | australia | [aussies.space](https://aussies.space/)     |                                                                                      |
 | bsd.tilde.chat         | germany   | [bsd.tilde.team](https://bsd.tilde.team/)   |                                                                                      |
-| club.tilde.chat        | quebec    | [tilde.club](https://tilde.club/)           |                                                                                      |
 | cosmic.tilde.chat      | london    | [cosmic.voyage](https://cosmic.voyage/)     |                                                                                      |
 | ctrl-c.tilde.chat      | new york  | [ctrl-c.club](http://ctrl-c.club)           |                                                                                      |
 | institute.tilde.chat   | germany   | [tilde.institute](https://tilde.institute/) | not available on localhost currently                                                 |
 | newhub.tilde.chat      | virginia  | [ben](https://tilde.team/~ben/)             | services, [website](https://tilde.chat), and [mumble](mumble://tilde.chat) live here |
 | team.tilde.chat        | quebec    | [tilde.team](https://tilde.team/)           |                                                                                      |
 | texto-plano.tilde.chat | chile     | [texto-plano.xyz](https://texto-plano.xyz/) |                                                                                      |
-| thunix.tilde.chat      | germany   | [thunix](https://thunix.net)                |                                                                                      |
 | town.tilde.chat        | toronto   | [tilde.town](https://tilde.town/)           | only accessible from localhost on port 7766; no external connections                 |
 

wiki/pages/weechat.md

@@ -18,19 +18,20 @@ Start weechat on your linux shell and type the following commands:
     /connect tilde
 
 This will connect you to the irc network via a secure connection. The
-username used is the same as your linux account, this is should be
+username used is your linux account, this has to be unique, if someone
-unique, if it is not you will be called username1 or similar, then you
+else registered your name already and is online you will be called
-should chose another nickname. You do that by using the /nick command
+**username1** or similar, then you should choose another nickname. You
+do that with
 
     /nick newusername
 
-(If you didn't chose a username that is unique in the tilde network,
+(If you didn't choose a username that is unique in the tilde network,
 you had kind of bad luck.)
 
 ## Register
 
 You now can register your username using your tilde email address as
-described here: [intro to nicks](nicks.html)
+described here: [intro to nicks](nicks)
 
 ## Setting login credentials
 
@@ -67,13 +68,13 @@ in /whois you can use
     /set irc.server.tilde.realname "My real name"
 
 You can join multiple channels with /j #channel or start private
-conversatins with /msg nickname and navigate between the different
+conversations with /msg nickname and navigate between the different
 windows with Control-n and Control-p
 
 To automatically connect to the tilde server on startup use
 
     /set irc.server.tilde.autoconnect on
 
-For more information about the program, see the
+For more information about weechat, see the
 [manual](https://weechat.org/files/doc/stable/weechat_user.en.html)