fixed whole page screenshot option.

Uses browserless.io. See documentation for more details

Signed-off-by: Banana <mail@bananas-playground.net>

diff --git a/CHANGELOG b/CHANGELOG
index a3a96e16428615511b6b04569025dc4b84c2960b..0c529926d5e128122874f0c8a7aa4586e45410e5 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,11 +4,11 @@ version 2.x.x - Griffin Chapel ()
     + Added new config settings for whole page screenshot creation. Please update your config.
       See update.md for more details.
       See whole-page-snapshot.md for more details.
-    + Fixed: Snapshot json result from Google.
+    + Fixed whole page screenshot option. See documentation for more details.
+    + Removed page thumbnail creation.
     + New home screen layout
     + Better logging
     + Changed documentation files to markdown syntax.
-    + Removed page thumbnail creation.
 
 version 2.8.2 - Dragon Chapel (2023-09-14)
 

diff --git a/documentation/whole-page-snapshot.md b/documentation/whole-page-snapshot.md
index 8dcafd70f9cf31bd02ac255ae30dec24ae2c1c31..98c12abb2165e6be5da9b646a24b787a54c23fca 100644 (file)
--- a/documentation/whole-page-snapshot.md
+++ b/documentation/whole-page-snapshot.md
@@ -1,12 +1,12 @@
 # Whole page screenshot of a website.
 
-It uses browserless.io to generate a whole page screenshot of a link.
+It uses `https://www.browserless.io/` to generate a whole page screenshot of a link.
 There is a free account which allows ap to 1000 requests per month.
 
 # Usage
 
 To use this feature edit the `config.php` and set `COMPLETE_PAGE_SCREENSHOT` to `true`
-and provide your browserles.io API key to `COMPLETE_PAGE_SCREENSHOT_API_KEY`.
+and provide your browserles.io API key to `COMPLETE_PAGE_SCREENSHOT_BROWSERLESS_API_KEY`.
 
 # Limitations and expectations
 

diff --git a/documentation/xml-export-and-import.md b/documentation/xml-export-and-import.md
index ed1ebecc78f878aae9a78038c42292976a95bbd0..bf6d76da591c0427a757a65737a9903e2bfadf00 100644 (file)
--- a/documentation/xml-export-and-import.md
+++ b/documentation/xml-export-and-import.md
@@ -1,10 +1,10 @@
 # XML import and export
 
-Any link can be exported as a xml file from the link info view.  Login is required to trigger this function.
+Any link can be exported as an xml file from the link info view. Login is required to trigger this function.
 The result can be used to import it again at the stats view.
 
-It exports all the link information, image and its tags and categories.
+It exports all the link information, but not the archive images.
 
 The import can overwrite existing links and import non existing ones.
 
-A import xml file can contain multiple exports. Make sure the root is still there.
+A import xml file can contain multiple exports. Make sure the xml root is still there.

diff --git a/webroot/config.default.php b/webroot/config.default.php
index 9369d3506945a8e78e2aa9db09d253a479ee97a3..4746fa8c2674de03877837d3faf5f141b207ca96 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -3,7 +3,7 @@
  * Insipid
  * Personal web-bookmark-system
  *
- * Copyright 2016-2023 Johannes Keßler
+ * Copyright 2016-2025 Johannes Keßler
  *
  * Development starting from 2011: Johannes Keßler
  * https://www.bananas-playground.net/projekt/insipid/
@@ -84,7 +84,7 @@ const EMAIL_REPLY_BACK_SUBJECT = 'Insipid email import response';
 # See whole-page-snapshot.txt for more details
 const COMPLETE_PAGE_SCREENSHOT = false;
 const COMPLETE_PAGE_SCREENSHOT_BROWSERLESS_API = "https://chrome.browserless.io/screenshot?token=";
-const COMPLETE_PAGE_SCREENSHOT_API_KEY = 'YOUR-API-KEY';
+const COMPLETE_PAGE_SCREENSHOT_BROWSERLESS_API_KEY = 'YOUR-API-KEY';
 const COMPLETE_PAGE_SCREEENSHOT_BROWSERLESS_TIMEOUT = 10000; # milliseconds
 const COMPLETE_PAGE_SCREEENSHOT_BROWSERLESS_IMAGE_QUALITY = 75; # quality for jpeg
 

diff --git a/webroot/lib/lang/eng.lang.ini b/webroot/lib/lang/eng.lang.ini
index eacc1ced8eef050a1833833c1c244a83740a3a2e..bb6e195cec5c0ad3113ffb085a6695d26dd5648d 100644 (file)
--- a/webroot/lib/lang/eng.lang.ini
+++ b/webroot/lib/lang/eng.lang.ini
@@ -109,6 +109,8 @@ view.edit.categories = "Edit categories"
 view.links = "Links"
 view.random.headline = "Surprise"
 view.random.link = "Link"
