diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8c559e0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: php -php: - - '7.2' - - '7.3' - - '7.4' - -install: -- source ~/.nvm/nvm.sh -- nvm ls-remote -- nvm install stable -- nvm use stable -script: -- make - diff --git a/Makefile b/Makefile index 7752035..18b06d6 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,11 @@ TAR="tar" GREP="grep" NODE="node" NPM="npm" -DESTDIR="./dist" -PKG_VERSION := $( $(GREP) -Po '(?<="version": ")[^"]*' ) +NODEJQ="node_modules/node-jq/bin/jq" +CONF="dist.json" +DESTDIR = $(shell $(CURDIR)/$(NODEJQ) -r ".dest" $(CURDIR)/$(CONF)) +NPX="npx" +PKG_VERSION = $(shell $(CURDIR)/$(NODEJQ) -r ".version" $(CURDIR)/package.json) TMPDIR := $(shell mktemp -d) DOCKER_IMAGE = "$(shell basename $(CURDIR) | tr [:upper:] [:lower:])" DOCKER_TAG="$(DOCKER_TAG)" @@ -13,17 +16,19 @@ CONTAINER_NAME="$(CONTAINER_NAME)" # default modules MODULES="php" -all: builddirs npm_dependencies swig htmlmin min-css min-js copy-img submodules - -swig: - $(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/faq.swig > $(CURDIR)/build/faq.html - $(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/index.swig > $(CURDIR)/build/index.html - $(NODE) node_modules/swig/bin/swig.js render -j dist.json templates/tools.swig > $(CURDIR)/build/tools.html +pageList = $(shell $(CURDIR)/$(NODEJQ) -r ".pages[]" $(CURDIR)/$(CONF)) +noExt = $(shell echo $(i) | cut -d '.' -f1) -htmlmin: - $(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/index.html -o $(CURDIR)/build/index.html - $(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/faq.html -o $(CURDIR)/build/faq.html - $(NODE) node_modules/htmlmin/bin/htmlmin $(CURDIR)/build/tools.html -o $(CURDIR)/build/tools.html +all: builddirs npm_dependencies ejs minify-all copy-img submodules + +ejs: + $(foreach i,$(pageList), \ + $(NPX) ejs -f $(CURDIR)/$(CONF) $(CURDIR)/templates/$(i) -o $(CURDIR)/build/tmp/html/$(noExt).html;) + +minify-all: + $(NPX) minify-all-cli -s $(CURDIR)/build/tmp/html/ -d $(CURDIR)/build/html + $(NPX) minify-all-cli -s $(CURDIR)/static/js -d $(CURDIR)/build/js + $(NPX) minify-all-cli -s $(CURDIR)/static/css -d $(CURDIR)/build/css installdirs: mkdir -p $(DESTDIR)/ $(DESTDIR)/img @@ -34,15 +39,6 @@ endif ifneq (,$(findstring moe,$(MODULES))) mkdir -p $(DESTDIR)/moe/{css,fonts,includes,js,login,panel/css/font,panel/css/images,register,templates} endif - -min-css: - $(NODE) $(CURDIR)/node_modules/.bin/cleancss $(CURDIR)/static/css/uguu.css --output $(CURDIR)/build/uguu.min.css - -min-js: - echo "// @source https://github.com/nokonoko/uguu/tree/master/static/js" > $(CURDIR)/build/uguu.min.js - echo "// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat" >> $(CURDIR)/build/uguu.min.js - $(NODE) $(CURDIR)/node_modules/.bin/uglifyjs ./static/js/app.js >> $(CURDIR)/build/uguu.min.js - echo "// @license-end" >> $(CURDIR)/build/uguu.min.js copy-img: cp -v $(CURDIR)/static/img/*.png $(CURDIR)/build/img/ @@ -55,16 +51,17 @@ else $(error The php submodule was not found) endif -copy-moe: -ifneq ($(wildcard $(CURDIR)/moe/.),) - cp -rv $(CURDIR)/moe $(CURDIR)/build/ -else - $(error The moe submodule was not found) -endif - install: installdirs cp -rv $(CURDIR)/build/* $(DESTDIR)/ - + mv $(DESTDIR)/html/* $(DESTDIR)/ + mv $(DESTDIR)/js/* $(DESTDIR)/ + mv $(DESTDIR)/css/* $(DESTDIR)/ + rm -rf $(DESTDIR)/html + rm -rf $(DESTDIR)/css + rm -rf $(DESTDIR)/js + rm -rf $(DESTDIR)/tmp + mv $(DESTDIR)/uguu.css $(DESTDIR)/uguu.min.css + mv $(DESTDIR)/app.js $(DESTDIR)/uguu.min.js dist: DESTDIR=$(TMPDIR)/uguu-$(PKGVERSION) export DESTDIR @@ -95,7 +92,7 @@ purge-container: fi; builddirs: - mkdir -p $(CURDIR)/build $(CURDIR)/build/img + mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/tmp $(CURDIR)/build/tmp/html ifneq (,$(findstring php,$(MODULES))) mkdir -p $(CURDIR)/build/classes $(CURDIR)/build/includes endif diff --git a/dist.json b/dist.json index 38e8d17..653738c 100644 --- a/dist.json +++ b/dist.json @@ -3,30 +3,28 @@ "allowErrors": false }, "dest": "dist", - "pkgVersion": "1.5.3", - "banners": [ - "banners/malware_scans.swig", - "banners/donations.swig" + "pkgVersion": "1.5.4", + "pages": [ + "index.ejs", + "faq.ejs", + "tools.ejs" ], - "src": [ - "templates/index.swig", - "templates/faq.swig", - "templates/tools.swig" - ], - "generateRobotstxt": false, - "generateSitemap": false, "max_upload_size": 128, - "production": false, - "siteName": "SITENAME", - "siteUrl": "https://yoursite.com", + "expireTime": "24H", + "siteName": "sitename", + "subTitle": "site title", + "siteUrl": "https://uguu.se", "abuseContact": "abuse@example.com", "infoContact": "info@example.com", "ServerCountryLocation": "Sweden", "SiteMetaInfo": "SITENAME is a temporary file hosting service, upload files up to 128MiB for 24 hours.", "ToolsDesc": "The following tools might need editing to work on this clone of Uguu, usually editing the URL works.", + "donationBanner": true, "paypalUrl": "", "bitcoinAddress": "", "flattrUrl": "", + "kofiUrl": "", + "malwareBanner": true, "DB_MODE": "sqlite", "DB_PATH": "/var/www/db/uguu.sq3", "DB_USER": "NULL", @@ -35,6 +33,7 @@ "ANTI_DUPE": false, "BLACKLIST_DB": true, "FILTER_MODE": true, + "RATE_LIMIT": true, "FILES_ROOT": "/var/www/files/", "FILES_RETRIES": 15, "SSL": true, diff --git a/package.json b/package.json index 6a389b4..6a38ba5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uguu", - "version": "1.5.3", + "version": "1.5.4", "description": "Kawaii file host", "homepage": "https://uguu.se/", "repository": { @@ -16,13 +16,9 @@ "bugs": { "url": "https://github.com/nokonoko/uguu/issues" }, - "devDependencies": { - "clean-css": "^5.1.2", - "clean-css-cli": "^5.3.0", - "uglify-js": "^3.13.9", - "swig": "^1.4.2" - }, "dependencies": { - "htmlmin": "0.0.6" + "ejs": "^3.1.8", + "minify-all-cli": "^1.0.13", + "node-jq": "^2.3.3" } } diff --git a/static/css/uguu.css b/static/css/uguu.css index 93c7fd3..d48962b 100644 --- a/static/css/uguu.css +++ b/static/css/uguu.css @@ -189,6 +189,9 @@ a.donate-btn:hover { .icon-flattr { background-image: url('img/flattr.png'); } +.icon-kofi { + background-image: url('img/kofi.png'); +} /** * NAVIGATION LINKS diff --git a/static/img/kofi.png b/static/img/kofi.png new file mode 100644 index 0000000..9bf37ba Binary files /dev/null and b/static/img/kofi.png differ diff --git a/static/php/includes/Core.namespace.php b/static/php/includes/Core.namespace.php index 1626ff2..fcd1d50 100644 --- a/static/php/includes/Core.namespace.php +++ b/static/php/includes/Core.namespace.php @@ -350,7 +350,7 @@ namespace Core { $q->bindValue(':orig', Upload::$FILE_NAME, PDO::PARAM_STR); $q->bindValue(':name', Upload::$NEW_NAME_FULL, PDO::PARAM_STR); $q->bindValue(':size', Upload::$FILE_SIZE, PDO::PARAM_INT); - $q->bindValue(':date', time(), PDO::PARAM_STR); + $q->bindValue(':date', time(), PDO::PARAM_INT); $q->bindValue(':ip', Upload::$IP, PDO::PARAM_STR); $q->execute(); } catch (Exception) { diff --git a/static/php/includes/Upload.class.php b/static/php/includes/Upload.class.php index 9fb5e0f..d0b52b6 100644 --- a/static/php/includes/Upload.class.php +++ b/static/php/includes/Upload.class.php @@ -121,19 +121,6 @@ class Upload ]; } - public static function getIP() - { - if (!empty($_SERVER['HTTP_CLIENT_IP'])) { - self::$IP = $_SERVER['HTTP_CLIENT_IP']; - } - if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { - self::$IP = $_SERVER['HTTP_X_FORWARDED_FOR']; - } - if (!isset(self::$IP)) { - self::$IP = $_SERVER['REMOTE_ADDR']; - } - } - public static function fileInfo() { if (isset($_FILES['files'])) { @@ -149,7 +136,7 @@ class Upload } if (Settings::$LOG_IP) { - self::getIP(); + self::$IP = $_SERVER['REMOTE_ADDR']; } else { self::$IP = null; } diff --git a/templates/banners.swig b/templates/banners.swig deleted file mode 100644 index 59b72e8..0000000 --- a/templates/banners.swig +++ /dev/null @@ -1,3 +0,0 @@ -{% for banner in banners %} - {% include banner %} -{% endfor %} diff --git a/templates/banners/donations.swig b/templates/banners/donations.swig deleted file mode 100644 index 98c5418..0000000 --- a/templates/banners/donations.swig +++ /dev/null @@ -1,23 +0,0 @@ -

