cleanups

diff --git a/CHANGELOG b/CHANGELOG
index e5e1178b028143a0a911621f2e249ec8b99c7d91..6aad23cb98159f38a4c36f70551fdce06b8d833f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+202008xx version 1.2 Carbon
+* Cleanup version only. No new fetures
+
 20200530 version 1.1 Boron
 * House cleaning
 * Added a simple web client

diff --git a/README b/README
index 92909dcbe8521510b4695f995a315c60374b23ad..49a93974b5d88c1647d81d59054e7de8e985d284 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 selfpaste is a small self hosting paste service.
 https://www.bananas-playground.net/projekt/selfpaste/
-It is not the aim to replace any other well know paste service. It is an experiment
-and build for private use only.
+It is not the aim to replace any other well known paste service. 
+It is an experiment and build for private use only.
 
 This tool uses PHP fileinfo: https://www.php.net/manual/en/intro.fileinfo.php
 
@@ -9,12 +9,12 @@ This tool uses PHP fileinfo: https://www.php.net/manual/en/intro.fileinfo.php
 > by looking for certain magic byte sequences at specific positions within the file.
 > While this is not a bullet proof approach the heuristics used do a very good job.
 
-It is not really bulletproof, but it does the job. Everything can be manipulated
-to look alike something it isn't.
+It is not really bulletproof, but it does the job. 
+Everything can be manipulated to look alike something it isn't.
 
 So, here is a friendly REMINDER:
 
-    - Use at own risk.
+    - Use it at own risk.
     - Don't open it up to the public
     - Check regularly what is added
     - Clean everything what you do not know
@@ -22,10 +22,10 @@ So, here is a friendly REMINDER:
     - Change your secret often.
 
 # Why json as a response?
-In cases the upload is over post_max_size the request will not be "arrive".
+In cases the upload is over post_max_size the request will not "arrive".
 Meaning the script does not receive enough information to work with.
-In this case we return the start page. Which is a valid HTTP 200 status response.
-So the client can not only rely in the HTTP status code alone.
+In this case it returns the start page. Which is a valid HTTP 200 status response.
+So the client can not only rely on the HTTP status code alone.
 
 # Third party resources
-Link shortening inspired and some code used from: https://www.jwz.org/base64-shortlinks/
\ No newline at end of file
+Link shortening inspired and some code used from: https://www.jwz.org/base64-shortlinks/

diff --git a/VERSION b/VERSION
index b5d737b923774ffc176da1699d9ffdf2ac4a83a7..4ed135d7a5319c3cddd204d2d913fd6ceead01dd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1 Boron
+1.2 Carbon

diff --git a/client/c-client-linux/README b/client/c-client-linux/README
index db1354b12be9591b902edd29f31be47385048538..9fa51574ccbb5b4c0de99bce8c6868917fa1aa6d 100644 (file)
--- a/client/c-client-linux/README
+++ b/client/c-client-linux/README
@@ -1,2 +1,2 @@
-Linux client written in C. Can be build with the added Makefile for linux
+Linux client written in C. Can be build with the added Makefile for linux.
 Depends on libcurl (+ssl) https://curl.haxx.se and json-c https://github.com/json-c/json-c

diff --git a/client/c-client-win/README b/client/c-client-win/README
index 9634b8707106d4579d5c914c269ec49d8a0ed976..edbdd847535f54c08e7661c79e92b8c0b041a88d 100644 (file)
--- a/client/c-client-win/README
+++ b/client/c-client-win/README
@@ -12,5 +12,5 @@ Use at own risk and feel free to improve.
 \r
 Howto build:\r
 - gcc from https://jmeubank.github.io/tdm-gcc/ (build with tdm64-gcc-9.2.0)\r
-Run the makefile.bat in a cmd terminal. \r
-Resulting selfpaste.exe and needed dll are in bin/ directory.
\ No newline at end of file
+- Run the makefile.bat in a cmd terminal. \r
+- Resulting selfpaste.exe and needed dlls are in bin/ directory.\r

diff --git a/client/webclient/README b/client/webclient/README
index f8d4a195fd3b2319e6a8b36bc4bd70f5e6c3ea55..8a1338423dc543ed666d4da5d2af5934a752467b 100644 (file)
--- a/client/webclient/README
+++ b/client/webclient/README
@@ -1,7 +1,7 @@
 The webclient provides a simple web client to add pasties on the go when no client is available.
 It is a simple basic auth protected script which will then add the new pasty to your installation.
 
