From c7826c5c9edcee2fdb5a1d7baa62fa9142391343 Mon Sep 17 00:00:00 2001 From: Banana Date: Sun, 16 Mar 2025 11:32:35 +0100 Subject: [PATCH] cleanups Signed-off-by: Banana --- CHANGELOG | 4 +- README.md | 3 +- TODO | 1 + VERSION | 2 +- documentation/requirements.md | 3 +- documentation/update.md | 4 +- webroot/lib/lang/eng.lang.ini | 132 +++++++++++++++---------------- webroot/lib/lang/ger.lang.ini | 142 +++++++++++++++++----------------- 8 files changed, 145 insertions(+), 146 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0c52992..cac7397 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ -version 2.x.x - Griffin Chapel () +version 2.9.0 - Griffin Chapel (2025-03-16) + + Added TIMEZONE as a new config setting. Please update your config.php file. See update.md for more details. + Added new config settings for whole page screenshot creation. Please update your config. @@ -9,6 +10,7 @@ version 2.x.x - Griffin Chapel () + New home screen layout + Better logging + Changed documentation files to markdown syntax. + + Updated requirements information. version 2.8.2 - Dragon Chapel (2023-09-14) diff --git a/README.md b/README.md index a2f07da..3ffac98 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,8 @@ See Contributing document: [CONTRIBUTING.md](https://github.com/bananas-repos/in - imap +ssl if you us the email importer - xmlread - xmlwriter -+ MySQL server or access to a database 5.6.x and up ++ MySQL server or access to a database 8.x and up - DB user rights has to include create, alter a view - - NOT MariaDB. It is missing some functions MySQL has. Latest browser for accessing the client. IE (not Edge) is not supported anymore. diff --git a/TODO b/TODO index f85c330..68352ba 100644 --- a/TODO +++ b/TODO @@ -4,3 +4,4 @@ TODO / Feature list + view table really still needed? + theme support + backup only tables and not the db itself ++ E-mail import fixing? diff --git a/VERSION b/VERSION index e12baca..ca61864 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.x.x - Griffin Chapel +2.9.0 - Griffin Chapel diff --git a/documentation/requirements.md b/documentation/requirements.md index b71eaae..dca005b 100644 --- a/documentation/requirements.md +++ b/documentation/requirements.md @@ -12,8 +12,7 @@ PHP (8 and up) - xmlread - xmlwriter -MySQL server or access to a database 5.6.x and up +MySQL server or access to a database 8.x and up - DB user rights has to include create, alter a view -- NOT MariaDB. It is missing some functions MySQL has. Latest browser for accessing the client. diff --git a/documentation/update.md b/documentation/update.md index d69c5b3..09a9b08 100644 --- a/documentation/update.md +++ b/documentation/update.md @@ -2,7 +2,7 @@ If you are updating from a previous version make sure every update info from the version your are updating from is done. -## version 2.x.x - Griffin Chapel +## version 2.9.0 - Griffin Chapel Add new config setting `TIMEZONE` to your config. See `config.default.php` for more details. @@ -10,7 +10,7 @@ Add new config settings for using page screenshot with browserless.io. See `conf ``` 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 bb6e195..00105f9 100644 --- a/webroot/lib/lang/eng.lang.ini +++ b/webroot/lib/lang/eng.lang.ini @@ -1,7 +1,7 @@ ; Insipid ; Personal web-bookmark-system ; -; Copyright 2016-2021 Johannes Keßler +; Copyright 2016-2025 Johannes Keßler ; ; Development starting from 2011: Johannes Keßler ; https://www.bananas-playground.net/projekt/insipid/ @@ -22,112 +22,112 @@ ; You should have received a copy of the GNU General Public License ; along with this program. If not, see http://www.gnu.org/licenses/gpl-3.0. -edit.category.renamed = "Categories renamed successfully." -edit.category.rename.fail = "Categories could not be renamed." -edit.category.deleted = "Categories deleted successfully." -edit.category.delete.fail = "Categories could not be deleted." -edit.category.added = "Categories added successfully." edit.category.add.fail = "Category could not be added." -edit.category.update = "Update categories" +edit.category.added = "Categories added successfully." +edit.category.delete.fail = "Categories could not be deleted." +edit.category.deleted = "Categories deleted successfully." edit.category.new = "New category" +edit.category.rename.fail = "Categories could not be renamed." +edit.category.renamed = "Categories renamed successfully." +edit.category.update = "Update categories" edit.link.accept.new.link = "To accept this link (link has moderation status), just save it. Otherwise just delete." -edit.link.export.fail = "Export could not generated." +edit.link.delete = "DELETE" edit.link.export.data.fail = "Required data for export could not be loaded." -edit.link.updated = "Link updated successfully." -edit.link.update.failed = "Link updated failed. See logs for more details." -edit.link.update.title.missing = "Please provide a title." -edit.link.last.update = "Last update" -edit.link.image.save = "Save meta tag thumbnail on the server" +edit.link.export.fail = "Export could not generated." edit.link.full.screenshot = "Full page screenshot." -edit.link.full.screenshot.view = "View page screenshot" edit.link.full.screenshot.save = "Save a full page screenshot (This can take some time)" -edit.link.tags.description = "Enter a new one or select an existing from the suggested and press enter. Special chars check after save!" +edit.link.full.screenshot.view = "View page screenshot" +edit.link.image.save = "Save meta tag thumbnail on the server" +edit.link.last.update = "Last update" edit.link.options = "Options" edit.link.refresh = "Refresh from source" edit.link.save = "Save" -edit.link.delete = "DELETE" +edit.link.tags.description = "Enter a new one or select an existing from the suggested and press enter. Special chars check after save!" +edit.link.update.failed = "Link updated failed. See logs for more details." +edit.link.update.title.missing = "Please provide a title." +edit.link.updated = "Link updated successfully." -edit.tags.renamed = "Tags renamed successfully." -edit.tags.rename.fail = "Tags could not be renamed." +edit.tags.add.fail = "Tag could not be added." +edit.tags.added = "Tags added successfully." edit.tags.delete = "Tags deleted successfully." edit.tags.delete.fail = "Tags could not be deleted." -edit.tags.added = "Tags added successfully." -edit.tags.add.fail = "Tag could not be added." edit.tags.new = "New tag" +edit.tags.rename.fail = "Tags could not be renamed." +edit.tags.renamed = "Tags renamed successfully." edit.tags.update = "Update tags" -home.input.invalid = "Invalid input" -home.input.search.not.found = "Nothing found." -home.input.added = "Link added successfully." home.input.add.fail = "Something went wrong." +home.input.added = "Link added successfully." +home.input.invalid = "Invalid input" home.input.invalid.data = "Please provide a valid URL and title." +home.input.new.link = "Add new Link" home.input.placeholder = "Search your bookmarks or add a new one" home.input.search = "Search" -home.input.url.not.found.add = "This URL was not found. Want to add it?" -home.input.new.link = "Add new Link" home.input.search.found = "Results found." +home.input.search.not.found = "Nothing found." +home.input.url.not.found.add = "This URL was not found. Want to add it?" home.last.added = "Last added" -view.nav.all.tags = "Tags" view.nav.all.categories = "Categories" +view.nav.all.tags = "Tags" view.nav.back.home = "back home" view.nav.random = "Random link" -view.name = "Name" -view.new.name = "New name" -view.deletion = "Deletion" -view.error = "Error" -view.title = "Title" -view.description = "Description" -view.image.of.link = "Image from provided link" -view.image.link = "Image Link" view.categories = "Categories" view.category = "Category" view.category.topcombination = "Top category combinations" -view.tag.help = "Enter a new one or select an existing from the suggested and press enter." -view.tag = "Tag" -view.tags = "Tags" -view.tag.topcombination = "Top tag combinations" -view.private = "Private" -view.url = "URL" -view.website.thumbnail = "Website thumbnail from meta tag" -view.website.thumbnail.provided = "If available" -view.website.thumbnail.noimage = "No meta thumbnail provided" view.date.added = "Date added" +view.deletion = "Deletion" +view.description = "Description" view.edit = "Edit" +view.edit.categories = "Edit categories" +view.edit.tags = "Edit tags" +view.error = "Error" view.export = "Export" -view.previous = "Previous" -view.next = "Next" -view.sort.default = "default" -view.sort.title = "title" -view.visit.link = "Visit link" +view.image.link = "Image Link" +view.image.of.link = "Image from provided link" +view.links = "Links" view.more.details = "More details" +view.name = "Name" +view.new.name = "New name" +view.next = "Next" view.num.links = "# of links" -view.edit.tags = "Edit tags" -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"; +view.previous = "Previous" +view.private = "Private" +view.random.headline = "Surprise" +view.random.link = "Link" +view.sort.default = "default" +view.sort.title = "title" +view.tag = "Tag" +view.tag.help = "Enter a new one or select an existing from the suggested and press enter." +view.tag.topcombination = "Top tag combinations" +view.tags = "Tags" +view.title = "Title" +view.url = "URL" +view.visit.link = "Visit link" +view.website.thumbnail = "Website thumbnail from meta tag" +view.website.thumbnail.noimage = "No meta thumbnail provided" +view.website.thumbnail.provided = "If available" -stats.view.all = "View all" -stats.moderation = "Moderation" -stats.image.storage = "Local image storage" -stats.image.storage.diskspace = "Diskspace used" -stats.image.delete.all = "Delete all" stats.full.backup = "Full DB backup" -stats.full.backup.help = "Create a complete DB export from your data. Local stored images are NOT included." stats.full.backup.create = "Create backup" -stats.search.index = "Search index" -stats.search.index.help = "Update search index" -stats.search.index.update = "Update index" +stats.full.backup.help = "Create a complete DB export from your data. Local stored images are NOT included." +stats.image.delete.all = "Delete all" +stats.image.storage = "Local image storage" +stats.image.storage.diskspace = "Diskspace used" +stats.import.missing.file = "Please provide a import file" stats.import.xml = "Import XML" -stats.import.xml.help = "Single or multiple" stats.import.xml.file = "Choose a file" -stats.import.xml.overwrite = "Overwrite existing" +stats.import.xml.help = "Single or multiple" stats.import.xml.import = "Import" -stats.storage.clean.fail = "Something went wrong while storage cleaning" -stats.import.missing.file = "Please provide a import file" +stats.import.xml.overwrite = "Overwrite existing" +stats.moderation = "Moderation" +stats.search.index = "Search index" stats.search.index.fail = "Something went wrong while search index update" +stats.search.index.help = "Update search index" +stats.search.index.update = "Update index" +stats.storage.clean.fail = "Something went wrong while storage cleaning" +stats.view.all = "View all" diff --git a/webroot/lib/lang/ger.lang.ini b/webroot/lib/lang/ger.lang.ini index a35d287..530b0a7 100644 --- a/webroot/lib/lang/ger.lang.ini +++ b/webroot/lib/lang/ger.lang.ini @@ -1,7 +1,7 @@ ; Insipid ; Personal web-bookmark-system ; -; Copyright 2016-2021 Johannes Keßler +; Copyright 2016-2025 Johannes Keßler ; ; Development starting from 2011: Johannes Keßler ; https://www.bananas-playground.net/projekt/insipid/ @@ -22,118 +22,116 @@ ; You should have received a copy of the GNU General Public License ; along with this program. If not, see http://www.gnu.org/licenses/gpl-3.0. -edit.category.renamed = "Kategorien erfolgreich umbenannt." -edit.category.rename.fail = "Kategorien konnten nicht umbenannt werden." -edit.category.deleted = "Kategorien erfolgreich gelöscht." -edit.category.delete.fail = "Kategorien konnten nicht gelöscht werden." -edit.category.added = "Kategorien erfolgreich hinzugefügt." edit.category.add.fail = "Kategorie konnte nicht hinzugefügt werden." -edit.category.update = "Kategorien aktualisieren" +edit.category.added = "Kategorien erfolgreich hinzugefügt." +edit.category.delete.fail = "Kategorien konnten nicht gelöscht werden." +edit.category.deleted = "Kategorien erfolgreich gelöscht." edit.category.new = "Neue Kategorie" +edit.category.rename.fail = "Kategorien konnten nicht umbenannt werden." +edit.category.renamed = "Kategorien erfolgreich umbenannt." +edit.category.update = "Kategorien aktualisieren" edit.link.accept.new.link = "Speichern um den Link zu akzeptieren (Link erwartet Moderation), wenn nicht einfach löschen." -edit.link.export.fail = "Export konnte nicht erstellt werden." +edit.link.delete = "LÖSCHEN" edit.link.export.data.fail = "Notwendige Daten für den Export konnten nicht geladen werden." -edit.link.updated = "Link erfolgreich aktualisiert." -edit.link.update.failed = "Link Aktualisierung fehlgeschlagen. Mehr Informationen in den Logdateien." -edit.link.update.title.missing = "Bitte einen Titel angeben." -edit.link.last.update = "Letzte Aktualisierung" -edit.link.image.save = "Meta tag thumnail Bild abspeichern" +edit.link.export.fail = "Export konnte nicht erstellt werden." edit.link.full.screenshot = "Screenshot der ganzen Webseite." -edit.link.full.screenshot.view = "Webseitenscreenshot anzeigen" edit.link.full.screenshot.save = "Screenshot der ganzen Webseite auf dem Server speichern (Kann etwas Zeit in Anspruch nehmen)" -edit.link.tags.description = "Neue Eingabe oder Auswahl eines bestehenden und danach Enter drücken. Sonderzeichenprüfung erfolgt beim Speichern!" +edit.link.full.screenshot.view = "Webseitenscreenshot anzeigen" +edit.link.image.save = "Meta tag thumnail Bild abspeichern" +edit.link.last.update = "Letzte Aktualisierung" edit.link.options = "Optionen" edit.link.refresh = "Aktualisierung von der Quelle" edit.link.save = "Speichern" -edit.link.delete = "LÖSCHEN" +edit.link.tags.description = "Neue Eingabe oder Auswahl eines bestehenden und danach Enter drücken. Sonderzeichenprüfung erfolgt beim Speichern!" +edit.link.update.failed = "Link Aktualisierung fehlgeschlagen. Mehr Informationen in den Logdateien." +edit.link.update.title.missing = "Bitte einen Titel angeben." +edit.link.updated = "Link erfolgreich aktualisiert." -edit.tags.renamed = "Tags erfolgreich umbenannt." -edit.tags.rename.fail = "Tags konnten nicht umbenannt werden." +edit.tags.add.fail = "Tag konnte nicht hinzugefügt werden." +edit.tags.added = "Tags erfolgreich hinzugefügt." edit.tags.delete = "Tags erfolgreich gelöscht." edit.tags.delete.fail = "Tags konnten nicht gelöscht werden." -edit.tags.added = "Tags erfolgreich hinzugefügt." -edit.tags.add.fail = "Tag konnte nicht hinzugefügt werden." edit.tags.new = "Neuer tag" +edit.tags.rename.fail = "Tags konnten nicht umbenannt werden." +edit.tags.renamed = "Tags erfolgreich umbenannt." edit.tags.update = "Aktualisiere Tags" -home.input.invalid = "Ungültige Eingabe" -home.input.search.not.found = "Nichts gefunden." -home.input.added = "Link erfolgreich hinzugefügt." home.input.add.fail = "Etwas ist falsch gelaufen." +home.input.added = "Link erfolgreich hinzugefügt." +home.input.invalid = "Ungültige Eingabe" home.input.invalid.data = "Bitte valide URL und Titel angeben." +home.input.new.link = "Neuen Link hinzufügen" home.input.placeholder = "Suche nach deinen Lesezeichen oder füge einen hinzu." home.input.search = "Suche" -home.input.url.not.found.add = "Diese URL wurde nicht gefunden. Hinzufügen?" -home.input.new.link = "Neuen Link hinzufügen" home.input.search.found = "Ergebnisse gefunden." +home.input.search.not.found = "Nichts gefunden." +home.input.url.not.found.add = "Diese URL wurde nicht gefunden. Hinzufügen?" home.last.added = "Zuletzt hinzugefügt" -view.nav.all.tags = "Tags" view.nav.all.categories = "Kategorien" +view.nav.all.tags = "Tags" view.nav.back.home = "zurück nach Hause" view.nav.random = "Zufallslink" -view.name = "Name" -view.new.name = "Neuer Name" -view.deletion = "Löschung" -view.error = "Fehler" -view.title = "Titel" -view.description = "Beschreibung" -view.image.of.link = "Bild vom Link" -view.image.link = "Bildverweis" view.categories = "Kategorien" view.category = "Kategorie" view.category.topcombination = "Top Kategorie Kombinationen" -view.tag.help = "Eingabe eines Neuen oder Auswahl eines Bestehenden und danach Enter drücken." -view.tag = "Tag" -view.tags = "Tags" -view.tag.topcombination = "Top Tag Kombinationen" -view.private = "Privat" -view.url = "URL" -view.website.thumbnail = "Webseiten meta tag Thumbnail" -view.website.thumbnail.provided = "Wenn vorhanden" -view.website.thumbnail.noimage = "Kein meta tag Thumnail Bild vorhanden" view.date.added = "Hinzugefügt am" +view.deletion = "Löschung" +view.description = "Beschreibung" view.edit = "Bearbeiten" +view.edit.categories = "Kategorien bearbeiten" +view.edit.tags = "Tags bearbeiten" +view.error = "Fehler" view.export = "Export" -view.previous = "Vorhergehende" -view.next = "Nächste" -view.sort.default = "Standart" -view.sort.title = "Title" -view.visit.link = "Link aufrufen" +view.image.link = "Bildverweis" +view.image.of.link = "Bild vom Link" +view.links = "Links" view.more.details = "Mehr Informationen" +view.name = "Name" +view.nav.all.categories = "Kategorien" +view.nav.all.tags = "Tags" +view.nav.back.home = "zurück nach Hause" +view.nav.random = "Zufallslink" +view.new.name = "Neuer Name" +view.next = "Nächste" view.num.links = "# der Links" -view.edit.tags = "Tags bearbeiten" -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"; +view.previous = "Vorhergehende" +view.private = "Privat" +view.random.headline = "Überraschung" +view.random.link = "Link" +view.sort.default = "Standart" +view.sort.title = "Title" +view.tag = "Tag" +view.tag.help = "Eingabe eines Neuen oder Auswahl eines Bestehenden und danach Enter drücken." +view.tag.topcombination = "Top Tag Kombinationen" +view.tags = "Tags" +view.title = "Titel" +view.url = "URL" +view.visit.link = "Link aufrufen" +view.website.thumbnail = "Webseiten meta tag Thumbnail" +view.website.thumbnail.noimage = "Kein meta tag Thumnail Bild vorhanden" +view.website.thumbnail.provided = "Wenn vorhanden" -stats.view.all = "Alle" -stats.moderation = "Moderation" -stats.image.storage = "Lokale Bild Datenmenge" -stats.image.storage.diskspace = "Verbrauchte Datenmenge" -stats.image.delete.all = "Alle löschen" stats.full.backup = "Kompletter DB Backup" -stats.full.backup.help = "Erstelle einen kompletten DB Export deiner Daten. Lokal gespeicherte Bilder sind NICHT enthalten." stats.full.backup.create = "Backup erstellen" -stats.search.index = "Suchindex" -stats.search.index.help = "Suchindex aktualisieren" -stats.search.index.update = "Index aktualisieren" +stats.full.backup.help = "Erstelle einen kompletten DB Export deiner Daten. Lokal gespeicherte Bilder sind NICHT enthalten." +stats.image.delete.all = "Alle löschen" +stats.image.storage = "Lokale Bild Datenmenge" +stats.image.storage.diskspace = "Verbrauchte Datenmenge" +stats.import.missing.file = "Bitte eine Importdatei angeben" stats.import.xml = "XML Import" -stats.import.xml.help = "Ein oder mehrere" stats.import.xml.file = "Dateiauswahl" -stats.import.xml.overwrite = "Existierende überschreiben" +stats.import.xml.help = "Ein oder mehrere" stats.import.xml.import = "Import" - -view.nav.all.tags = "Tags" -view.nav.all.categories = "Kategorien" -view.nav.back.home = "zurück nach Hause" -view.nav.random = "Zufallslink" - -stats.storage.clean.fail = "Ein Fehler bei der Speicherplatzlöschung trat auf" -stats.import.missing.file = "Bitte eine Importdatei angeben" +stats.import.xml.overwrite = "Existierende überschreiben" +stats.moderation = "Moderation" +stats.search.index = "Suchindex" stats.search.index.fail = "Ein Fehler bei der Aktualisierung des Suchindexes trat auf" +stats.search.index.help = "Suchindex aktualisieren" +stats.search.index.update = "Index aktualisieren" +stats.storage.clean.fail = "Ein Fehler bei der Speicherplatzlöschung trat auf" +stats.view.all = "Alle" -- 2.39.5