qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vgwort: Some fixes. (#97)

Browse source 
* Change type of UNIQUE columns to VARCHAR.

MySQL can't work with UNIQUE constraints on
BLOB or TEXT columns: "MySQL Error 1170 (42000):
BLOB/TEXT Column Used in Key Specification
Without a Key Length".

Public and private counter identifiers have
a fixed length of 32, so use VARCHAR(32)
instead.

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Requires at least s9y 2.2.1-alpha1.

That's the first release containing
"info_more", see s9y/Serendipty#511

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Fix typo.

MySQL comparisions use "=", not "==".

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Internationalisation.

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Fix typo.

String concatenation is done using ".=", not
"+=".

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Bump version, add ChangeLog.

Signed-off-by: Thomas Hochstein <thh@inter.net>

* Drop "unofficial" from name.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2019-08-05 18:27:42 +02:00 committed by onli
parent 7b877ac4a3
commit 0bced8b29f
5 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
serendipity_event_vgwort/ChangeLog Normal file
View file

@ -0,0 +1,13 @@
Version 0.4:
============
Changes by Thomas Hochstein <thh@inter.net>
- Require s9y 2.2.1-alpha1 or higher due to backend template changes
missing in older versions.
- Change table columns counter_public and counter_private to
VARCHAR(32) as MySQL doesn't accept UNIQUE constraints on TEXT
or BLOB columns.
- Fix MySQL comparison (use "=" instead of "=="); otherwise, no
counter codes will ever be found.
- Fix concatenation of body and extended, fixing wrong length
calculations for all entries with an extended entry.
- Internationalisation.

9
serendipity_event_vgwort/UTF-8/lang_de.inc.php
View file

@ -1,4 +1,9 @@
<?php
@define('PLUGIN_EVENT_VGWORT_NAME', 'VG Wort (inoffiziell)');
@define('PLUGIN_EVENT_VGWORT_DESC', 'Integriert VG Wort Zählmarken.');
@define('PLUGIN_EVENT_VGWORT_NAME', 'VG Wort');
@define('PLUGIN_EVENT_VGWORT_DESC', 'Integriert Zählmarken der VG Wort.');
@define('PLUGIN_EVENT_VGWORT_TPL_TITLE', 'Zählmarken');
@define('PLUGIN_EVENT_VGWORT_TPL_IMPORT', 'Neue CSV-Datei mit Zählmarken importieren aus');
@define('PLUGIN_EVENT_VGWORT_LENGTH', 'Länge');
@define('PLUGIN_EVENT_VGWORT_COUNTERCODE', 'Zählmarke');
@define('PLUGIN_EVENT_VGWORT_PRIVATECODE', 'Private ID');

7
serendipity_event_vgwort/UTF-8/lang_en.inc.php
View file

@ -1,4 +1,9 @@
<?php
@define('PLUGIN_EVENT_VGWORT_NAME', 'VG Wort (unofficial)');
@define('PLUGIN_EVENT_VGWORT_NAME', 'VG Wort');
@define('PLUGIN_EVENT_VGWORT_DESC', 'Integrate VG Wort counters into your blog.');
@define('PLUGIN_EVENT_VGWORT_TPL_TITLE', 'VG Wort counter codes');
@define('PLUGIN_EVENT_VGWORT_TPL_IMPORT', 'Import a new CSV with counter codes from');
@define('PLUGIN_EVENT_VGWORT_LENGTH', 'Length');
@define('PLUGIN_EVENT_VGWORT_COUNTERCODE', 'Counter code');
@define('PLUGIN_EVENT_VGWORT_PRIVATECODE', 'Private code');

34
serendipity_event_vgwort/serendipity_event_vgwort.php
View file

@ -16,9 +16,9 @@ class serendipity_event_vgwort extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_VGWORT_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
$propbag->add('version', '0.3.2');
$propbag->add('version', '0.4');
$propbag->add('requirements', array(
'serendipity' => '2.1'
'serendipity' => '2.2.1'
));
$propbag->add('event_hooks', array('external_plugin' => true,
'backend_maintenance' => true,
@ -46,8 +46,8 @@ class serendipity_event_vgwort extends serendipity_event {
global $serendipity;
$sql = "CREATE TABLE IF NOT EXISTS {$serendipity['dbPrefix']}vgwort (
entry_id INTEGER,
counter_public TEXT UNIQUE NOT NULL,
counter_private TEXT UNIQUE NOT NULL);";
counter_public VARCHAR(32) UNIQUE NOT NULL,
counter_private VARCHAR(32) UNIQUE NOT NULL);";
serendipity_db_schema_import($sql);
}
@ -61,7 +61,7 @@ class serendipity_event_vgwort extends serendipity_event {
$entry = array_values($entry)[0]['entries'][0];
$fullEntry = $entry['body'];
if (! empty($entry['extended'])) {
$fullEntry += $entry['extended'];
$fullEntry .= $entry['extended'];
}
$rawEntry = strip_tags($fullEntry);
@ -70,14 +70,14 @@ class serendipity_event_vgwort extends serendipity_event {
}
/**
* Import the Zählmarken stored in the given CSV. Store them in the database, with an entry id if there are available entries (=that are long enough)
* Import the counter codes ("Zählmarken") stored in the given CSV. Store them in the database, with an entry id if there are available entries (=that are long enough)
* */
function import($csv) {
// NOTE: We should use one of the included CSV functions. But they don't work with the format the csv file has currently
$csv = explode(";Zählmarke für HTML Texte;Zählmarke für HTML Texte - SSL (https://...);Zählmarke für Dokumente (erlaubte Formate: PDF, ePub);Zählmarke für Dokumente (erlaubte Formate: PDF, ePub) - SSL (https://...)", $csv);
$entries = $this->markableEntries();
foreach ($csv as $csvline) {
// we have to remvoe newlines here, because the CSV currently contains newlines where there should be none,
// we have to remove newlines here, because the CSV currently contains newlines where there should be none,
// which trips up the selection via array indexes selection below
$csvline = str_replace(array("\n", "\r"), '', $csvline);
$csvline = explode(';', $csvline);
@ -92,7 +92,7 @@ class serendipity_event_vgwort extends serendipity_event {
}
/**
* Return array of up to 100 ids of entries long enough to get a Zählmarke and not already marked
* Return array of up to 100 ids of entries long enough to get a counter code and not already marked
* */
function markableEntries() {
global $serendipity;
@ -134,7 +134,7 @@ class serendipity_event_vgwort extends serendipity_event {
}
/**
* Return an array of unused public and private Zählmarken
* Return an array of unused public and private counter codes
* */
function unused() {
return $this->getCounter(0);
@ -143,12 +143,12 @@ class serendipity_event_vgwort extends serendipity_event {
function getCounter($entry_id) {
global $serendipity;
$sql = "SELECT counter_public, counter_private FROM {$serendipity['dbPrefix']}vgwort
WHERE entry_id == " . (int) $entry_id;
WHERE entry_id = " . (int) $entry_id;
return serendipity_db_query($sql, false);
}
/**
* If entry is long enough and not already marked, assign one of the unused Zählmarken
* If entry is long enough and not already marked, assign one of the unused counter codes
* */
function assignUnusedCounter($entry_id) {
if ($this->isMarkable($entry_id)) {
@ -227,13 +227,13 @@ class serendipity_event_vgwort extends serendipity_event {
case 'backend_view_entry':
$counter = $this->getCounter($eventData['id'])[0];
$eventData['info_more'] = '<section class="vgwort">
<span>Length: ' . $this->entryLength($eventData['id']) . '</span>';
<span>' . PLUGIN_EVENT_VGWORT_LENGTH . ': ' . $this->entryLength($eventData['id']) . '</span>';
if (is_array($counter) && $counter['counter_public']) {
$eventData['info_more'] .='<span>Zählmarke: ' . $counter['counter_public'] . '</span>
<span>Identifikationscode: ' . $counter['counter_private'] . '</span>';
$eventData['info_more'] .='<span>' . PLUGIN_EVENT_VGWORT_COUNTERCODE . ': ' . $counter['counter_public'] . '</span>
<span>' . PLUGIN_EVENT_VGWORT_PRIVATECODE . ': ' . $counter['counter_private'] . '</span>';
}
$eventData['info_more'] .= '</section>';
return true;
break;
@ -247,7 +247,7 @@ class serendipity_event_vgwort extends serendipity_event {
return false;
}
if ($counter['counter_public']) {
// the entry has a Zählmarke, but we have to make sure it is also shown completely
// the entry has a counter code, but we have to make sure it is also shown completely
if ((empty($eventData['extended'])) || $serendipity['feedFull'] == 1) {
$eventData['feed_body'] .= '<img src="https://ssl-vg03.met.vgwort.de/na/' . $counter['counter_public'] . '" width="1" height="1" alt="">';
}
@ -264,7 +264,7 @@ class serendipity_event_vgwort extends serendipity_event {
return false;
}
if ($counter['counter_public']) {
// the entry has a Zählmarke, but we have to make sure it is also shown completely
// the entry has a counter code, but we have to make sure it is also shown completely
if ((! $eventData['has_extended']) || ($serendipity['GET']['action'] == 'read' && is_int($serendipity['GET']['id']))) {
$eventData['display_dat'] .= '<img src="https://ssl-vg03.met.vgwort.de/na/' . $counter['counter_public'] . '" width="1" height="1" alt="">';
}

4
serendipity_event_vgwort/vgwortMenu.tpl
View file

@ -1,10 +1,10 @@
<section id="maintenance_vgwort" class="equal_heights quick_list">
<h3>Zählmarken</h3>
<h3>{$CONST.PLUGIN_EVENT_VGWORT_TPL_TITLE}</h3>
<h4>Reserve: {$unused}</h4>
<form enctype="multipart/form-data" method="POST" action="{$serendipityBaseURL}index.php?/plugin/vgwortImport">
<label>Import a new CSV with Zählmarken from <a href="https://tom.vgwort.de/portal/metis/secure/editOrderPersonalizedPixel">T.O.M</a></label>
<label>{$CONST.PLUGIN_EVENT_VGWORT_TPL_IMPORT} <a href="https://tom.vgwort.de/portal/metis/secure/editOrderPersonalizedPixel">T.O.M</a></label>
<input type="file" name="csv"/>
<button>{$CONST.GO}</button>
</form>