- {{siteName}} is free to use, but our hosting costs are far from it — donations are what keep {{siteName}} alive, free, and fast. - -

diff --git a/templates/banners/malware_scans.swig b/templates/banners/malware_scans.swig deleted file mode 100644 index 1555dca..0000000 --- a/templates/banners/malware_scans.swig +++ /dev/null @@ -1,3 +0,0 @@ -

- Malware is not allowed — files identified as malware will be removed without further notice. -

diff --git a/templates/faq.ejs b/templates/faq.ejs new file mode 100644 index 0000000..efdb8c5 --- /dev/null +++ b/templates/faq.ejs @@ -0,0 +1,64 @@ +<%- include('./templates/partials/header.ejs'); -%> +
+
+
+

+ FAQ +

+
+
+

What is <%= siteName %>?

+

<%= siteName %> is a simple to use free file hosting service where files get + deleted after <%= expireTime %>. It lets you share your photos, documents, music, videos and more with + others online.

+

What files are allowed?

+

Any kind of file is allowed, as long as the file is legal in <%= ServerCountryLocation %> and you have the legal + right to publish the file on our service.

+

As an exception to this policy to prevent abuse, we do not allow malware on our service. Any malware that + could be used to infect other computers may be removed from our service at our discretion.

+

Do you keep logs of uploaded files?

