piratebox-mirror/PirateBoxScripts_Webserver
2
1
Fork 0
mirror of https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git synced 2023-12-14 07:22:58 +01:00
Code Issues Releases Wiki Activity
603 commits 21 branches 34 tags 3.3 MiB
Commit graph

389 commits

Author SHA1 Message Date
nightshade 4ff01b4ef6 add diskgen env variable 2015-09-14 18:02:24 -06:00
nightshade c5c5d1cafd add diskusage autogen 
This adds the autogeneration of the diskusage.html file.
 2015-09-14 17:57:45 -06:00
nightshade 8b104e4831 Add Generate HTML File 2015-09-14 17:46:32 -06:00
nightshade bdbf25cffe move diskusage.py 2015-09-14 17:43:05 -06:00
nightshade 001a641309 Add Diskusage to Piratebox 2015-09-14 17:31:00 -06:00
Matthias Strubel 6679b04cdb Merge branch 'hotfix-1.0.5' into development 
[New] Improved styling for droopy iframe.  (not applied)
    [New] Timesave script service file to run set the time during startup.
    [Fix] Droopy call in init.d/piratebox failed to use the correct port.
    [Fix] Timesave script behaviour fixed on full Linux systems. OpenWrt's date format is now customized during build & piratebox.conf .
 2015-09-13 11:34:15 +02:00
Matthias Strubel 66b840714e Improved handling of timesave script on normal Linux system. 
* Delivered the systemd file for restoring the file during boot.
  * Moved date format to piratebox.conf
  * Customize the date format for OpenWrt during build of
    piratebox_ws-img.tar.gz file, like other configuration files
 2015-08-23 11:07:04 +02:00
Matthias Strubel d266d746cb Better styling for droopy upload frame 2015-08-23 09:55:49 +02:00
Matthias Strubel c28860d5f8 Removes an unwanted linebreak in the droopy startup 2015-08-22 23:05:30 +02:00
Matthias Strubel 4ba0671cd3 Merge branch 'hotfix-1.0.4' into development 
Implementing the changes from hotfix to development branch.

Resolved  Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/board-autoconf.sh
	piratebox/piratebox/bin/droopy (now 1.0.4 version)
	piratebox/piratebox/bin/shoutbox_stuff.sh
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/www/generate_204  (stays PHP)
	piratebox/piratebox/www/index.html
 2015-08-18 20:10:15 +02:00
Matthias Strubel b5f794e877 Fixes not working Python Script for generating 204 
Closes #115
 2015-08-06 22:09:08 +02:00
Matthias Strubel e5470ccd1f Cleanup unnessecary spacer files 2015-08-06 21:35:22 +02:00
Matthias Strubel 936f26cf17 Display Station count again. 
Not the best solution, but worth for the hotfix.

Fixes #121
 2015-08-06 21:31:02 +02:00
Matthias Strubel 7333b8a933 Set the Timestamp of the shoutbox generated file with a delay. 
The problem is, that the piratebox starts before resetting the
RTC to a saved timestamp. That means the shoubox-gen file
is from the year 1970. That breaks the refresh in the browser.

With the delay, we hopefully get a better timestamp and fix
that issue

Fixes #120
 2015-08-06 21:30:18 +02:00
Matthias Strubel 4f26929bbb Remove spacer index.htm and generate first page 
kareha.pl doesn't overwrite the file for itself :(

In addition, we use .htm over .html , that tricks kareha and lighttpd
in this problem.
 2015-08-06 19:53:19 +02:00
Matthias Strubel c19b591c6a Generate the HTTP Resonse with python for 1.0.x PirateBox too 
Will avoid Captive Portal message from Android.
Especially some devices tend to leave the PirateBox network,
because they don't receive a 204 from their specific URL.

Closes #115
 2015-08-04 20:34:53 +02:00