-To enable the webclient read the details in the index.php and config.default. file.
+To enable the webclient read the details in the index.php and config.default.php file.
 Copy config.default.php to config.php and provide a username, password, secret and the selfpaste endpoint url.
 
 Upload it where you want it and go.

diff --git a/documentation/clean-cronjob.txt b/documentation/clean-cronjob.txt
index 1de9791dbc231c054a5d0a275657fe60e98e62ed..7069c63e3e0ae94f85c70d1abf4061b9c0b5c1e1 100644 (file)
--- a/documentation/clean-cronjob.txt
+++ b/documentation/clean-cronjob.txt
@@ -18,7 +18,7 @@
  * rename this file into a php file and create a cronjob which executes this file as
  * php cli command
  *
- * example runs very sunday : 0 0 * * 0 php /path/to/this/file.php
+ * example runs every sunday : 0 0 * * 0 php /path/to/this/file.php
  *
  * you need to change PATH_TO_MANCUBUS_CLASS to find the required PHP class
  */
@@ -44,4 +44,4 @@ require_once(PATH_TO_MANCUBUS_CLASS);
 if($verbose == true) echo "Selfpaste cleanup start\n";
 $mancubus = new Mancubus();
 $mancubus->cleanupCronjob($verbose);
-if($verbose == true) echo "Selfpaste cleanup end\n";
\ No newline at end of file
+if($verbose == true) echo "Selfpaste cleanup end\n";

diff --git a/documentation/clients.txt b/documentation/clients.txt
index 7bf24a6bf92bdbcb7cb51c6e33b7a4b59891b17d..d288de7bc17c3510b9be4192e613a52f929d0553 100644 (file)
--- a/documentation/clients.txt
+++ b/documentation/clients.txt
@@ -5,6 +5,9 @@ make sure you change ENDPOINT and SELFPASTE_UPLOAD_SECRET.
 A C client is available to be build with makefile. Build and see included
 help for more information.
 
+A C client for windows is also available can be build with the provided
+information in the right folder.
+
 Requirements to create a new client are:
 
     - Talk to the selfpaste endpoint over HTTP(S) (your choice)

diff --git a/documentation/filetypes.txt b/documentation/filetypes.txt
index 9e7c86769fef761f07e3e95bc0a6ecb83edf6be5..170104d88cf0fa7df154fcf3db58471f960ea136 100644 (file)
--- a/documentation/filetypes.txt
+++ b/documentation/filetypes.txt
@@ -4,10 +4,10 @@ This tool uses PHP fileinfo: https://www.php.net/manual/en/intro.fileinfo.php
 > by looking for certain magic byte sequences at specific positions within the file.
 > While this is not a bullet proof approach the heuristics used do a very good job.
 
-It is not really bullet proof, but it does the job. Everything can be manipulated
+It is not really bulletproof, but it does the job. Everything can be manipulated
 to look alike something it isn't.
 
 To expand or reduce the allowed filetypes, edit the SELFPASTE_ALLOWED_FILETYPES string to your needs.
 Again READ the README and security info!
 
-Read more about filetypes here: https://www.iana.org/assignments/media-types/media-types.xhtml
\ No newline at end of file
+Read more about filetypes here: https://www.iana.org/assignments/media-types/media-types.xhtml

diff --git a/documentation/requirements.txt b/documentation/requirements.txt
index 70a5c92376584d3c96d2aca8f21b2007a229a2d3..1a1f05cf86052538868f47323093f47e762fd07a 100644 (file)
--- a/documentation/requirements.txt
+++ b/documentation/requirements.txt
@@ -3,4 +3,7 @@ Apache >= 2.4
 - mod_deflate
 - mod_rewrite
 - htaccess support AllowOverride All
-Bash, curl and jq for included bash client
\ No newline at end of file
+
+Bash, curl and jq for included bash client.
+
+More dependencies for each client can be found in the individual readmes.

diff --git a/webroot/.gitignore b/webroot/.gitignore
new file mode 100644 (file)
index 0000000..4f4773f
--- /dev/null
+++ b/webroot/.gitignore
@@ -0,0 +1 @@
+config.php