+ <% if (LOG_IP) { %> +

A database of the current active files are kept which includes the name, hash and IP of the file and time of upload, + this data is deleted when the file expires.

+ <% } else { %> +

A database of the current active files are kept which includes the name and hash of the file and time of upload, + this data is deleted when the file expires.

+ <% } %> +

Downloads and visits are not tracked or logged in respect for your privacy.

+

Can you remove my copyrighted file?

+

+ Please submit your copyright takedown notice to + <%= abuseContact %> + . We will + handle your notice within <%= expireTime %> and disable access to the infringing file after receiving a notice + compliant with the Copyright Act. +

+

Can you remove files that are defaming me or otherwise infringing my non-copyright rights?

+

+ <%= siteName %> respects takedowns for other files when accompanied with a certified <%= ServerCountryLocation %> court order. If + you are unable to obtain the order, a preliminary injuction or court order is typically also sufficient. + Please forward the notice to + <%= abuseContact %> + . +

+

Can you remove illegal files?

+

Please contact the appropriate law enforcement agency if you notice illegal files hosted on <%= siteName %>. We + have not been trained or qualified to investigate and fight crimes and enforce the law, so it's not + appropriate to send accusations of illegal activity to us.

+

+ You must contact the appropriate law enforcement office. They may then contact us if appropriate. + If you are an law enforcement official and you need our assistance, please contact + <%= abuseContact %> + . If you are a law enforcement official from another + country, we may voluntarily cooperate if the crime you are investigating would also be illegal in + <%= ServerCountryLocation %>. +

+

I have a question...

+ + Send an email to + <%= infoContact %> + . + +
+
+<%- include('./templates/partials/footer.ejs'); -%> \ No newline at end of file diff --git a/templates/faq.swig b/templates/faq.swig deleted file mode 100644 index 594d638..0000000 --- a/templates/faq.swig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "layout.swig" %} - -{% block title %}FAQ{% endblock %} -{% block body %} -
-
-