Matthias Strubel 8c099f2446 Generate default page for forum link 
This patch avoids a confusing directory listing. This commits copies
over a simple default index.html that provides links to the
kareha.pl and back to the main page.

Does not copy, if the board is already installed.

Closes  #117
 2015-08-04 20:06:11 +02:00
Matthias Strubel 3ab58c5657 Disabling exchange_www.sh - it helped nobody, only breakes stuff. 2015-08-03 20:48:50 +02:00
Matthias Strubel 70823c1e4f This commit aligns the Droopy code back to the latest versions. 
The PirateBox modifications can be found in:

   https://github.com/PirateBox-Dev/Droopy

It contains the following features from the old PirateBox version
of Droopy:

  - Secured Subdirectory (new directories will fail in styling)
  - Make it possible to launch Droopy on boot time
  - Prevent uploading index.ht* files

New features / bugfixes with the new Droopy version:

  - Multiple upload
  - Fixed language encoding
  - In general user/password setting (non configurable via
    PirateBox)

The following features were not ported to the new version:

  - Include hostname to templates (not needed anymore)
  - Field including iframe for shoutbox (not needed anymore)
  - iOS fake answer code, which was included in lighttpd since
    Piratebox 0.5.x

Known issues:

  - New folders via protected subdirectory feature are not
    created with HEADER.TXT and README.txt (styling will not work).
    That issue is also on 1.0.0-1.0.3 versions
  - HEADER.TXT and README.txt can be uploaded. It will not be
    overwritten, but break styling if the files aren't available.
 2015-07-30 21:54:43 +02:00
Jess Stubenbord 2d79bdf8c0 Reformatted about & gave body an id 
Shifted the about section in a div so that it is able to be styled as a
card if wanted. Gave the body an id so that individual pages can be
styled differently using a single stylesheet.
 2015-07-28 15:00:16 +02:00
Jess Stubenbord 68023815b2 Reformatted welcome card 
I wrapped the welcome message in another div so that this card matches
the others in hierarchy (for future styling purposes)
 2015-07-28 02:45:54 +02:00
Matthias Strubel 2da5a68773 Improve cache handling of redirect.html and it schema file 
Thanks to herr-gabriel

Closed #114
Closed #116
 2015-07-27 19:42:42 +02:00
Matthias Strubel c701d79b60 Merge branch 'patch-2' of https://github.com/herr-gabriel/PirateBoxScripts_Webserver into herr-gabriel-patch-1 2015-07-27 19:40:37 +02:00
Matthias Strubel 44c9071215 Fixes a typo , finalizes Backport #118 2015-07-27 19:26:36 +02:00
Matthias Strubel 804627901e Feature: board-autoconf.sh for OpenWrt available 
Made the board un-useable, if it is not setup.

 Conflicts:
	CHANGELOG
 2015-07-27 19:24:55 +02:00
Nicola Lamacchia fdb686e9ea Add interactive imageboard system configuration 2015-07-27 19:06:26 +02:00
Gabriel Shahzad 67c1ad0d9a Added redirect fix 2015-07-26 12:38:07 +02:00
Gabriel Shahzad d9fa73bbd5 Fixed accidental redirects 
Sometimes a user would still be redirected to a cached piratebox.lan site after disconnecting from the piratebox wifi. This has something to do with how different browsers interact with the cache-control meta tag. Adding "pragma" and "expires" tags as well as additional "cache-control" contents fixes that.
 2015-07-26 11:24:38 +02:00
Tilmann Singer 3006508e3b Fake a full internet connection for android devices (fix) 
The previous commit included the wrong php file, it needs to be without
file extension.
 2015-07-19 17:29:34 +02:00
Tilmann Singer dfb4e57f70 Fake a full internet connection for android devices 
This uses a rather ugly hack to enable serving an extension-less php
file, but I couldn't find a better way to do this in the absence of
mod_rewrite.

Tested manually that it works on two different android devices (5.1.1).

Closes #59
 2015-07-19 16:32:03 +02:00
