Skip to content

Add config file -- includes a lot of config options! #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ulikoehler wants to merge 25 commits into
base: master
Choose a base branch
from
+164 −49
Open

Add config file -- includes a lot of config options! #63

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8a268f3
Add config.inc.php to dynamically generate expire times
ulikoehler Oct 8, 2013
937aa35
Fix syntax error
ulikoehler Oct 8, 2013
a69f2b2
Fix tpl variables
ulikoehler Oct 8, 2013
b30488b
Fix tpl errors
ulikoehler Oct 8, 2013
9f95b84
Fix never-expiration
ulikoehler Oct 8, 2013
d9ff124
Fix multiline comment style
ulikoehler Oct 8, 2013
aa59963
Added config option to enable or disable burn-after-reading checkbox …
ulikoehler Oct 8, 2013
5cf28cd
Fix burn-after-reading checkbox default selection
ulikoehler Oct 8, 2013
c19e5d2
Fix disabling of open discussion checkbox if burn-after-reading is di…
ulikoehler Oct 8, 2013
04f96b0
Added time between posts option
ulikoehler Oct 9, 2013
2cc138a
Fix variable scope
ulikoehler Oct 9, 2013
47ab138
Fix time between posts error message
ulikoehler Oct 9, 2013
8f72136
Fix time between posts error message
ulikoehler Oct 9, 2013
333eaed
Fix bracket indentation
ulikoehler Oct 9, 2013
6d9cb8e
Allow rate-limiting disable
ulikoehler Oct 9, 2013
5513eee
Implemented configurable maximum post size
ulikoehler Oct 9, 2013
38d0f83
Fix error message if maximum size is exceeded
ulikoehler Oct 9, 2013
6371488
Implemented configurable vizhash
ulikoehler Oct 10, 2013
77d188e
Fix vizhash in JS
ulikoehler Oct 10, 2013
f02d062
Added config option to disable discussion
ulikoehler Oct 10, 2013
439f80f
Made syntax highlighting optional
ulikoehler Oct 10, 2013
ed9991f
Disable syntax highlighting btn if disabled in cfg
ulikoehler Oct 10, 2013
d182ef3
Remove merge leftover
ulikoehler Oct 10, 2013
1b52926
Don't load highlighting CSS/JS if disabled
ulikoehler Oct 10, 2013
3e5c8b9
Fix not declared global, thanks @nitmir
ulikoehler Oct 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix error message if maximum size is exceeded
  • Loading branch information
@ulikoehler
ulikoehler committed Oct 9, 2013
commit 38d0f839e55c5c4cc312a13fd3db584d06ca8a11
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function deletePaste($pasteid)
$data = $_POST['data'];
$maxPostSize = $cfg["maxPostSize"];
if (strlen($data) > $maxPostSize)
{ echo json_encode(array('status'=>1,'message'=>'Paste is limited to 2 Mb of encrypted data.')); exit; }
{ echo json_encode(array('status'=>1,'message'=>"Paste is limited to $maxPostSize bytes of encrypted data.")); exit; }

// Make sure format is correct.
if (!validSJCL($data))
Expand Down