removed wkhtml implementation since the project is kinda dead

diff --git a/ChangeLog b/ChangeLog
index 105bac697ed3814bef051bc7f7b239a9f538acdc..2406dc834ed86e9f8d0627c4f821d3f2cba5fb87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-version 2.x - Deathwind Chapel ()
+version 2.8.1 - Deathwind Chapel ()
 
+       + Bugfix release
        + Moved debug setting into config
        + Updated shellcommand class and added the link to the github repo
        + Fixed/Updated the creation of the webpage thumbnail using google pagespeed insights api
@@ -8,7 +9,8 @@ version 2.x - Deathwind Chapel ()
        + Fixed xml ex- and import
        + Fixed pagination and sort options in all links view
        + Mysql dump replaced with https://github.com/druidfi/mysqldump-php
-       * Updated PHPMailer
+       + Updated PHPMailer
+       + Removed WKHTMLTOPDF_USE and WKHTMLTOPDF_COMMAND from config. No support for a whole page screenshot yet.
 
 version 2.8 - Wastelands (2022-12-10)
 

diff --git a/TODO b/TODO
index e242914cece491e60fd825f73289b3d6339268c0..089b2d773b3e2626ebd5dbe55ecb9954fc1888fe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,4 @@
 TODO / Feature list
 + view table really still needed?
-+ stats cleanup. Management functions should be standalone
 + theme support
-+ more "secure" user authentication
-++ multiple user accounts and stuff
 + combine category and tag class into one.

diff --git a/documentation/snapshots-of-linked-webpage.txt b/documentation/snapshots-of-linked-webpage.txt
index 7dabb117dd02bbb77b1a827f9ddfc00a16ded3c3..2ab930a2e1a153ba0bd0fe4eb2921e3f6195936c 100644 (file)
--- a/documentation/snapshots-of-linked-webpage.txt
+++ b/documentation/snapshots-of-linked-webpage.txt
@@ -1,22 +1,3 @@
 Whole page screenshot of a website
 
-# Requirements
-wkhtmlimage from https://wkhtmltopdf.org (tested with wkhtmltoimage 0.12.5)
-
-# Setup
-Change WKHTMLTOPDF_USE to true and alter the path WKHTMLTOPDF_COMMAND to your wkhtmltoimage install
-
-# Why wkhtmltoimage and not something newer or better?
-puppeteer is kinda overkill and the whole npm is, well, moren then that...
-https://developers.google.com/web/tools/puppeteer
-
-chromdriver and chrome was also some overkill and there was no simple
-php implementation.
-
-It will be created if the option is actived. To remove uncheck the option.
-To refresh uncheck the option. Save. This will delete the data.
-Check the option again and the page screnshot will be created again.
-
-Any error in this process will be visible in the error log file
-and not visible in the client. This way the link will be saved
-and no data will be lost.
\ No newline at end of file
+TBD

diff --git a/documentation/thumbnail-of-link.txt b/documentation/thumbnail-of-link.txt
index 75ad7d0d2c4b72a13cbb466cebbe7e5e98cefc60..55f90bedb5c06ce00afdf3db31025668841be881 100644 (file)
--- a/documentation/thumbnail-of-link.txt
+++ b/documentation/thumbnail-of-link.txt
@@ -1,10 +1,10 @@
 While editing a link you can request thumbnail of the given link at the time.
 It uses the Google page insights API to get a thumbnail.
 
-It will be created if the option is actived. To remove uncheck the option.
+It will be created if the option is activated. To remove uncheck the option.
 To refresh uncheck the option. Save. This will delete the data.
 Check the option again and the thumbnail will be created again.
 
 Any error in this process will be visible in the error log file
 and not visible in the client. This way the link will be saved
-and no data will be lost.
\ No newline at end of file
+and no data will be lost.

diff --git a/documentation/troubleshooting.txt b/documentation/troubleshooting.txt
index 65446e042c0c15fd6eca48891e8634bad53ae142..bf4278d45d73ece89a5368c0f98b38ddab2c863e 100644 (file)
--- a/documentation/troubleshooting.txt
+++ b/documentation/troubleshooting.txt
@@ -1,9 +1,9 @@
 To get more information if your are stuck:
 
-Edit index.php (or email-import.php if you have trouble with it) and change the following setting:
+Edit config.php and change the following setting:
 
-FROM: define('DEBUG',false);
-TO: define('DEBUG',true);
+FROM: const DEBUG = false;
+TO: const DEBUG = true;
 
 Alter it to false after your are done. Do not use this permanently since it displays unwanted and even
-sensitive information to everyone.
\ No newline at end of file
+sensitive information to everyone.