+view.pagescreenshot = "Full page screenshot"
+view.pagescreenshot.link = "View archived full page screenshot";
 
 stats.view.all = "View all"
 stats.moderation = "Moderation"

diff --git a/webroot/lib/lang/ger.lang.ini b/webroot/lib/lang/ger.lang.ini
index eb8258ca4929047e9fadda88b703dda2c568ffd8..a35d2875745d7a964ccc7d6cc3cee864b1399697 100644 (file)
--- a/webroot/lib/lang/ger.lang.ini
+++ b/webroot/lib/lang/ger.lang.ini
@@ -109,6 +109,8 @@ view.edit.categories = "Kategorien bearbeiten"
 view.links = "Links"
 view.random.headline = "Überraschung"
 view.random.link = "Link"
+view.pagescreenshot = "Full page screenshot"
+view.pagescreenshot.link = "View archived full page screenshot";
 
 stats.view.all = "Alle"
 stats.moderation = "Moderation"

diff --git a/webroot/lib/link.class.php b/webroot/lib/link.class.php
index 7d2f35ce4732fb1592e5cf08c27c73d7204b27e6..73b097998a8086f04ec21a958a1b2deed062727d 100644 (file)
--- a/webroot/lib/link.class.php
+++ b/webroot/lib/link.class.php
@@ -281,7 +281,6 @@ class Link {
                 Summoner::sysLog("ERROR ".__METHOD__." mysql catch: ".$e->getMessage());
             }
 
-
             if ($query !== false) {
                 $catObj = new Category($this->DB);
                 $tagObj = new Tag($this->DB);

diff --git a/webroot/lib/snapshot.class.php b/webroot/lib/snapshot.class.php
index 41edb86aba9cd7e15e0ff2dadbba75883a9438ef..164eaf2d32aeb5de2f20575c93cd33e7e0c2423a 100644 (file)
--- a/webroot/lib/snapshot.class.php
+++ b/webroot/lib/snapshot.class.php
@@ -27,10 +27,9 @@
  */
 
 /**
- * class Snapshot
- * create from given ULR a Screenshot for storage
- * right now it uses google pagespeedonline for a simple snapshot
- *
+ * Class Snapshot
+ * Create from given ULR a Screenshot for storage.
+ * Currently only browserless.io is supported.
  *
  */
 class Snapshot {
@@ -82,7 +81,7 @@ class Snapshot {
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
             curl_setopt($ch, CURLOPT_MAXREDIRS, 2);
 
-            // DEBUG ONLY
+            // manual DEBUG ONLY
             //$curl_log = fopen(ABSOLUTE_PATH."/curl.log", 'w');
             //curl_setopt($ch, CURLOPT_VERBOSE, true);
             //curl_setopt($ch, CURLOPT_STDERR, $curl_log);
@@ -96,7 +95,7 @@ class Snapshot {
 
             if(DEBUG) Summoner::sysLog("DEBUG return ".Summoner::cleanForLog($do));
 
-            // DEBUG ONLY
+            // manual DEBUG ONLY
             //fclose($curl_log);
 
             $ret = true;

diff --git a/webroot/view/linkinfo.php b/webroot/view/linkinfo.php
index 2e652435e0f42182a057ff01246a137fa9dc35ba..e69802f56fc2e003620d1bd0bd50800f24bc41a2 100644 (file)
--- a/webroot/view/linkinfo.php
+++ b/webroot/view/linkinfo.php
@@ -75,6 +75,20 @@
                        </p>
                </div>
        </div>
+    <?php if(defined('COMPLETE_PAGE_SCREENSHOT') && COMPLETE_PAGE_SCREENSHOT === true) { ?>
+    <div class="columns">
+           <div class="column is-one-third">
+                   <p>
+                <?php echo $T->t('view.pagescreenshot'); ?>
+                   </p>
+           </div>
+           <div class="column is-two-third">
+            <?php if(isset($linkData['pagescreenshotLink'])) { ?>
+                           <p><a href="<?php echo $linkData['pagescreenshotLink']; ?>" target="_blank"><?php echo $T->t('view.pagescreenshot.link'); ?></a></p>
+            <?php } ?>
+           </div>
+    </div>
+    <?php } ?>
        <div class="columns">
                <div class="column is-one-third">
                        <p><?php echo $T->t('view.date.added'); ?></p>