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

no links for entries in the future

Browse source
This commit is contained in:
surrim 2020-03-13 01:42:14 +01:00
parent dc6a58cb57
commit 19fbb1ebdf
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
serendipity_event_geo_json/serendipity_event_geo_json.php
View file

@ -32,7 +32,6 @@
function get_entries() {
global $serendipity;
$andFutureCondition = serendipity_db_bool($serendipity['showFutureEntries']) ? '' : 'AND timestamp <= ' . serendipity_db_time();
$entries = [];
foreach ($this->simple_query(
"SELECT e.id, e.title, p.permalink, e.timestamp, LENGTH(e.body) AS size, a.realname, eplat.value AS lat, eplng.value AS lng
@ -41,13 +40,15 @@
JOIN {$serendipity['dbPrefix']}entryproperties eplng ON (eplng.entryid = e.id AND eplng.property = 'geo_long')
JOIN {$serendipity['dbPrefix']}permalinks p ON (p.entry_id = e.id AND p.type = 'entry')
JOIN {$serendipity['dbPrefix']}authors a ON a.authorid = e.authorid
WHERE e.isdraft = 'false' $andFutureCondition
WHERE e.isdraft = 'false'
ORDER BY e.timestamp",
false, 'assoc'
) as $row) {
$entries[$row['id']] = [
'title' => $row['title'],
'url' => $serendipity['serendipityHTTPPath'].$row['permalink'],
'url' => serendipity_db_bool($serendipity['showFutureEntries']) || $row['timestamp'] <= serendipity_db_time()
? $serendipity['serendipityHTTPPath'].$row['permalink']
: null,
'date' => $row['timestamp'],
'size' => $row['size'],
'author' => $row['realname'],
@ -61,7 +62,7 @@
JOIN {$serendipity['dbPrefix']}entries e ON e.id = ec.entryid
JOIN {$serendipity['dbPrefix']}entryproperties eplat ON (eplat.entryid = ec.entryid AND eplat.property = 'geo_lat')
JOIN {$serendipity['dbPrefix']}entryproperties eplng ON (eplng.entryid = ec.entryid AND eplng.property = 'geo_long')
WHERE e.isdraft = 'false' $andFutureCondition"
WHERE e.isdraft = 'false'"
) as $row) {
$entries[$row['entryid']]['categories'][] = $row['categoryid'];
}

16
serendipity_event_static_osm/ressources/osm.js
View file

@ -89,12 +89,18 @@ window.onload = () => {
map.on("singleclick", event => {
const makeItem = object => {
const a = document.createElement("a");
a.appendChild(document.createTextNode(object.title));
a.setAttribute("href", object.url);
a.setAttribute("title", (object.author !== undefined ? object.author + ", " : "") + new Date(object.date * 1000).toLocaleString(undefined, {year: "numeric", month: "long", day: "2-digit", hour: "2-digit", minute: "2-digit"}));
const title = document.createTextNode(object.title);
const li = document.createElement("li");
li.appendChild(a);
li.appendChild(object.url !== null
? (() => {
const a = document.createElement("a");
a.appendChild(title);
a.setAttribute("href", object.url);
a.setAttribute("title", (object.author !== undefined ? object.author + ", " : "") + new Date(object.date * 1000).toLocaleString(undefined, {year: "numeric", month: "long", day: "2-digit", hour: "2-digit", minute: "2-digit"}));
return a;
})()
: title
)
return li;
};