diff --git a/documentation/update.txt b/documentation/update.txt
index d2d3820cb0697af6fc1b2dbe15d5f15158bb8407..031567514a5e0afd6f4811d6561e78474340adca 100644 (file)
--- a/documentation/update.txt
+++ b/documentation/update.txt
@@ -1,9 +1,11 @@
 If you are updating from a previous version make sure every update info from
 the version your are updating from is done.
 
-## version 2.9
+## version 2.8.1
 + Added debug setting into config. See config.default.php for DEBUG constant.
   Add it to your local config.php
++ Removed WKHTMLTOPDF_USE and WKHTMLTOPDF_COMMAND from config file.
+  and replaced with COMPLETE_PAGE_SCREENSHOT and COMPLETE_PAGE_SCREENSHOT_COMMAND
 
 ## version 2.8 Wastelands
 + Nothing.

diff --git a/webroot/config.default.php b/webroot/config.default.php
index 2dcd55f1ae6ffc0025a929733ad974ab4cd8a09a..80d2287ea395e492ffa3bc9a10aaf3d6f570df83 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -76,9 +76,9 @@ const EMAIL_REPLY_BACK_VALID = '';
 const EMAIL_REPLY_BACK_ADDRESS = '';
 const EMAIL_REPLY_BACK_SUBJECT = 'Insipid email import response';
 
-# Use wkhtmltopdf to create a whole page screenshot of a given link
-const WKHTMLTOPDF_USE = false;
-const WKHTMLTOPDF_COMMAND = '/absolute/path/to/wkhtmltoimage';
+# Use ... to create a whole page screenshot of a given link
+const COMPLETE_PAGE_SCREENSHOT = false;
+const COMPLETE_PAGE_SCREENSHOT_COMMAND = '/absolute/path/to/command';
 
 # debug
-const DEBUG = true;
+const DEBUG = false;

diff --git a/webroot/job/email-import.php b/webroot/job/email-import.php
index 7b86483120e259a73fc840e8822729e980fba464..8819577b8f1a04b5d93ff1e3fd8d34fd07ad64b0 100644 (file)
--- a/webroot/job/email-import.php
+++ b/webroot/job/email-import.php
@@ -32,7 +32,7 @@ ini_set('error_reporting',-1); // E_ALL & E_STRICT
 # time settings
 date_default_timezone_set('Europe/Berlin');
 
-const DEBUG = false;
+require('../config.php');
 
 ## set the error reporting
 ini_set('log_errors',true);
@@ -44,8 +44,6 @@ else {
     ini_set('display_errors',false);
 }
 
-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

diff --git a/webroot/lib/snapshot.class.php b/webroot/lib/snapshot.class.php
index 19cc5a25cd64d0ee0875a031b1c33fcd1131dc99..535c012075e545136fe57e8e047ee050349d9d9a 100644 (file)
--- a/webroot/lib/snapshot.class.php
+++ b/webroot/lib/snapshot.class.php
@@ -90,9 +90,11 @@ class Snapshot {
        }
 
        /**
-        * use configured WKHTMLTOPDF_COMMAND to create a whole page screenshot
+        * use configured COMPLETE_PAGE_SCREENSHOT_COMMAND to create a whole page screenshot
         * of the given link and store it locally
         *
+        * @TODO: TBD
+        *
         * @param String $url URL to take the screenshot from
         * @param string $filename
         * @return boolean
@@ -103,7 +105,7 @@ class Snapshot {
                require_once 'lib/shellcommand.class.php';
 
                if(!empty($url) && is_writable(dirname($filename))) {
-                       $cmd = WKHTMLTOPDF_COMMAND;
+                       $cmd = COMPLETE_PAGE_SCREENSHOT_COMMAND;
                        $params = $this->_wkhtmltoimageOptions." ".$url." ".$filename;
                        $command = new ShellCommand($cmd." ".$params);
                        if ($command->execute()) {

diff --git a/webroot/view/editlink.php b/webroot/view/editlink.php
index ee6539a4ef527ed348f9764690cf1ab838385ae8..5523a1f80c87b27f0524f74d73293e6fb46228d8 100644 (file)
--- a/webroot/view/editlink.php
+++ b/webroot/view/editlink.php
@@ -114,7 +114,7 @@
                                </label>
                        </div>
                </div>
-               <?php if(defined('WKHTMLTOPDF_USE') && WKHTMLTOPDF_USE === true) { ?>
+               <?php if(defined('COMPLETE_PAGE_SCREENSHOT') && COMPLETE_PAGE_SCREENSHOT === true) { ?>
                <div class="columns">
                        <div class="column is-one-quarter">
                                <p>