Matthias Strubel 5d6f724bac Merge branch 'master' of https://github.com/deavmi/PirateBoxScripts_Webserver into deavmi-master 2015-04-07 18:54:23 +02:00
Tristan B. Kildaire 118c0067b3 Improved more stuff 2015-04-07 18:18:49 +02:00
Matthias Strubel 88a7938b6a Upload Handler fix 2015-03-11 10:30:10 +01:00
Matthias Strubel 5e98cacd5c Fixes a typo 2015-03-09 19:04:32 +01:00
Matthias Strubel 00e220ae2a Fixes in hosts generation 2015-02-09 15:26:59 +01:00
Matthias Strubel 40c4faae33 fixes and config files for webdev 2015-02-04 10:00:27 +01:00
Matthias Strubel b88643ed2c Run even without environment vars 2015-02-04 08:09:44 +01:00
Matthias Strubel 9e44776e25 moved CSS 2015-01-29 15:38:04 +01:00
Matthias Strubel 391c2e3647 moved all images to /img folder 2015-01-29 15:34:53 +01:00
Matthias Strubel 761e0bf54a Fixes upload-adcanced javascript 2015-01-28 16:09:39 +01:00
Matthias Strubel 8d8e7bfac4 Fixes file-url 2015-01-28 16:07:20 +01:00
Matthias Strubel 389362795b Merge branch 'development' of https://github.com/Liblor/PirateBoxScripts_Webserver into Liblor-development 2015-01-28 12:40:52 +01:00
Matthias Strubel 15d90377cb Merge remote-tracking branch 'origin/irc_server' into development 2015-01-28 12:40:18 +01:00
Matthias Strubel 79ec7555c5 Droopy disabled per default, because there is now a new upload method 2015-01-28 12:37:47 +01:00
Matthias Strubel e895986d91 Merge remote-tracking branch 'remotes/origin/irc_server' into development 
Conflicts:
	Makefile
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
 2015-01-28 12:37:02 +01:00
Matthias Strubel 61f1dca1e0 first bigger testing version 2015-01-28 12:32:50 +01:00
Matthias Strubel 3a920800b2 new envariable for the upload script 2015-01-28 11:18:19 +01:00
daviddarts 1b1afa556b Update motd.txt 
Edited and updated the MOTD.
 2015-01-16 20:54:42 +04:00