FAQ

-
-
-

What is {{siteName}}?

-

{{siteName}} is a simple to use free file hosting service. It lets you share your photos, documents, music, videos and more with others online for 24 hours.

-

What files are allowed?

-

{{siteName}} welcomes uploading all files, as long as the file is legal in {{ServerCountryLocation}} and you have the legal right to publish the file on our service.

-

As an exception to this policy to prevent abuse, we do not allow malware on our service. Any malware that could be used to infect other computers may be removed from our service at our discretion.

-

Can you remove my copyrighted file?

-

Please submit your copyright takedown notice to {{abuseContact}}. We will handle your notice within 24 hours and disable access to the infringing file after receiving a notice compliant with the Copyright Act 1968.

-

Can you remove files that are defaming me or otherwise infringing my non-copyright rights?

-

{{siteName}} respects takedowns for other files when accompanied with a certified {{ServerCountryLocation}} court order. If you are unable to obtain the order, a preliminary injuction or court order is typically also sufficient. Please forward the notice to {{abuseContact}}.

-

Can you remove illegal files?

-

Please contact the appropriate law enforcement agency if you notice illegal files hosted on {{siteName}}. We have not been trained or qualified to investigate and fight crimes and enforce the law, so it's not appropriate to send accusations of illegal activity to us. You must contact the appropriate law enforcement office. They may then contact us if appropriate.

-

If you are an {{ServerCountryLocation}}law enforcement official and you need our assistance, please contact {{abuseContact}}. If you are a law enforcement official from another country, we may voluntarily cooperate if the crime you are investigating would also be illegal in {{ServerCountryLocation}}.

-

I have a question...

-

Send us an email at {{infoContact}} and let's talk!

-
-
-{% include "nav.swig" %} -{% endblock %} \ No newline at end of file diff --git a/templates/index.ejs b/templates/index.ejs new file mode 100644 index 0000000..ae7f6ff --- /dev/null +++ b/templates/index.ejs @@ -0,0 +1,15 @@ +<%- include('./templates/partials/header.ejs'); -%> +
+
+ <%- include('./templates/partials/lead.ejs'); -%> + <%- include('./templates/partials/upload_form.ejs'); -%> +
+ + <% if (malwareBanner) { %> + <%- include('./templates/partials/malware_banner.ejs'); -%> + <% } %> + + <% if (donationBanner) { %> + <%- include('./templates/partials/donation_banner.ejs'); -%> + <% } %> +<%- include('./templates/partials/footer.ejs'); -%> \ No newline at end of file diff --git a/templates/index.swig b/templates/index.swig deleted file mode 100644 index b997e0e..0000000 --- a/templates/index.swig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "layout_index.swig" %} - -{% block body %} -
-

{{siteName}}~

-

Max upload size is {{max_upload_size}} MiB & files expire after 24H, read the FAQ

- {% include "upload_form.swig" %} -
-{% include "banners.swig" %} -{% include "nav.swig" %} -{% endblock %} diff --git a/templates/layout.swig b/templates/layout.swig deleted file mode 100644 index bb8fb0d..0000000 --- a/templates/layout.swig +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - {{siteName}} · {% block title %}Kawaii Temporary File Hosting{% endblock %} - - - - -
- {% block body %}What the fuck are you doing here, baka?{% endblock %} -
- - diff --git a/templates/layout_index.swig b/templates/layout_index.swig deleted file mode 100644 index 07fceb6..0000000 --- a/templates/layout_index.swig +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - {{siteName}} · {% block title %}Kawaii Temporary File Hosting{% endblock %} - - - - - -
- {% block body %}What the fuck are you doing here, baka?{% endblock %} -
- - diff --git a/templates/nav.swig b/templates/nav.swig deleted file mode 100644 index 9c0e44b..0000000 --- a/templates/nav.swig +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/templates/partials/donation_banner.ejs b/templates/partials/donation_banner.ejs new file mode 100644 index 0000000..eae66fa --- /dev/null +++ b/templates/partials/donation_banner.ejs @@ -0,0 +1,36 @@ +

+ <%= siteName %> is free to use, but our hosting costs are not + + — donations are what keep <%= siteName %> alive, free from ads and fast. + + +

