flipped bool

Adds delete by IP excluded IP array, and config to exclude threads from delete by IP
Merge pull request 'Adds saboteur banner' (#68 ) from banners2022_03_01 into config
2022-03-27 19:53:17 +02:00 · 2022-03-27 18:47:58 +02:00 · 2022-03-23 17:57:11 +00:00 · 2022-03-23 17:56:14 +00:00 · 2022-03-01 04:55:53 -01:00 · 2022-03-01 01:54:05 +01:00
1374 changed files with 118152 additions and 32181 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,8 @@
 /*/config.php
 /*.html
 /*.xml
+/vendor/*
+/vendor

 # include some files though
 !/templates/*.html
@ -18,6 +20,10 @@
 # instance-config
 /inc/instance-config.php

+# captcha-config
+/inc/captchaconfig.php 
+
+
 # .installed
 /.installed

@ -59,10 +65,16 @@ tf/
 [._]s[a-w][a-z]

 # special boards
-all/
-mod/
-random/
+/all/
+/mod/
+/random/

 # Banners
 banners/*
 !banners/lain-bottom.png
+
+#Fonts
+stylesheets/fonts
+
+#Images from twemoji
+js/twemoji/16x16/
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,9 @@
 [submodule "js/wPaint"]
 	path = js/wPaint
 	url = https://github.com/vichan-devel/wPaint.git
+	branch = master
+
+[submodule "inc/lib/parsedown"]
+	path = inc/lib/parsedown
+	url = https://github.com/vichan-devel/parsedown
+	branch = master
--- a/403.php
+++ b/403.php
--- a/404.html
+++ b/404.html
@ -0,0 +1,21 @@
+<html>
+<head>
+<title>404 - Page Not Found</title>
+<style type="text/css">
+body {
+background: #1E1E1E;
+color: #999999;
+}
+</style>
+</head>
+
+<body>
+<center>
+<h1>Page not found</h1>
+<img style="width:750px;height:420px" src="/static/404.webp"/>
+<br/>
+<p>It may have been pruned, moved, merged, removed, or never existed.</p>
+</center>
+</body>
+</html>
+
--- a/404.php
+++ b/404.php
@ -1,32 +0,0 @@
-<title>404</title>
-<style type="text/css">
-body {
-		margin: 0 !important;
-		padding: 0px !important;
-	 overflow-x:hidden!important;
-		 background-size: cover !important;
-		 background-color: #222  !important;
-		 background-image:
-			 url(https://gs1.wac.edgecastcdn.net/8019B6/data.tumblr.com/tumblr_mc0xu6C22f1qbj9bko1_500.gif);
-		 background-repeat: no-repeat !important;
-		 background-position: 0!important;
-		 background-attachment: fixed !important;
-		 background-size: cover !important;
-}
-</style>
-</head>
-
-<body>
-<center><!--<img src="/static/lain_2_090.jpg"/>-->
-<marquee scrollamount="40"><h1><p style="font-family: sans-serif; font-size:30px; color: white;">WHOOPS</p></h1></marquee>
-<p style="color: blue;background:black">There's nothing here</p>
-<p style="color: red;background:black">it's a 404</p>
-<br /> <br />
-<audio autoplay loop>
-<source src="/static/duvet.ogg" type="audio/ogg" />
-<source src="/static/duvet.mp3" type="audio/mpeg" />
-</audio>
-</center>
-</body>
-</html>
-
--- a/22
+++ b/22
@ -0,0 +1,22 @@
+FROM php:5.6-fpm
+RUN docker-php-ext-install pdo pdo_mysql
+RUN apt-get update -y && apt-get install -y libpng-dev libjpeg-dev
+RUN docker-php-ext-install mbstring
+RUN apt-get update -y && apt-get install -y libmcrypt-dev
+RUN docker-php-ext-install -j$(nproc) mcrypt
+RUN docker-php-ext-install iconv
+RUN apt-get update -y && apt-get install -y imagemagick
+RUN apt-get update -y && apt-get install -y graphicsmagick
+RUN apt-get update -y && apt-get install -y gifsicle
+RUN docker-php-ext-configure gd \
+        --with-png-dir=/usr \
+        --with-jpeg-dir=/usr
+RUN docker-php-ext-install gd
+RUN apt-get update -y \
+  && apt-get install -y libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
+  && pecl install memcached-2.2.0 \
+  && echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini \
+  && apt-get remove -y build-essential libmemcached-dev libz-dev \
+  && apt-get autoremove -y \
+  && apt-get clean \
+  && rm -rf /tmp/pear
--- a/README.md
+++ b/README.md
@ -1,97 +1,89 @@
-Lainchan - A fork of vichan
+leftypol - vichan/lainchan based imageboard software
 ========================================================

 About
 ------------
-Lainchan is a fork of [vichan](http://github.com/vichan-devel/vichan),
-a great imageboard package, actively building on it and adding a lot of features and other
+The leftypol imageboard is a fork of [lainchan](http://github.com/lainchan/lainchan), a fork of [vichan](http://github.com/vichan-devel/vichan), actively building on it and adding features, bug-fixes and other
 improvements.

+We highly recommend you read the [vichan GitHub wiki](http://github.com/vichan-devel/vichan/wiki) for a basic guide to features.
+
 Requirements
 ------------
-1.	PHP >= 5.4 (we still try to keep compatibility with php 5.3 as much as possible)
-        PHP 7.0 is explicitly supported.
-2.	MySQL/MariaDB server
-3.	[mbstring](http://www.php.net/manual/en/mbstring.installation.php) 
-4.	[PHP GD](http://www.php.net/manual/en/intro.image.php)
-5.	[PHP PDO](http://www.php.net/manual/en/intro.pdo.php)
+1.	PHP >= 5.4 (we do not actively check if this is still supported)
+		PHP 8.0 is explicitly supported. PHP 7.x should be compatable.
+2.	MySQL/MariaDB server >= 5.5.3
+3.	[Composer](https://getcomposer.org/) (To install various packages)
+4.	[mbstring](http://www.php.net/manual/en/mbstring.installation.php) 
+5.	[PHP GD](http://www.php.net/manual/en/intro.image.php)
+6.	[PHP PDO](http://www.php.net/manual/en/intro.pdo.php)

-We try to make sure lainchan is compatible with all major web servers and
-operating systems. lainchan does not include an Apache ```.htaccess``` file nor does
+This should be compatible with all major web servers and
+operating systems. This code does not include an Apache ```.htaccess``` file nor does
 it need one.

 ### Recommended
-1.	MySQL/MariaDB server >= 5.5.3
-2.	ImageMagick (command-line ImageMagick or GraphicsMagick preferred).
-3.	[APC (Alternative PHP Cache)](http://php.net/manual/en/book.apc.php),
+1.	ImageMagick (command-line ImageMagick or GraphicsMagick preferred).
+2.	[APC (Alternative PHP Cache)](http://php.net/manual/en/book.apc.php),
+    Redis,
 	[XCache](http://xcache.lighttpd.net/) or
 	[Memcached](http://www.php.net/manual/en/intro.memcached.php)

 Contributing
 ------------
-You can contribute to lainchan by:
-*	Developing patches/improvements/translations and using GitHub to submit pull requests
+You can contribute to leftypol, and upstream imageboard softwares, by:
+*	Developing patches/improvements/translations and using this repo to submit pull requests
 *	Providing feedback and suggestions
 *	Writing/editing documentation

-If you need help developing a patch, please join our IRC channel. 
-
-> irc.freenode.net @ #lainchan-dev
+If you need help developing a patch, please reply to the sticky on our [/tech/](https://leftypol.org/tech/) board.

 Installation
 -------------
-1.	Download and extract lainchan to your web directory or get the latest
+1.	Download and extract leftypol to your web directory or get the latest
 	development version with:

-        git clone git://github.com/lainchan/lainchan.git
+        git clone git://git.leftypol.org/leftypol/leftypol.git
 	
-2.	Navigate to ```install.php``` in your web browser and follow the
+2.	run ```composer install``` inside the directory
+3.	Navigate to ```install.php``` in your web browser and follow the
 	prompts.
-3.	lainchan should now be installed. Log in to ```mod.php``` with the
+4.	leftypol should now be installed. Log in to ```mod.php``` with the
 	default username and password combination: **admin / password**.

 Please remember to change the administrator account password.

-See also: [Configuration Basics](http://tinyboard.org/docs/?p=Config).
+See also: [Configuration Basics](https://web.archive.org/web/20121003095922/http://tinyboard.org/docs/?p=Config).

 Upgrade
 -------
-To upgrade from any version of Tinyboard or vichan:
+This probably will break if you try and upgrade from vichan or the older (<= August 2021) leftypol versions. Ask us for migration advice if you intend to do so.
+
+To upgrade from this repo:

 Either run ```git pull``` to update your files, if you used git, or
 backup your ```inc/instance-config.php```, replace all your files in place
 (don't remove boards etc.), then put ```inc/instance-config.php``` back and
 finally run ```install.php```.

-To migrate from a Kusaba X board, use http://github.com/vichan-devel/Tinyboard-Migration
+To migrate from a Kusaba X board, use http://github.com/vichan-devel/Tinyboard-Migration (untested)

 Support
 --------
 If you find a bug, please report it.

-If you need assistance with installing, configuring, or using lainchan, you may
+If you need assistance with installing, configuring, or using leftypol, you may
 find support from a variety of sources:

 *	If you're unsure about how to enable or configure certain features, make
 	sure you have read the comments in ```inc/config.php```.
-*	You can join lainchan's IRC channel for support
-	[irc.freenode.net #lainchan](irc://irc.freenode.net/lainchan)
+*	For support, reply to the sticky on our [/tech/](https://leftypol.org/tech/) board.

 ### Tinyboard support
-vichan, and by extension lainchan, is based on a Tinyboard, so both engines have very much in common. These
-links may be helpful for you as well: 
+vichan, and by extension lainchan and leftypol, is based on a Tinyboard, so both engines have very much in common. These links may be helpful for you as well: 

 *	Tinyboard documentation can be found [here](https://web.archive.org/web/20121016074303/http://tinyboard.org/docs/?p=Main_Page).

-Donations
---------
-Do you like our work? You can motivate us financially to do better ;)
-* Bitcoin: 18CshTkxW6HRFoBhXo9mLJcjkReMmjvuq9
-
-You can also ask us to develop some feature specially for you <3. Join our IRC
-channel and ask for a quote (there are a few of us, who work with the codebase
-and are skilled enough to develop such features pretty quickly).
-
 CLI tools
 -----------------
 There are a few command line interface tools, based on Tinyboard-Tools. These need
@ -104,13 +96,13 @@ at the power users. You won't be able to run these from shared hosting accounts

 Localisation
 ------------
-Wanting to have lainchan in your language? You can contribute your translations to vichan at this URL:
+Wanting to have leftypol in your language? You can contribute your translations to vichan at this URL:

 https://www.transifex.com/projects/p/tinyboard-vichan-devel/

 Oekaki
 ------
-lainchan makes use of [wPaint](https://github.com/websanova/wPaint) for oekaki. After you pull the repository, however, you will need to download wPaint separately using git's `submodule` feature. Use the following commands:
+leftypol makes use of [wPaint](https://github.com/websanova/wPaint) for oekaki. After you pull the repository, however, you will need to download wPaint separately using git's `submodule` feature. Use the following commands:

 ```
 git submodule init
@ -123,12 +115,12 @@ WebM support
 ------------
 Read `inc/lib/webm/README.md` for information about enabling webm.

-lainchan API
+leftypol API
 ----------
-lainchan provides by default a 4chan-compatible JSON API, just like vichan. For documentation on this, see:
+leftypol provides by default a 4chan-compatible JSON API, just like vichan. For documentation on this, see:
 https://github.com/vichan-devel/vichan-API/ .

 License
 --------
-See [LICENSE.md](http://github.com/lainchan/lainchan/blob/master/LICENSE.md).
+See LICENSE.md.

--- a/b.php
+++ b/b.php
@ -1,47 +0,0 @@
-<?php
-// This script assumes there is at least one normal (non-priority)
-// banner!
-
-// Get the files in a directory, returns null if the directory does
-// not exist.
-function getFilesInDirectory($dir) {
-    if (! is_dir($dir)) {
-        return null;
-    }
-
-    return array_diff(scandir($dir), array('.', '..'));
-}
-
-// Serve a random banner and exit.
-function serveRandomBanner($dir, $files) {
-    $name = $files[array_rand($files)];
-
-    // snags the extension
-    $ext = pathinfo($name, PATHINFO_EXTENSION);
-
-    // send the right headers
-    header('Cache-Control: no-cache, no-store, must-revalidate'); // HTTP 1.1
-    header('Pragma: no-cache'); // HTTP 1.0
-    header('Expires: 0'); // Proxies
-    header("Content-type: image/" . $ext);
-    header("Content-Disposition: inline; filename=" . $name);
-
-    // readfile displays the image, passthru seems to spits stream.
-    readfile($dir.$name);
-    exit;
-}
-
-// Get all the banners
-$bannerDir = "banners/";
-$priorityDir = "banners_priority/";
-
-$banners = getFilesInDirectory($bannerDir);
-$priority = getFilesInDirectory($priorityDir);
-
-// If there are priority banners, serve 1/3rd of the time.
-if($priority !== null && count($priority) !== 0 && rand(0,2) === 0) {
-    serveRandomBanner($priorityDir, $priority);
-}
-
-serveRandomBanner($bannerDir, $banners);
-?>
--- a/banned.php
+++ b/banned.php
@ -1,6 +1,5 @@
 <?php
-  require_once 'inc/functions.php';
-  require_once 'inc/bans.php';
+  require_once 'inc/bootstrap.php';
  checkBan();

  //If the user is not banned, show the "not banned" page.
--- a/banners.php
+++ b/banners.php
@ -1,22 +1,16 @@
-<html>
-<head>
-<title>Lainchan Banners</title>
-</head>
-<body>
 <?php
-function listBannersInDir($dir) {
-    if ($handle = opendir($dir)) {
-        while (false !== ($entry = readdir($handle))) {
-            if ($entry != "." && $entry != "..") {
-                echo "<a href=\"$dir/$entry\"><img src=\"$dir/$entry\" alt=\"$entry\" style=\"width:348px;height:128px\"></a> ";
-            }
-        }
-        closedir($handle);
-    }
+function getBannerSrc(){
+	$files = scandir(__dir__.'/banners/');
+	$files = array_diff($files, array('.', '..'));
+	return $files[array_rand($files)];
 }

-listBannersInDir("banners_priority");
-listBannersInDir("banners");
-?>
-</body>
-</html>
+$filename = getBannerSrc();
+$filename = "banners/" . $filename;
+$fp = fopen($filename, 'rb');
+
+header("Content-Type: image/png");
+header("Content-Length: " . filesize($filename)); 
+
+fpassthru($fp);
+?>
--- a/banners/1608992480627.webp
+++ b/banners/1608992480627.webp
--- a/banners/1608992511794.webp
+++ b/banners/1608992511794.webp
--- a/banners/1608992524118.webp
+++ b/banners/1608992524118.webp
--- a/banners/1608992551600.webp
+++ b/banners/1608992551600.webp
--- a/banners/1608992576348.webp
+++ b/banners/1608992576348.webp
--- a/banners/1608992589414.webp
+++ b/banners/1608992589414.webp
--- a/banners/1608992682734.webp
+++ b/banners/1608992682734.webp
--- a/banners/1608993276367.webp
+++ b/banners/1608993276367.webp
--- a/banners/1608996011049.webp
+++ b/banners/1608996011049.webp
--- a/banners/1609004437891.webp
+++ b/banners/1609004437891.webp
--- a/banners/1609004460965.webp
+++ b/banners/1609004460965.webp
--- a/banners/1609010983068.gif
+++ b/banners/1609010983068.gif
--- a/banners/1610174020766-0.webp
+++ b/banners/1610174020766-0.webp
--- a/banners/1610174020766-1.webp
+++ b/banners/1610174020766-1.webp
--- a/banners/1610174020766-2.webp
+++ b/banners/1610174020766-2.webp
--- a/banners/1610174020766-3.webp
+++ b/banners/1610174020766-3.webp
--- a/banners/1610174020766-4.webp
+++ b/banners/1610174020766-4.webp
--- a/banners/1610175053568.webp
+++ b/banners/1610175053568.webp
--- a/banners/1610178074936-0.webp
+++ b/banners/1610178074936-0.webp
--- a/banners/1610178074936-3.webp
+++ b/banners/1610178074936-3.webp
--- a/banners/1610178074936-4.webp
+++ b/banners/1610178074936-4.webp
--- a/banners/1610178136375.webp
+++ b/banners/1610178136375.webp
--- a/banners/1610178320956-0.webp
+++ b/banners/1610178320956-0.webp
--- a/banners/1610178320956-1.webp
+++ b/banners/1610178320956-1.webp
--- a/banners/1610310834005.webp
+++ b/banners/1610310834005.webp
--- a/banners/1610311198568.webp
+++ b/banners/1610311198568.webp
--- a/banners/1610328634611-0.webp
+++ b/banners/1610328634611-0.webp
--- a/banners/1610328634611-1.webp
+++ b/banners/1610328634611-1.webp
--- a/banners/1610350191135.webp
+++ b/banners/1610350191135.webp
--- a/banners/1610377334211.webp
+++ b/banners/1610377334211.webp
--- a/banners/1610377617354.webp
+++ b/banners/1610377617354.webp
--- a/banners/1610400597507.webp
+++ b/banners/1610400597507.webp
--- a/banners/1610403313252.webp
+++ b/banners/1610403313252.webp
--- a/banners/1610423146058.webp
+++ b/banners/1610423146058.webp
--- a/banners/1610506710736.webp
+++ b/banners/1610506710736.webp
--- a/banners/1610532935321.webp
+++ b/banners/1610532935321.webp
--- a/banners/1610562179096.webp
+++ b/banners/1610562179096.webp
--- a/banners/1610570911383.webp
+++ b/banners/1610570911383.webp
--- a/banners/1610758629078-1.webp
+++ b/banners/1610758629078-1.webp
--- a/banners/1610759876074.gif
+++ b/banners/1610759876074.gif
--- a/banners/1610971781494.webp
+++ b/banners/1610971781494.webp
--- a/banners/1610975954706.webp
+++ b/banners/1610975954706.webp
--- a/banners/1610977708450.webp
+++ b/banners/1610977708450.webp
--- a/banners/1610998964025.jpeg
+++ b/banners/1610998964025.jpeg
--- a/banners/1610998964025.webp
+++ b/banners/1610998964025.webp
--- a/banners/1611082496367.webp
+++ b/banners/1611082496367.webp
--- a/banners/1611088031974.webp
+++ b/banners/1611088031974.webp
--- a/banners/1611223873258.gif
+++ b/banners/1611223873258.gif
--- a/banners/1611337091375.webp
+++ b/banners/1611337091375.webp
--- a/banners/1611337749739.webp
+++ b/banners/1611337749739.webp
--- a/banners/1611338455652.webp
+++ b/banners/1611338455652.webp
--- a/banners/1613099853307.webp
+++ b/banners/1613099853307.webp
--- a/banners/1613099947568.webp
+++ b/banners/1613099947568.webp
--- a/banners/1613100022707.webp
+++ b/banners/1613100022707.webp
--- a/banners/1613100084652.webp
+++ b/banners/1613100084652.webp
--- a/banners/1613100158681.webp
+++ b/banners/1613100158681.webp
--- a/banners/1613153123060.webp
+++ b/banners/1613153123060.webp
--- a/banners/1613173074089.gif
+++ b/banners/1613173074089.gif
--- a/banners/1613187031184.gif
+++ b/banners/1613187031184.gif
--- a/banners/1613265848816-0.webp
+++ b/banners/1613265848816-0.webp
--- a/banners/1613265848816-1.webp
+++ b/banners/1613265848816-1.webp
--- a/banners/1613265848816-2.webp
+++ b/banners/1613265848816-2.webp
--- a/banners/1613265931396-0.webp
+++ b/banners/1613265931396-0.webp
--- a/banners/1613265931396-1.webp
+++ b/banners/1613265931396-1.webp
--- a/banners/1613267545568.webp
+++ b/banners/1613267545568.webp
--- a/banners/1613501994415.webp
+++ b/banners/1613501994415.webp
--- a/banners/1613502208401.webp
+++ b/banners/1613502208401.webp
--- a/banners/1613653224536.webp
+++ b/banners/1613653224536.webp
--- a/banners/1613668042189.gif
+++ b/banners/1613668042189.gif
--- a/banners/1613699469879.gif
+++ b/banners/1613699469879.gif
--- a/banners/1614115920095-0.webp
+++ b/banners/1614115920095-0.webp
--- a/banners/1614115920095-1.gif
+++ b/banners/1614115920095-1.gif
--- a/banners/1614115920095-2.webp
+++ b/banners/1614115920095-2.webp
--- a/banners/1614170887091.webp
+++ b/banners/1614170887091.webp
--- a/banners/1614207368332.gif
+++ b/banners/1614207368332.gif
--- a/banners/1614528500405-0.webp
+++ b/banners/1614528500405-0.webp
--- a/banners/1614528500405-1.webp
+++ b/banners/1614528500405-1.webp
--- a/banners/1614528500405-2.webp
+++ b/banners/1614528500405-2.webp
--- a/banners/1614528500405-3.webp
+++ b/banners/1614528500405-3.webp
--- a/banners/1614528500405-4.webp
+++ b/banners/1614528500405-4.webp
--- a/banners/1614528532096-0.webp
+++ b/banners/1614528532096-0.webp
--- a/banners/1614528532096-1.webp
+++ b/banners/1614528532096-1.webp
--- a/banners/1614528532096-2.webp
+++ b/banners/1614528532096-2.webp
--- a/banners/1614528532096-3.webp
+++ b/banners/1614528532096-3.webp
--- a/banners/1614528532096-4.webp
+++ b/banners/1614528532096-4.webp
--- a/banners/1614528597664-0.webp
+++ b/banners/1614528597664-0.webp
--- a/banners/1614528597664-1.webp
+++ b/banners/1614528597664-1.webp
--- a/banners/1614528597664-2.webp
+++ b/banners/1614528597664-2.webp
--- a/banners/1614528597664-3.webp
+++ b/banners/1614528597664-3.webp
--- a/banners/1614528597664-4.webp
+++ b/banners/1614528597664-4.webp
--- a/Show More
+++ b/Show More