issue #2 and copy info updated for 2020

diff --git a/ChangeLog b/ChangeLog
index 5c5d475c992081a9c4d1af79432a1c7c333b948e..cc014f35e77f9a59be1cd3eff7d45a2910a29f15 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ version x.x - Seven Portals (tba)
 
     + Now including update instructions
     + DB export only insipid tables and not the whole DB itself.
+    + #2 Protection if the email-import.php file if it needs to be
+        in a web accessible folder
     + Fixed the search for words. See update instructions how to correct your data
 
 version 2.3 - Guardian of Steel (2019-12-30)

diff --git a/documentation/email-importer.txt b/documentation/email-importer.txt
index f533409cd8c61dc0312e1a0ae6cb8d13c8144a88..1207e05c27439415aa73e06f9f757742022ab069 100644 (file)
--- a/documentation/email-importer.txt
+++ b/documentation/email-importer.txt
@@ -1,18 +1,17 @@
 Insipid has a feature to fetch new links from E-Mails.
 Those E-Mails are read from a configured IMAP mailbox.
 
+# Requirements
 You need to enable the imap/ssl functions within PHP and
 have a IMAP mailbox on a SSL/TLS email server.
 
+# Config
 Set the config variables in the config file.
 Make sure you an individual marker string!
 There is no "security" within this method. Only the special string you can define.
 The new links will be hidden at first. You need to verify them before they are
 visible in your list.
 
-Access the moderation with this link: index.php?p=stats
-After authentication there will be more info and one called Moderation
-
 Here are the important configs:
 
 EMAIL_SERVER => Address of your E-Mail server
@@ -25,10 +24,24 @@ EMAIL_SERVER_PORT_SMTP => The SSL SMTP port for using the report back function.
 EMAIL_REPLY_BACK_VALID => Multiple E-Mails addresses which can be reported back to. RFC822-style comma-separated email addresses
 EMAIL_REPLY_BACK_ADDRESS => The E-Mail address which sends the report mail. Usually the address from which your read the mails
 
+# Moderation
+Access the moderation with this link: index.php?p=stats
+After authentication there will be more info and one called Moderation
 
+# Usage
 Syntax of the E-Mail body:
 
 absolute-link|multiple,category,strings|multiple,tag,strings\n
 new-absolute-link|multiple,category,strings|multiple,tag,strings\n
 
-Create a cronjob to execute the email-import.php file.
\ No newline at end of file
+Create a cronjob to execute the email-import.php file.
+
+# Access and "protection"
+If the file needs to be in a web accessible folder you can either use the provided htaccess file
+or active the "protection" with a secret given by URL / cli param.
+If you activate EMAIL_JOB_PROTECT you NEED to set an individual string in EMAIL_JOB_PROTECT_SECRET
+AND remove the provided .htaccess file in the job folder.
+
+Use the following settings in the config file:
+define('EMAIL_JOB_PROTECT', false); => Set to true if you want this kind of "protection"
+define('EMAIL_JOB_PROTECT_SECRET', 'YOUR_SOME_SECRET_STRING'); => Change to your liking
\ No newline at end of file

diff --git a/documentation/update.txt b/documentation/update.txt
index 0ee461d7db8978438486b27410bb0cdca0e24acd..7f328a5f403c82328a1263085844a48bf78c9b90 100644 (file)
--- a/documentation/update.txt
+++ b/documentation/update.txt
@@ -1,7 +1,11 @@
-If you are updating from a previous version make sure every update info from the version
-your are updating from is done.
+If you are updating from a previous version make sure every update info from
+the version your are updating from is done.
 
 x.x
-+ Run (after authentication) at /index.php?p=stats the "Search index update" to make the
-search work again correctly. At success, there is no confirmation. To validate you can now search
-for single words case-insensitive.
\ No newline at end of file
++ Run (after authentication) at /index.php?p=stats the "Search index update"
+to make the search work again correctly. At success, there is no confirmation.
+To validate you can now search for single words case-insensitive.
+
++ Update config file with tow new settings. See config.default for more info
+define('EMAIL_JOB_PROTECT', false);
+define('EMAIL_JOB_PROTECT_SECRET', 'SOME_SECRET_STRING');
\ No newline at end of file