\ No newline at end of file diff --git a/templates/partials/footer.ejs b/templates/partials/footer.ejs new file mode 100644 index 0000000..e2c13e2 --- /dev/null +++ b/templates/partials/footer.ejs @@ -0,0 +1,3 @@ +<%- include('./templates/partials/nav.ejs'); -%> +
+ \ No newline at end of file diff --git a/templates/partials/header.ejs b/templates/partials/header.ejs new file mode 100644 index 0000000..6d88056 --- /dev/null +++ b/templates/partials/header.ejs @@ -0,0 +1,9 @@ + + + + +<%= siteName %> · <%= subTitle %> + + + + \ No newline at end of file diff --git a/templates/partials/lead.ejs b/templates/partials/lead.ejs new file mode 100644 index 0000000..3dc236c --- /dev/null +++ b/templates/partials/lead.ejs @@ -0,0 +1,7 @@ +

<%= siteName %>~

+

+ Max upload size is <%= max_upload_size %> MiB & files expire after <%= expireTime %>, read the + + FAQ + +

\ No newline at end of file diff --git a/templates/partials/malware_banner.ejs b/templates/partials/malware_banner.ejs new file mode 100644 index 0000000..5bee7e0 --- /dev/null +++ b/templates/partials/malware_banner.ejs @@ -0,0 +1,4 @@ +

+ Malware is not allowed + — files identified as malware will be removed without further notice. +

\ No newline at end of file diff --git a/templates/partials/nav.ejs b/templates/partials/nav.ejs new file mode 100644 index 0000000..12a2c4f --- /dev/null +++ b/templates/partials/nav.ejs @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/templates/partials/upload_form.ejs b/templates/partials/upload_form.ejs new file mode 100644 index 0000000..129896c --- /dev/null +++ b/templates/partials/upload_form.ejs @@ -0,0 +1,6 @@ +
+ + + +
+ \ No newline at end of file diff --git a/templates/tools.ejs b/templates/tools.ejs new file mode 100644 index 0000000..bb3bc90 --- /dev/null +++ b/templates/tools.ejs @@ -0,0 +1,59 @@ +<%- include('./templates/partials/header.ejs'); -%> +
+
+

<%= siteName %> Tools

+
+
+
+

+ To upload using curl or make a tool you can post using: +
+ curl -i -F files[]=@yourfile.jpeg <%= siteUrl %>/upload.php (JSON Response) +

+

To upload using curl or make a tool you can post using: curl -i -F 'files[]=@yourfile.jpeg' <%= siteUrl %>/upload.php (JSON Response)

+
+

ShareX

+
+
Download
+
+ https://github.com/ShareX/ShareX +
+
+
+

uguuecho

+
+
Download
+
+ https://git.teknik.io/nekunekus/uguucho +
+
+
+

pomfload

+
+
Download
+
+ https://github.com/ewhal/pomfload +
+
+
+

Pomfshare

+
+
Download
+
+ https://github.com/Nyubis/Pomfshare +
+
+
+
+

Pomf Rehost

+
+
Download
+
+ + https://git.fuwafuwa.moe/lesderid/pomf-rehost + +
+
+
+
+<%- include('./templates/partials/footer.ejs'); -%> \ No newline at end of file diff --git a/templates/tools.swig b/templates/tools.swig deleted file mode 100644 index 8ba0fb9..0000000 --- a/templates/tools.swig +++ /dev/null @@ -1,64 +0,0 @@ -{% extends "layout.swig" %} - -{% block title %}Tools{% endblock %} -{% block body %} - -

Uguu Tools

-
-
-

- To upload using curl or make a tool you can post using: -
- curl -i -F files[]=@yourfile.jpeg {{siteUrl}}/upload.php (JSON Response) -

- -

{{ToolsDesc}}

- -
-

ShareX

-
-
Download
-
https://getsharex.com
-
Source
-
https://github.com/ShareX/ShareX
-
-
- -

uguuecho

-
-
Download
-
https://git.teknik.io/nekunekus/uguucho
-
-
- -

pomfload

-
-
Download
-
https://github.com/ewhal/pomfload
-
- - -
-

Pomfshare

- -
-
Download
-
https://github.com/Nyubis/Pomfshare
-
-
- -
-

Pomf Rehost

-
-
Download
-
- - https://git.fuwafuwa.moe/lesderid/pomf-rehost - -
-
-
- -{% include "nav.swig" %} -{% endblock %} diff --git a/templates/upload_form.swig b/templates/upload_form.swig deleted file mode 100644 index 5e8832f..0000000 --- a/templates/upload_form.swig +++ /dev/null @@ -1,6 +0,0 @@ -
- - - -
-