Matthias Strubel 67a43ab78f updated page url 2015-01-16 13:25:11 +01:00
Loris Reiff 4115305f56 [Fix] Shoutbox 
Here is a version without the format function (See #97).
Unfortunally I couldn't test it with openwrt, because I have a problem with my mr3020 -.-
But there shouldn't be a problem with this version.
 2015-01-10 14:16:48 +01:00
Loris Reiff f180297fb6 Solves merge conflicts 
This solves the merge conflicts in the development branch --> #95
 2014-12-27 15:10:23 +01:00
Matthias Strubel d5f9ce8d60 Merge branch 'hotfix-1.0.2' into development 
Conflicts:
	BuildScripts/RPi_motd.txt
	CHANGELOG
	Makefile
	README.md
	piratebox/piratebox/python_lib/broadcast.py
	piratebox/piratebox/python_lib/discover.py
	piratebox/piratebox/python_lib/messages.py
	piratebox/piratebox/python_lib/psogen.py
	piratebox/piratebox/www/cgi-bin/psowrte.py
 2014-12-26 09:56:47 +01:00
Loris Reiff bc1d1ed23f PEP8 
See #83
 2014-12-11 17:14:22 +01:00
risca 602ec2492e Bugfix: the scritp distribute_file_into_directory is now working even when the path contain white spaces. 2014-12-10 00:42:44 +01:00
Matthias Strubel 9e44802ba4 Merge pull request #92 from Sjd-Risca/installscript 
Install script corrections
 2014-12-08 22:23:55 +01:00
risca 46b6500ff6 typo in bash test 2014-12-08 02:38:34 +01:00
risca a8dcaf7f6b typo in bash test 2014-12-08 02:36:24 +01:00
risca 00646cbf96 typo error: the comparison of string in bash require only on "=" 2014-12-08 02:19:53 +01:00
risca 6d534fda7f Dash compatibility issue (many system use dash as default shell) 2014-12-08 02:09:45 +01:00
risca 8fe529c58c typo error: the default parameter of line 31 (src_file) should be a string, not a variable! 2014-12-08 01:54:10 +01:00
risca 3ae5c4d016 Now the file path of the install.sh script is absolute, therefore it will be possible to launch the script also from other path like: 
/bin/bash /home/myuser/PirateBoxScripts_Webserver-master/piratebox/install.sh
This also corrects a wrong path on line 47 that was causing the install script to fail.
 2014-12-08 01:15:49 +01:00
risca 530b050964 Now the path is absolute, therefore the install.sh script could be launched by any path, eg. the following will work as well: 
/bin/bash/ /home/myuser/PirateBoxScripts_Webserver-master/piratebox/install.sh
Also line 36 and line 47 where pointing to incompatible launching path (the first was in PirateBoxScripts_Webserver-master/piratebox, the second just in PirateBoxScripts_Webserver-master/).
 2014-12-08 01:13:57 +01:00
Loris Reiff 61e253b2f6 [FIX] Escaping of color 
This fixes a XSS-Bug.
Additionally I standardized some indentations (4 spaces).

Cheers :)
Liblor
 2014-11-21 19:14:39 +01:00
Loris Reiff e62a50e3c8 Unified HTML-character-escaping 
It used to escape the data twice, once in psowrte and once in psogen.
Now, the whole escaping for the ShoutBox is now done in psogen.py

Plus: We forgot to escape color, it's also fixed.

Conflicts:
	piratebox/piratebox/python_lib/psogen.py
	piratebox/piratebox/www/cgi-bin/psowrte.py
 2014-11-21 19:02:26 +01:00
Loris Reiff 7dcd8033c7 PEP8 
See #83
 2014-11-17 19:22:49 +01:00
Loris Reiff 7219036985 PEP8 
PEP8 Coding style for message.py
 2014-11-11 22:54:29 +01:00
Loris Reiff ea24f6d7a2 Merge branch 'indentation_fix' into hotfix-1.0.2 2014-11-10 22:30:53 +01:00
Loris Reiff f347b96742 [FIX] Consistent use of indentation 
Consistent use of 4 spaces for indentation.
 2014-11-10 18:32:32 +01:00
Matthias Strubel 5e27f1b0b1 Feature: board-autoconf.sh for OpenWrt available 
Made the board un-useable, if it is not setup.
 2014-11-05 18:53:56 +01:00
Nicola Lamacchia 0695475c9e Add interactive imageboard system configuration 2014-11-05 11:10:36 +01:00
Nicola Lamacchia 91b5e62ecb Fix variable name typo in bin/piratebox_setup_wlan.sh 2014-11-05 11:09:12 +01:00
Nicola Lamacchia 1a1a3b6826 Fix missing quotes in init.d/piratebox_alt 2014-11-05 11:08:51 +01:00
Loris Reiff d2ab04dce7 Unified HTML-character-escaping 
It used to escape the data twice, once in psowrte and once in psogen.
Now, the whole escaping for the ShoutBox is now done in psogen.py
 2014-11-01 17:13:04 +01:00
Matthias Strubel b53ca9e774 move "probe" function to the top of the script, that it can be found in any case 2014-10-29 21:29:22 +01:00
Matthias Strubel 157e13f925 Corrected wrong permission setup like commented in 3021d2cdd6 2014-10-17 10:00:29 +02:00
Matthias Strubel abebd4234d Merge branch 'hotfix-1.0.1' into development 
Conflicts:
	README.md
	piratebox/piratebox/www/index.html
 2014-10-10 10:38:36 +02:00
