From adfc08b573087fb8c4c075840b9f3237d7fd68b9 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 1 Oct 2018 14:42:46 +0200 Subject: [PATCH 1/5] doc --- htdocs/application/config/stikked.php.dist | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/application/config/stikked.php.dist b/htdocs/application/config/stikked.php.dist index 4725dc4..f7bb3e5 100644 --- a/htdocs/application/config/stikked.php.dist +++ b/htdocs/application/config/stikked.php.dist @@ -30,10 +30,8 @@ $config['db_password'] = 'stikked'; // If you are using sqlite: // uncomment the configuration lines below. -//$config['db_database'] = 'db/stikked'; +//$config['db_database'] = 'db/stikked'; // you need to create a directory "db" and give the webserver write access. sqlite needs a writable folder to work properly! //$config['db_driver'] = 'sqlite'; -// you need to create a directory "db" and give the webserver write access. -// sqlite needs a writable folder to work properly! /** * Table prefix From 52b40263186799ef1b731e45fa4b992b2e1890d5 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 1 Oct 2018 14:49:46 +0200 Subject: [PATCH 2/5] lets keep a fixed language. makes live easier. --- htdocs/application/config/language.php | 132 --------------------- htdocs/application/config/stikked.php.dist | 5 +- 2 files changed, 4 insertions(+), 133 deletions(-) delete mode 100644 htdocs/application/config/language.php diff --git a/htdocs/application/config/language.php b/htdocs/application/config/language.php deleted file mode 100644 index cb4cd62..0000000 --- a/htdocs/application/config/language.php +++ /dev/null @@ -1,132 +0,0 @@ - array( - 'name' => 'English', - 'folder' => 'english', - 'direction' => 'ltr', - 'codes' => array('en', 'english', 'en-US'), - 'ckeditor' => NULL - ), - 'de' => array( - 'name' => 'Deutsch', - 'folder' => 'german', - 'direction' => 'ltr', - 'codes' => array('de', 'german', 'de'), - 'ckeditor' => NULL - ), - 'sw' => array( - 'name' => 'Schweizerdeutsch', - 'folder' => 'swissgerman', - 'direction' => 'ltr', - 'codes' => array('sw', 'swissgerman', 'de-CH'), - 'ckeditor' => NULL - ), - 'es' => array( - 'name' => 'Español', - 'folder' => 'spanish', - 'direction' => 'ltr', - 'codes' => array('esp', 'spanish', 'es-ES'), - 'ckeditor' => NULL - ), - 'no' => array( - 'name' => 'norsk', - 'folder' => 'norwegian', - 'direction' => 'ltr', - 'codes' => array('no', 'norwegian', 'no-NO'), - 'ckeditor' => NULL - ), - 'da' => array( - 'name' => 'dansk', - 'folder' => 'danish', - 'direction' => 'ltr', - 'codes' => array('da', 'danish', 'da-DA'), - 'ckeditor' => NULL - ), - 'pt' => array( - 'name' => 'Português de Portugal', - 'folder' => 'portuguese', - 'direction' => 'ltr', - 'codes' => array('ptb', 'portuguese-portugal', 'pt-PT'), - 'ckeditor' => 'pt-pt' - ), - 'tr' => array( - 'name' => 'Türkçe', - 'folder' => 'turkish', - 'direction' => 'ltr', - 'codes' => array('tr', 'turkish', 'tr-TR'), - 'ckeditor' => NULL - ), - 'fr' => array( - 'name' => 'Français', - 'folder' => 'french', - 'direction' => 'ltr', - 'codes' => array('fra', 'french', 'fr-FR'), - 'ckeditor' => NULL - ), - 'jp' => array( - 'name' => '日本語', - 'folder' => 'japanese', - 'direction' => 'ltr', - 'codes' => array('jp', 'japanese', 'jp-JP'), - 'ckeditor' => NULL - ), - 'pl' => array( - 'name' => 'Polski', - 'folder' => 'polish', - 'direction' => 'ltr', - 'codes' => array('plk', 'polish', 'pl-PL'), - 'ckeditor' => NULL - ), - 'ru' => array( - 'name' => 'Русский', - 'folder' => 'russian', - 'direction' => 'ltr', - 'codes' => array('rus', 'russian', 'ru-RU'), - 'ckeditor' => NULL - ), - 'cn' => array( - 'name' => '简体中文', - 'folder' => 'chinese-simplified', - 'direction' => 'ltr', - 'codes' => array('chs', 'chinese-simplified', 'zh-CN'), - 'ckeditor' => NULL - ), - 'zh' => array( - 'name' => '繁體中文', - 'folder' => 'chinese-traditional', - 'direction' => 'ltr', - 'codes' => array('cht', 'chinese-traditional', 'zh-TW'), - 'ckeditor' => NULL - ), - 'id' => array( - 'name' => 'Indonesia', - 'folder' => 'indonesia', - 'direction' => 'ltr', - 'codes' => array('id', 'indonesia', 'id-ID'), - 'ckeditor' => NULL - ), -); - -/* - * Default Language - * - * If no language is specified, which one to use? - * Currently: english (en) | german (de) | swissgerman (sw) - * spanish (es) | norwegian (no) | portuguese (pt) - * turkish (tr) | french (fr) | japanese (jp) - * polish (pl) | russian (ru) | bahasa indonesia (id) - * chinese-simplified (cn) | chinese-traditional (zh) - * -*/ -$config['language'] = 'en'; - diff --git a/htdocs/application/config/stikked.php.dist b/htdocs/application/config/stikked.php.dist index f7bb3e5..f535332 100644 --- a/htdocs/application/config/stikked.php.dist +++ b/htdocs/application/config/stikked.php.dist @@ -76,9 +76,12 @@ $config['js_editor'] = ''; // codemirror, ace, '' /** * Language * - * New Language settings in application/config/language.php + * Which language to use + * Translate Stikked to your own language, see htdocs/application/language files + * Currently: english, german, swissgerman, spanish, norwegian, danish, portuguese, turkish, french, japanese, polish, russian, chinese-simplified, chinese-traditional, indonesia * */ +$config['language'] = 'english'; /** * Combine JS & CSS files (recommended) From 189d10b23663647b84540c1fa45c2c290e7007e6 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Oct 2018 11:20:42 +0200 Subject: [PATCH 3/5] authors for 0.13.0 --- AUTHORS.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/AUTHORS.md b/AUTHORS.md index 916ca2b..00634b8 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -55,8 +55,15 @@ * Shen-Ta Hsiea https://github.com/ibmibmibm (updated traditional chinese translation) * haliphax https://github.com/haliphax (Fixed cssmin library) * YangJun https://github.com/yangjun1994 (Fix language.php small mistakes of chinese-simplified) -* Justin Massey https://github.com/Th3R3p0 (LDAP improvements, xss security fixes, Dockerfiles) +* Justin Massey https://github.com/Th3R3p0 (LDAP improvements, xss security fixes, Dockerfiles, captcha-issue fixed) * Nilpferd (Shorturl is now shown for 'burn' pastes after creation) * Pascal Briehl (add support for polr url shortener) * Simon Sickle https://github.com/SimonSickle (Protect the langs api call with the apiKey) * John Walker https://github.com/techjwalker (some minor additions) +* Deni https://github.com/b4d (Letsencrypt support) +* Rob Thomas https://github.com/xrobau (Docker-setup improvements, Spamadmin fixes) +* Razvan Rosca https://github.com/Razva (Fix Geshi for PHP7.2+) +* Tim White https://github.com/timwhite (Fix docker bug when setting DB_PASSWORD) +* Vasya Pupkin https://github.com/shadowlmd (Lighttpd improvements) +* John Poole https://github.com/jlpoolen (investigating Log.php path issue) +* CompuRoot https://github.com/CompuRoot (Better burn on read page) From be8dc851bc71b383e290bbbbe97ea4eb14b1c640 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Oct 2018 11:23:44 +0200 Subject: [PATCH 4/5] more honorable mention --- AUTHORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.md b/AUTHORS.md index 00634b8..9cd9c88 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,4 +1,4 @@ -* Ben McRedmond https://github.com/benofsky (Original author; left stikked inactive) +* Ben McRedmond https://github.com/benofsky (Original author of Stikked) * Claude Hohl https://github.com/claudehohl (Fixed some bugs, added some features; revived the project) * Daniel https://github.com/lightswitch05 (Added LDAP authentication) * Jens Willmer https://github.com/jwillmer (Bugfixing) From 442d206186ccdaac2c001b21851c7b4726a15b4c Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Oct 2018 11:40:39 +0200 Subject: [PATCH 5/5] version 0.13.0 --- README.md | 33 ++++++++++++++++++++++++++-- htdocs/application/config/config.php | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4027c34..d7f8bfc 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,9 @@ Here are some features: Try it out ---------- -http://paste.scratchbook.ch/ +https://paste.scratchbook.ch/ -See an encrypted paste: http://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073 +See an encrypted paste: https://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073 Prerequisites @@ -81,6 +81,35 @@ In the folder doc/, you will find: Changelog --------- +### Version 0.13.0: + +* Updated CodeIgniter to 3.1.9 +* Various improvements in the Docker setup +* An automated Docker-build: https://hub.docker.com/r/claudehohl/stikked/ +* Reverted the "intelligent language switcher" back to a fixed language setting because of too many side-effects +* Fixed encodings and decryption functionality in various themes +* Various bugfixes and improvements + +#### Upgrade instructions + +Copy your htdocs/application/stikked.php config file away. Upload the new version. Copy it back. + +The language setting in config/stikked.php is back, you can set a fixed language: + +```php +$config['language'] = 'english'; +``` + +New config option: Content expiration. +Sets the "Expires:"-header to make use of browser-caching +Format: http://php.net/manual/en/function.strtotime.php +Examples: '+10 seconds', '+1 year', '-1 week' +Browser-caching is disabled when this option is not set. + +```php +$config['content_expiration'] = '+1 week'; +``` + ### Version 0.12.0: * Updates ensuring the compatibility with PHP7: diff --git a/htdocs/application/config/config.php b/htdocs/application/config/config.php index e2e1ab6..7d2b164 100644 --- a/htdocs/application/config/config.php +++ b/htdocs/application/config/config.php @@ -24,7 +24,7 @@ $config['base_url'] = ''; | So that we can track your version. | */ -$config['stikked_version'] = '0.12.0'; +$config['stikked_version'] = '0.13.0'; /* |--------------------------------------------------------------------------