diff --git a/webroot/config.default.php b/webroot/config.default.php
index 76d21777c556534ee16e4dc9a4939c9a210ea429..724a2ea5133e5585bfdf650c1412688fd9ae3261 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/
@@ -50,6 +50,12 @@ define("USE_PAGE_AUTH",false);
 # results per page
 define("RESULTS_PER_PAGE",12);
 
+# if the location of email-import.php needs to be in a web accessible folder
+# you can protect it by setting EMAIL_JOB_PROTECT to true
+# and EMAIL_JOB_PROTECT_SECRET to a special secret string
+# AND remove the default provided .htaccess file in the job folder
+define('EMAIL_JOB_PROTECT', false); # Default false
+define('EMAIL_JOB_PROTECT_SECRET', 'YOUR_SOME_SECRET_STRING'); # Your own secret string
 # settings for importing from e-mail
 # SSL/TLS only
 # IMAP (reading), SMTP (sending)

diff --git a/webroot/index.php b/webroot/index.php
index 41503346ccb105474ae9ffc6dbcff5b4d3ea3b89..7b6be3c1e5e7542e476ebf5e31167b79ff475bcd 100644 (file)
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/job/email-import.php b/webroot/job/email-import.php
index f48b58641db56e25c2a4f14e5c647e23982f6b63..4815cfcc0f0ae94f91ed01d093a4ee76a3b7016b 100644 (file)
--- a/webroot/job/email-import.php
+++ b/webroot/job/email-import.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/
@@ -45,6 +45,29 @@ else {
 }
 
 require('../config.php');
+
+// if the file needs to be in a web accessible folder
+// you can either use the provided htaccess file
+// or active the "protection" with a secret given by URL / cli param
+if(defined('EMAIL_JOB_PROTECT') && EMAIL_JOB_PROTECT === true
+    && defined('EMAIL_JOB_PROTECT_SECRET')) {
+
+    $_hiddenSouce = false;
+
+    $cliOptions = getopt("",array("hiddenSouce::"));
+    if(!empty($cliOptions)) {
+        $_hiddenSouce = trim($cliOptions['hiddenSouce']);
+    }
+    elseif(isset($_GET['hiddenSouce']) && !empty($_GET['hiddenSouce'])) {
+        $_hiddenSouce = trim($_GET['hiddenSouce']);
+    }
+
+    if($_hiddenSouce !== EMAIL_JOB_PROTECT_SECRET) {
+        error_log('ERROR Required param wrong.');
+        exit("401\n");
+    }
+}
+
 require('../lib/summoner.class.php');
 require('../lib/tag.class.php');
 require('../lib/category.class.php');

diff --git a/webroot/lib/email-import-helper.class.php b/webroot/lib/email-import-helper.class.php
index 00171028edaa92dcc0fd60a32403bffede8a14a0..42db67cd3f360ce8925e92e96c47be3b41619848 100644 (file)
--- a/webroot/lib/email-import-helper.class.php
+++ b/webroot/lib/email-import-helper.class.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/lib/link.class.php b/webroot/lib/link.class.php
index 2ef8ce8529820b26706789b7ccc356b9091f750d..df4709a81668bde0a63f378764826c43f5b48958 100644 (file)
--- a/webroot/lib/link.class.php
+++ b/webroot/lib/link.class.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/lib/management.class.php b/webroot/lib/management.class.php
index df0c57a4abe536a6729938b10fc4c3c61b40ac01..9f07ed076f1684c851c099ca242f08c7f419b927 100644 (file)
--- a/webroot/lib/management.class.php
+++ b/webroot/lib/management.class.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/lib/simple-imap.class.php b/webroot/lib/simple-imap.class.php
index a6ee6f2f0bf57e9eb44ad354c73d04bae911f47c..c7d492df5692175b79a68c098713a6baa83a7056 100644 (file)
--- a/webroot/lib/simple-imap.class.php
+++ b/webroot/lib/simple-imap.class.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * simple IMAP SSL/TLS email connection based on the imap PHP functions
  * the code supports SSL/TLS and IMAP only