Matthias Strubel 5ac0714525 Fixes XSS in forest.py 
Merge branch 'Liblor-hotfix-1.0.2' into hotfix-1.0.1
 2014-10-10 10:31:53 +02:00
Loris Reiff f21d57737d [fix] XSS in forest.py 
The subject string hasn't been escaped, which led to a persistent xss vulnerability.
 2014-10-09 18:06:13 +02:00
Matthias Strubel 31628ff55a Merge branch 'development' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into development 2014-09-05 08:00:40 +02:00
stylesuxx 51d3d86c1b Escape the username to prevent js injection 2014-08-31 19:08:40 +02:00
Gilles Coulais b7b333e83a Add en, fr, de properties files and translations. de translations based o, index.de.html 2014-08-29 14:27:09 +02:00
Gilles Coulais e2e07b040b Update l10n key moved to label instead of input 2014-08-29 14:25:05 +02:00
Gilles Coulais 7b7b4f6d09 Add webl10n library 
Add data-l10n-id keys in index page
 2014-08-29 13:00:16 +02:00
Matthias Strubel d468917a76 Merge branch 'no_RealTimeClock' of https://github.com/WIStudent/PirateBoxScripts_Webserver into WIStudent-no_RealTimeClock 2014-08-11 18:38:58 +02:00
Matthias Strubel b2b53d61d2 included correct pathes for hosts-mesh file and dnsmasq pid 2014-08-11 18:36:26 +02:00
Tobias Trumm 1256c62c38 Try to add a configuration variable 
to enable the use of client timestamps in the chat window. Doesn't work
yet.
 2014-08-04 21:46:17 +02:00
Matthias Strubel a85663e46b Distribute Files for DirectoryListing once upon initialization. 2014-08-01 16:57:58 +02:00
Matthias Strubel 50bd60ab1d Fix relativ link to board on splash page 2014-08-01 16:35:33 +02:00
Tobias Trumm d308a46c32 Use POSIX timestamp. 2014-07-28 04:32:53 +02:00
Tobias Trumm c8986663c8 Get timestamp for Shoutbox from the client/browser 
on systems with no real time clock
 2014-07-28 01:35:27 +02:00
Matthias Strubel 4d09cc7f0c Fix favicon 2014-07-12 16:52:35 +02:00
Matthias Strubel b1382377b9 Fixing coding issues 2014-07-06 19:54:21 +02:00
Matthias Strubel d139c9e3fe Merge branch 'denis-d-patch-1' into development 
- Fix russian translation
 2014-07-03 23:17:03 +02:00
Matthias Strubel 7b068a34c8 Merge branch 'denis-d-patch-1' into hotfix-1.0.1 
- Fix russion translation in droopy
 2014-07-03 23:16:26 +02:00
denis-d c236bcc5bd Update droopy 
Correct Russian translation.
 2014-06-29 20:52:45 +04:00
Matthias Strubel 81871fe7b3 Draft for mapping avahi browse results to a hosts file 2014-06-27 22:01:14 +02:00
Matthias Strubel 96a2d010d7 Merge branch 'hotfix-1.0.1' into development 
Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/distribute_file_into_directory.sh
	piratebox/piratebox/bin/distribute_files.sh
	piratebox/piratebox/conf/piratebox.conf
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/src/HEADER.txt
	piratebox/piratebox/src/README.txt
	piratebox/piratebox/www/index.html
 2014-06-27 17:50:31 +02:00
Matthias Strubel f38666803d Fix for duplicate symlinks 2014-06-27 17:41:10 +02:00
Matthias Strubel e85b1ea0e0 fixed missing then 2014-06-27 17:40:45 +02:00
Matthias Strubel 4b1f6dd4ec Fixed typo in generate config script 2014-06-27 17:39:32 +02:00