diff --git a/webroot/lib/summoner.class.php b/webroot/lib/summoner.class.php
index 61dd0c1b0ce9bb11f05c731f05ced0301dd1638c..c988a36320e71a881f03b1770d908196c18fd19c 100644 (file)
--- a/webroot/lib/summoner.class.php
+++ b/webroot/lib/summoner.class.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/lib/tag.class.php b/webroot/lib/tag.class.php
index 8be02fe78bf3739b8b4a74832a25bdd23696e602..8d0ff870896a8638a96d30695dce28bafab4b960 100644 (file)
--- a/webroot/lib/tag.class.php
+++ b/webroot/lib/tag.class.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/editcategories.inc.php b/webroot/view/editcategories.inc.php
index ffacd240d1a4b8b6a12d742ca6b66b7abb871154..160a17d284f8407226720b4e13cc723933005780 100644 (file)
--- a/webroot/view/editcategories.inc.php
+++ b/webroot/view/editcategories.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/editcategories.php b/webroot/view/editcategories.php
index 66af4cab61cc0ca1a05c62ec0035baccecd0a022..e7354aa10f811019c128d98b7780881b7c9548f9 100644 (file)
--- a/webroot/view/editcategories.php
+++ b/webroot/view/editcategories.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/editlink.inc.php b/webroot/view/editlink.inc.php
index 1123414083450d500b7107a876d3e004b70e21b5..4cf4bf9f4825709530d2b85d238795549fc859d0 100644 (file)
--- a/webroot/view/editlink.inc.php
+++ b/webroot/view/editlink.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/editlink.php b/webroot/view/editlink.php
index 3bf8d73e9401cb47d0781d7034c62846f18e1654..050c8a93b04ee8c7050302180c3318b566e8406a 100644 (file)
--- a/webroot/view/editlink.php
+++ b/webroot/view/editlink.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/edittags.inc.php b/webroot/view/edittags.inc.php
index 45da0e6587f7f6539e4fbe35f10a0174d7d0c253..29c453acc2b42696ed4491b17cfb1f6e81d4d547 100644 (file)
--- a/webroot/view/edittags.inc.php
+++ b/webroot/view/edittags.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/edittags.php b/webroot/view/edittags.php
index 6e325701ce404c8ba7c57ee3940f9cb4f36770e5..8f62685777df94839c4eddfebf517e0d4afa0662 100644 (file)
--- a/webroot/view/edittags.php
+++ b/webroot/view/edittags.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/home.inc.php b/webroot/view/home.inc.php
index a3619a0f6cdf77e30bdd5e9257004a1df8acd1bf..b336a0da565a221241b4183db059d3392487a2c8 100644 (file)
--- a/webroot/view/home.inc.php
+++ b/webroot/view/home.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/home.php b/webroot/view/home.php
index 59c07d60a034d6c140ba770277db7606c484ecb3..fce6075223fce56503718b66edf721405b93474e 100644 (file)
--- a/webroot/view/home.php
+++ b/webroot/view/home.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/linkinfo.inc.php b/webroot/view/linkinfo.inc.php
index a0d8d95ac5ce86ec94624de0358ba25a5babfd4b..a64a3d309e4136dbb965972f754d1b9ccbc99330 100644 (file)
--- a/webroot/view/linkinfo.inc.php
+++ b/webroot/view/linkinfo.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/linkinfo.php b/webroot/view/linkinfo.php
index ab9c7ccbd2769d5777bdab55563109f2b6396db4..6216904a3ed969fd125e43e1936b0fca410d99a2 100644 (file)
--- a/webroot/view/linkinfo.php
+++ b/webroot/view/linkinfo.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/overview.inc.php b/webroot/view/overview.inc.php
index 2e5c8223ad66a9ed7255f66a3891159383f20ced..44423b5853b69727cd20a71fa58908ead9f7d39b 100644 (file)
--- a/webroot/view/overview.inc.php
+++ b/webroot/view/overview.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/overview.php b/webroot/view/overview.php
index f0a29db7be012083cad956dbbc243df6872bc6d2..d8e5184640ebcb2c53b9b794c1bac227ba5aa9ca 100644 (file)
--- a/webroot/view/overview.php
+++ b/webroot/view/overview.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/stats.inc.php b/webroot/view/stats.inc.php
index 16cdb31e2f1b5d209c8635e0fd1f006f0778e96a..27c83045880b62436f28540845340b23af7d8faa 100644 (file)
--- a/webroot/view/stats.inc.php
+++ b/webroot/view/stats.inc.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/

diff --git a/webroot/view/stats.php b/webroot/view/stats.php
index 7b6772b1265d5a9181ad36336a20e0ad1d7155db..8aaf432dd8dddf0541440837035b3c5013dc7107 100644 (file)
--- a/webroot/view/stats.php
+++ b/webroot/view/stats.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2019 Johannes Keßler
+ * Copyright 2016-2020 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/