${__('Who is joining the group?', 'TouchPoint-WP')}
` + TP_Person.peopleArrayToCheckboxes(people), customClass: tpvm._utils.defaultSwalClasses(), - confirmButtonText: __('OK', 'TouchPoint-WP') + showConfirmButton: true, + showCancelButton: true, + confirmButtonText: __('Join', 'TouchPoint-WP'), + cancelButtonText: __('Cancel', 'TouchPoint-WP'), + focusConfirm: false, + preConfirm: () => { + let form = document.getElementById('tp_people_list_checkboxes'), + inputs = form.querySelectorAll("input"), + data = []; + for (const ii in inputs) { + if (!inputs.hasOwnProperty(ii) || !inputs[ii].checked) continue; + data.push(tpvm.people[inputs[ii].value]); + } + + if (data.length < 1) { + let prompt = document.getElementById('swal-tp-text'); + prompt.innerText = __("Select who should be added to the group.", 'TouchPoint-WP'); + prompt.classList.add('error') + return false; + } + + Swal.showLoading(); + + return inv.doJoin(data, true); + } }); } } - } - // noinspection JSUnusedGlobalSymbols Used dynamically from btns. - joinAction() { - let inv = this, - // translators: %s is the name of an Involvement - title = sprintf(__('Join %s', 'TouchPoint-WP'), inv.name); - - tpvm._utils.ga('send', 'event', inv.invType, 'join btn click', inv.name); - - tpvm._utils.applyHashForAction("join", this); - - TP_Person.DoInformalAuth(title).then( - (res) => joinUi(inv, res).then(tpvm._utils.clearHash), - () => tpvm._utils.clearHash() - ) - - function joinUi(inv, people) { - tpvm._utils.ga('send', 'event', inv.invType, 'join userIdentified', inv.name); - - return Swal.fire({ - title: title, - html: `${__('Who is joining the group?', 'TouchPoint-WP')}
` + TP_Person.peopleArrayToCheckboxes(people), - customClass: tpvm._utils.defaultSwalClasses(), - showConfirmButton: true, - showCancelButton: true, - confirmButtonText: __('Join', 'TouchPoint-WP'), - cancelButtonText: __('Cancel', 'TouchPoint-WP'), - focusConfirm: false, - preConfirm: () => { - let form = document.getElementById('tp_people_list_checkboxes'), - inputs = form.querySelectorAll("input"), - data = []; - for (const ii in inputs) { - if (!inputs.hasOwnProperty(ii) || !inputs[ii].checked) continue; - data.push(tpvm.people[inputs[ii].value]); - } + // noinspection JSUnusedGlobalSymbols Used dynamically from btns. + contactAction() { + let inv = this, + // translators: %s is the name of an involvement. This is a heading for a modal. + title = sprintf(__("Contact the Leaders of %s", 'TouchPoint-WP'), inv.name); - if (data.length < 1) { - let prompt = document.getElementById('swal-tp-text'); - prompt.innerText = __("Select who should be added to the group.", 'TouchPoint-WP'); - prompt.classList.add('error') - return false; - } + tpvm._utils.ga('send', 'event', inv.invType, 'contact btn click', inv.name); - Swal.showLoading(); + tpvm._utils.applyHashForAction("contact", this); - return inv.doJoin(data, true); - } - }); - } - } + TP_Person.DoInformalAuth(title).then( + (res) => contactUi(inv, res).then(tpvm._utils.clearHash), + () => tpvm._utils.clearHash() + ) - get itemTypeName() { - return this.invType; - } + function contactUi(inv, people) { + tpvm._utils.ga('send', 'event', inv.invType, 'contact userIdentified', inv.name); - // noinspection JSUnusedGlobalSymbols Used dynamically from btns. - contactAction() { - let inv = this, - // translators: %s is the name of an involvement. This is a heading for a modal. - title = sprintf(__("Contact the Leaders of %s", 'TouchPoint-WP'), inv.name); - - tpvm._utils.ga('send', 'event', inv.invType, 'contact btn click', inv.name); - - tpvm._utils.applyHashForAction("contact", this); - - TP_Person.DoInformalAuth(title).then( - (res) => contactUi(inv, res).then(tpvm._utils.clearHash), - () => tpvm._utils.clearHash() - ) - - function contactUi(inv, people) { - tpvm._utils.ga('send', 'event', inv.invType, 'contact userIdentified', inv.name); - - return Swal.fire({ - title: title, - html: '', - customClass: tpvm._utils.defaultSwalClasses(), - showConfirmButton: true, - showCancelButton: true, - confirmButtonText: __('Send', 'TouchPoint-WP'), - cancelButtonText: __('Cancel', 'TouchPoint-WP'), - focusConfirm: false, - preConfirm: () => { - let form = document.getElementById('tp_inv_contact_form'), - fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)], - message = form.getElementsByTagName('textarea')[0].value; - - if (message.length < 5) { - let prompt = document.getElementById('swal-tp-text'); - prompt.innerText = __("Please provide a message.", 'TouchPoint-WP'); - prompt.classList.add('error') - return false; - } + return Swal.fire({ + title: title, + html: '', + customClass: tpvm._utils.defaultSwalClasses(), + showConfirmButton: true, + showCancelButton: true, + confirmButtonText: __('Send', 'TouchPoint-WP'), + cancelButtonText: __('Cancel', 'TouchPoint-WP'), + focusConfirm: false, + preConfirm: () => { + let form = document.getElementById('tp_inv_contact_form'), + fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)], + message = form.getElementsByTagName('textarea')[0].value; + + if (message.length < 5) { + let prompt = document.getElementById('swal-tp-text'); + prompt.innerText = __("Please provide a message.", 'TouchPoint-WP'); + prompt.classList.add('error') + return false; + } - Swal.showLoading(); + Swal.showLoading(); - return inv.doInvContact(fromPerson, message, true); - } - }); + return inv.doInvContact(fromPerson, message, true); + } + }); + } } - } - static initMap(mapDivId) { - let mapOptions = { - mapTypeId: google.maps.MapTypeId.ROADMAP, - linksControl: false, - maxZoom: 15, - minZoom: 2, - panControl: false, - addressControl: false, - enableCloseButton: false, - mapTypeControl: false, - zoomControl: false, - gestureHandling: 'greedy', - styles: [ - { - featureType: "poi", //points of interest - stylers: [ - {visibility: 'off'} - ] - }, - { - featureType: "road", - stylers: [ - {visibility: 'on'} - ] - }, - { - featureType: "transit", - stylers: [ - {visibility: 'on'} - ] - } - ], - zoom: 15, - center: {lat: 0, lng: 0}, // gets overwritten by bounds later. - streetViewControl: false, - fullscreenControl: false, - disableDefaultUI: true - }; + static initMap(mapDivId) { + let mapOptions = { + mapTypeId: google.maps.MapTypeId.ROADMAP, + mapId: "f0fb8ca5f6beff5288b80a8d", + linksControl: false, + maxZoom: 16, + minZoom: 2, + panControl: false, + addressControl: false, + enableCloseButton: false, + mapTypeControl: false, + zoomControl: false, + gestureHandling: 'greedy', + zoom: 15, + center: {lat: 0, lng: 0}, // gets overwritten by bounds later. + streetViewControl: false, + fullscreenControl: false, + disableDefaultUI: true + }; + + super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.involvements) + } + + static initNearby(targetId, type, count) { + if (window.location.pathname.substring(0, 10) === "/wp-admin/") + return; - super.initMap(document.getElementById(mapDivId), mapOptions, tpvm.involvements) - } + let target = document.getElementById(targetId); + if (!target) // make sure element actually exists (it may not if shortcode was within a tease) + return; - static initNearby(targetId, type, count) { - if (window.location.pathname.substring(0, 10) === "/wp-admin/") - return; - - let target = document.getElementById(targetId); - if (!target) // make sure element actually exists (it may not if shortcode was within a tease) - return; - - tpvm._invNear.nearby = ko.observableArray([]); - tpvm._invNear.labelStr = ko.observable(__("Loading...", 'TouchPoint-WP')); - ko.applyBindings(tpvm._invNear, target); - - // continue to next action for either success or failure. - TP_DataGeo.getLocation(getNearbyInvolvements, getNearbyInvolvements, 'nav'); - - function getNearbyInvolvements() { - tpvm.getData('inv/nearby', { - lat: TP_DataGeo.loc.lat, - lng: TP_DataGeo.loc.lng, - type: type, - limit: count, - locale: tpvm.locale - }).then(handleNearbyLoaded); - } - - function handleNearbyLoaded(response) { - tpvm._invNear.nearby(response.invList); - if (response.error !== undefined) { - if (response.geo === false) { - if (navigator.geolocation && location.protocol === 'https:') { - tpvm._invNear.labelStr(__("We don't know where you are.", 'TouchPoint-WP') + "${__('Tell us about yourself.', 'TouchPoint-WP')}
` + - '', + function contactUi(psn, people) { + tpvm._utils.ga('send', 'event', 'Person', 'contact userIdentified', psn.peopleId); + + return Swal.fire({ + title: title, + html: '', customClass: tpvm._utils.defaultSwalClasses(), showConfirmButton: true, showCancelButton: true, - title: title, - confirmButtonText: __('Next', 'TouchPoint-WP'), + confirmButtonText: __('Send', 'TouchPoint-WP'), cancelButtonText: __('Cancel', 'TouchPoint-WP'), focusConfirm: false, - didOpen: () => { - document.getElementById('tp_ident_form').addEventListener('submit', (e) => { - Swal.clickConfirm(); - e.preventDefault(); - }) - }, - preConfirm: async () => { - let form = document.getElementById('tp_ident_form'), - inputs = form.querySelectorAll("input"), - data = {}; - form.checkValidity() - for (const ii in inputs) { - if (!inputs.hasOwnProperty(ii)) continue; - if (!inputs[ii].reportValidity()) { - return false; - } - let name = inputs[ii].name.replace("tp_ident_", ""); - if (name.length > 0) // removes entry generated by submit input - data[name] = inputs[ii].value; + preConfirm: () => { + let form = document.getElementById('tp_person_contact_form'), + fromPerson = tpvm.people[parseInt(form.getElementsByTagName('select')[0].value)], + message = form.getElementsByTagName('textarea')[0].value; + + if (message.length < 5) { + let prompt = document.getElementById('swal2-title'); + prompt.innerText = __("Please provide a message.", 'TouchPoint-WP'); + prompt.classList.add('error') + return false; } - tpvm.userEmail = data['email'] ?? null; Swal.showLoading(); - let result = await tpvm.postData('person/ident', data); - - // Handle an error if it happened. - if (result.hasOwnProperty('error')) { - Swal.hideLoading(); - Swal.update({ - icon: 'error', - title: __("Something went wrong.", 'TouchPoint-WP'), - text: result.error, - timer: 3000 - }); - return false; - } + return psn.doPersonContact(fromPerson, message, true); + } + }); + } + } - if (result.people.length > 0) { - return result; - } else { - Swal.hideLoading(); - Swal.update({ - html: `${__("Our system doesn't recognize you,
so we need a little more info.", 'TouchPoint-WP')}
${__('Tell us about yourself.', 'TouchPoint-WP')}
` + + '', + customClass: tpvm._utils.defaultSwalClasses(), + showConfirmButton: true, + showCancelButton: true, + title: title, + confirmButtonText: __('Next', 'TouchPoint-WP'), + cancelButtonText: __('Cancel', 'TouchPoint-WP'), + focusConfirm: false, + didOpen: () => { document.getElementById('tp_ident_form').addEventListener('submit', (e) => { Swal.clickConfirm(); e.preventDefault(); - }); - return false; + }) + }, + preConfirm: async () => { + let form = document.getElementById('tp_ident_form'), + inputs = form.querySelectorAll("input"), + data = {}; + form.checkValidity() + for (const ii in inputs) { + if (!inputs.hasOwnProperty(ii)) continue; + if (!inputs[ii].reportValidity()) { + return false; + } + let name = inputs[ii].name.replace("tp_ident_", ""); + if (name.length > 0) // removes entry generated by submit input + data[name] = inputs[ii].value; + } + tpvm.userEmail = data['email'] ?? null; + + Swal.showLoading(); + + let result = await tpvm.postData('person/ident', data); + + // Handle an error if it happened. + if (result.hasOwnProperty('error')) { + Swal.hideLoading(); + Swal.update({ + icon: 'error', + title: __("Something went wrong.", 'TouchPoint-WP'), + text: result.error, + timer: 3000 + }); + return false; + } + + if (result.people.length > 0) { + return result; + } else { + Swal.hideLoading(); + Swal.update({ + html: `${__("Our system doesn't recognize you,
so we need a little more info.", 'TouchPoint-WP')}
Wordpress Plugin - Modern Tribe and use this url:"
-msgstr "Para usar los eventos de su calendario de eventos en la aplicación móvil personalizada, configure el proveedor en Wordpress Plugin - Modern Tribe y use esta URL:"
-
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:700
+#: src/TouchPoint-WP/Settings.php:868
msgid "Preview"
msgstr "Preestrena"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/Settings.php:883
msgid "Use Standardizing Stylesheet"
msgstr "Usar hoja de estilo de estandarización"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
+#: src/TouchPoint-WP/Settings.php:884
msgid "Inserts some basic CSS into the events feed to clean up display"
msgstr "Inserta algo de CSS básico en el feed de eventos para limpiar la pantalla"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/Settings.php:999
msgid "Divisions"
msgstr "Divisiones"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
+#: src/TouchPoint-WP/Settings.php:1000
msgid "Import Divisions from TouchPoint to your website as a taxonomy. These are used to classify users and involvements."
msgstr "Importe Divisiones desde TouchPoint a su sitio web como una taxonomÃa. Estos se utilizan para clasificar a los usuarios y las participaciones."
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:731
+#: src/TouchPoint-WP/Settings.php:1004
msgid "Division Name (Plural)"
msgstr "Nombre de la División (plural)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:732
+#: src/TouchPoint-WP/Settings.php:1005
msgid "What you call Divisions at your church"
msgstr "Lo que llamas Divisiones en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:742
+#: src/TouchPoint-WP/Settings.php:1016
msgid "Division Name (Singular)"
msgstr "Nombre de la División (Singular)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:743
+#: src/TouchPoint-WP/Settings.php:1017
msgid "What you call a Division at your church"
msgstr "Lo que llamas una división en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
+#: src/TouchPoint-WP/Settings.php:1028
msgid "Division Slug"
msgstr "Slug de División"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:754
+#: src/TouchPoint-WP/Settings.php:1029
msgid "The root path for the Division Taxonomy"
msgstr "La ruta raÃz para la TaxonomÃa de División"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
+#: src/TouchPoint-WP/Settings.php:1042
msgid "These Divisions will be imported for the taxonomy"
msgstr "Estas Divisiones se importarán para la taxonomÃa"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
+#: src/TouchPoint-WP/Settings.php:1093
msgid "Campuses"
msgstr "Campus"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:805
+#: src/TouchPoint-WP/Settings.php:1094
msgid "Import Campuses from TouchPoint to your website as a taxonomy. These are used to classify users and involvements."
msgstr "Importe Campus desde TouchPoint a su sitio web como una taxonomÃa. Estos se utilizan para clasificar a los usuarios y las participaciones."
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
+#: src/TouchPoint-WP/Settings.php:1101
msgid "Campus Name (Plural)"
msgstr "Nombre del Campus (Plural)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/Settings.php:1102
msgid "What you call Campuses at your church"
msgstr "Lo que llamas Campus en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/Settings.php:1113
msgid "Campus Name (Singular)"
msgstr "Nombre del Campus (Singular)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:824
+#: src/TouchPoint-WP/Settings.php:1114
msgid "What you call a Campus at your church"
msgstr "Lo que llamas un Campus en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:834
+#: src/TouchPoint-WP/Settings.php:1125
msgid "Campus Slug"
msgstr "Slug de Campus"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:835
+#: src/TouchPoint-WP/Settings.php:1126
msgid "The root path for the Campus Taxonomy"
-msgstr "El camino raÃz para la TaxonomÃa del Campus"
+msgstr "La ruta raÃz para la TaxonomÃa del Campus"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/Settings.php:1142
msgid "Resident Codes"
msgstr "Códigos de Residentes"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
+#: src/TouchPoint-WP/Settings.php:1143
msgid "Import Resident Codes from TouchPoint to your website as a taxonomy. These are used to classify users and involvements that have locations."
msgstr "Importe Códigos de Residentes desde TouchPoint a su sitio web como una taxonomÃa. Estos se utilizan para clasificar los usuarios y las participaciones que tienen ubicaciones."
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:854
+#: src/TouchPoint-WP/Settings.php:1147
msgid "Resident Code Name (Plural)"
msgstr "Nombre de Código de Tesidente (Plural)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/Settings.php:1148
msgid "What you call Resident Codes at your church"
msgstr "Lo que llamas Códigos de Residente en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/Settings.php:1159
msgid "Resident Code Name (Singular)"
msgstr "Nombre de Código de Residente (singular)"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
+#: src/TouchPoint-WP/Settings.php:1160
msgid "What you call a Resident Code at your church"
msgstr "Lo que llamas un Código de Residencia en tu iglesia"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:1171
msgid "Resident Code Slug"
msgstr "Slug de Código Residente"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
+#: src/TouchPoint-WP/Settings.php:1172
msgid "The root path for the Resident Code Taxonomy"
msgstr "La ruta raÃz para la TaxonomÃa del Código de Residente"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1034
+#: src/TouchPoint-WP/Settings.php:1348
msgid "password saved"
msgstr "contraseña guardada"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1090
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1091
+#: src/TouchPoint-WP/Settings.php:1402
+#: src/TouchPoint-WP/Settings.php:1403
msgid "TouchPoint-WP"
msgstr "TouchPoint-WP"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/Settings.php:1451
+#: blocks/inv-list/index.js:127
msgid "Settings"
msgstr "Ajustes"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1351
+#: src/TouchPoint-WP/Settings.php:1700
msgid "Script Update Failed"
msgstr "Actualización de secuencia de comandos fallida"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1470
+#: src/TouchPoint-WP/Settings.php:1822
msgid "TouchPoint-WP Settings"
msgstr "Configuración de TouchPoint-WP"
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1521
+#: src/TouchPoint-WP/Settings.php:1873
msgid "Save Settings"
msgstr "Guardar ajustes"
-#: src/TouchPoint-WP/Person.php:1398
-#: src/TouchPoint-WP/Utilities.php:205
-#: assets/js/base-defer.js:18
+#: src/TouchPoint-WP/Person.php:1490
+#: src/TouchPoint-WP/Utilities.php:299
+#: assets/js/base-defer.js:20
msgid "and"
msgstr "y"
-#: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1154
+#: assets/js/base-defer.js:215
+#: assets/js/base-defer.js:1148
msgid "Your Location"
msgstr "Tu ubicación"
-#: assets/js/base-defer.js:229
+#: assets/js/base-defer.js:236
msgid "User denied the request for Geolocation."
msgstr "El usuario denegó la solicitud de geolocalización."
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:240
msgid "Location information is unavailable."
msgstr "La información de ubicación no está disponible."
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:244
msgid "The request to get user location timed out."
msgstr "Se agotó el tiempo de espera de la solicitud para obtener la ubicación del usuario."
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:248
msgid "An unknown error occurred."
msgstr "Un error desconocido ocurrió."
-#: assets/js/base-defer.js:277
-#: assets/js/base-defer.js:287
+#: assets/js/base-defer.js:284
+#: assets/js/base-defer.js:294
msgid "No geolocation option available."
msgstr "No hay opción de geolocalización disponible."
-#: assets/js/base-defer.js:917
-#: assets/js/base-defer.js:954
-#: assets/js/base-defer.js:1411
-#: assets/js/meeting-defer.js:183
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1406
+#: assets/js/meeting-defer.js:211
msgid "Something strange happened."
msgstr "Algo extraño sucedió."
-#: assets/js/base-defer.js:943
-#: assets/js/base-defer.js:1400
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:1395
msgid "Your message has been sent."
msgstr "Tu mensaje ha sido enviado."
-#: assets/js/base-defer.js:983
+#: assets/js/base-defer.js:1000
msgid "Who is joining the group?"
msgstr "¿Quién se une al grupo?"
-#: assets/js/base-defer.js:988
-#: assets/js/base-defer.js:1046
-#: assets/js/base-defer.js:1362
-#: assets/js/base-defer.js:1455
-#: assets/js/meeting-defer.js:225
+#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1357
+#: assets/js/base-defer.js:1450
+#: assets/js/meeting-defer.js:253
msgid "Cancel"
msgstr "Cancelar"
-#: assets/js/base-defer.js:1001
+#: assets/js/base-defer.js:1018
msgid "Select who should be added to the group."
msgstr "Seleccione quién debe agregarse al grupo."
-#: assets/js/base-defer.js:1039
-#: assets/js/base-defer.js:1355
+#: assets/js/base-defer.js:1052
+#: assets/js/base-defer.js:1350
msgid "From"
msgstr "De"
-#: assets/js/base-defer.js:1040
-#: assets/js/base-defer.js:1356
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1351
msgid "Message"
msgstr "Mensaje"
-#: assets/js/base-defer.js:1055
-#: assets/js/base-defer.js:1371
+#: assets/js/base-defer.js:1068
+#: assets/js/base-defer.js:1366
msgid "Please provide a message."
msgstr "Proporcione un mensaje."
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1142
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1136
msgid "We don't know where you are."
msgstr "No sabemos dónde estás."
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1150
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1144
msgid "Click here to use your actual location."
msgstr "Haga clic aquà para usar su ubicación real."
-#: assets/js/base-defer.js:1301
-#: assets/js/base-defer.js:1318
+#: assets/js/base-defer.js:1296
+#: assets/js/base-defer.js:1313
msgid "clear"
msgstr "borrar"
-#: assets/js/base-defer.js:1307
+#: assets/js/base-defer.js:1302
msgid "Other Relatives..."
msgstr "Otros familiares..."
-#: assets/js/base-defer.js:1445
+#: assets/js/base-defer.js:1440
msgid "Tell us about yourself."
msgstr "Dinos sobre ti."
-#: assets/js/base-defer.js:1447
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1442
+#: assets/js/base-defer.js:1497
msgid "Email Address"
msgstr "Correo electrónico"
-#: assets/js/base-defer.js:1448
-#: assets/js/base-defer.js:1503
+#: assets/js/base-defer.js:1443
+#: assets/js/base-defer.js:1498
msgid "Zip Code"
msgstr "Condigo postal"
-#: assets/js/base-defer.js:1500
+#: assets/js/base-defer.js:1495
msgid "Our system doesn't recognize you,Wordpress Plugin - Modern Tribe (regardless of which provider you're using above) and use this url:"
+msgstr "Para usar sus eventos del Calendario de eventos en la aplicación móvil personalizada, configure el Proveedor en Wordpress Plugin - Modern Tribe (independientemente del proveedor que esté utilizando anteriormente) y use esta URL:"
+
+#: src/TouchPoint-WP/Settings.php:848
+msgid "Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe."
+msgstr "Integre la versión 2.0 de la aplicación móvil personalizada con el calendario de eventos de Modern Tribe."
+
+#. Translators: %s is the singular name of the of a Meeting, such as "Event".
+#: src/templates/involvement-single.php:49
+#, php-format
+msgid "This %s has been Cancelled."
+msgstr "Este %s ha sido Cancelado."
+
+#: src/templates/admin/invKoForm.php:210
+#: blocks/inv-list/index.js:143
+msgid "Division"
+msgstr "Division"
+
+#: src/templates/admin/invKoForm.php:217
+msgid "Resident Code"
+msgstr "Código de Residente"
+
+#: src/templates/admin/invKoForm.php:224
+msgid "Campus"
+msgstr "Campus"
+
+#: src/TouchPoint-WP/Involvement.php:1042
+msgid "All Day"
+msgstr "todo el dia"
+
+#: src/TouchPoint-WP/Utilities.php:304
+msgctxt "list of items, and *others*"
+msgid "others"
+msgstr "otros"
+
+#: src/TouchPoint-WP/Settings.php:480
+msgid "ipapi.co API Key"
+msgstr "Clave API de ipapi.co"
+
+#: src/TouchPoint-WP/Settings.php:481
+msgid "Optional. Allows for geolocation of user IP addresses. This generally will work without a key, but may be rate limited."
+msgstr "Opcional. Permite la geolocalización de las direcciones IP de los usuarios. Por lo general, esto funcionará sin una clave, pero puede tener una frecuencia limitada."
+
+#: src/templates/admin/invKoForm.php:60
+msgid "Import Campuses"
+msgstr "Importar Campus"
+
+#: src/templates/admin/invKoForm.php:67
+msgid "All Campuses"
+msgstr "Todos los campus"
+
+#: src/templates/admin/invKoForm.php:71
+msgid "(No Campus)"
+msgstr "(Sin campus)"
+
+#: src/TouchPoint-WP/StatusWidget.php:41
+msgid "TouchPoint-WP Status"
+msgstr "Estado de TouchPoint-WP"
+
+#: src/TouchPoint-WP/StatusWidget.php:98
+msgid "Imported"
+msgstr "Importadas"
+
+#: src/TouchPoint-WP/StatusWidget.php:99
+msgid "Last Updated"
+msgstr "Actualizada"
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:130
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+msgid "Yesterday"
+msgstr "Ayer"
+
+#: src/TouchPoint-WP/Settings.php:952
+msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
+msgstr "Las reuniones con más de esta cantidad de dÃas en el pasado ya no se actualizarán desde TouchPoint, lo que le permitirá conservar información histórica de eventos en el calendario para referencia, incluso si reutiliza y actualiza la información en Participación."
+
+#: src/TouchPoint-WP/Settings.php:491
+msgid "List Site in Directory"
+msgstr "Listar sitio en directorio"
+
+#: src/TouchPoint-WP/Settings.php:492
+msgid "Allow the TouchPoint-WP developers to publicly list your site/church as using TouchPoint-WP. Helps other prospective churches see what can be done by combining WordPress with the best ChMS on the planet. Only applies if this site is accessible on the public internet."
+msgstr "Permita que los desarrolladores de TouchPoint-WP incluyan públicamente su sitio o iglesia como sitios que usan TouchPoint-WP. Esto ayuda a otras iglesias potenciales a ver lo que se puede hacer al combinar WordPress con el mejor ChMS del planeta. Solo se aplica si este sitio es accesible en Internet público."
+
+#. translators: %s is "what you call TouchPoint at your church", which is a setting
+#: src/TouchPoint-WP/Auth.php:135
+#, php-format
+msgid "Sign in with %s"
+msgstr "Iniciar sesión con %s"
+
+#: src/TouchPoint-WP/Auth.php:437
+msgid "No user account found."
+msgstr "No se encontró ninguna cuenta de usuario"
+
+#: src/TouchPoint-WP/Settings.php:965
+msgid "Meetings will be kept on the calendar until the event is this many days in the past. Once an event is older than this, it'll be deleted. Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
+msgstr "Las reuniones se mantendrán en el calendario hasta que el evento tenga esta cantidad de dÃas. Si un evento tiene más de esta cantidad, se eliminará. Se recomienda encarecidamente tener poco historial (menos de un mes) o mucho (al menos 15 meses)."
+
+#: src/TouchPoint-WP/Settings.php:611
+msgid "Change Profile Links"
+msgstr "Cambiar enlaces de perfil"
+
+#: src/TouchPoint-WP/TouchPointWP.php:2405
+msgid "People Count Failed"
+msgstr "El recuento de personas falló"
+
+#: src/templates/admin/invKoForm.php:109
+#: src/TouchPoint-WP/Settings.php:979
+msgid "Collect Meetings for Larger Events"
+msgstr "Recopilar reuniones para eventos más grandes"
+
+#: src/templates/admin/invKoForm.php:113
+#: src/TouchPoint-WP/Settings.php:983
+msgid "No Collecting"
+msgstr "sin recoger"
+
+#: src/templates/admin/invKoForm.php:114
+#: src/TouchPoint-WP/Settings.php:984
+msgid "Collect Meetings only from Involvements without Schedules"
+msgstr "Recopilar reuniones solo de participaciones sin horarios"
+
+#: src/templates/admin/invKoForm.php:115
+#: src/TouchPoint-WP/Settings.php:988
+msgid "Collect Meetings for all Involvements"
+msgstr "Recopilar reuniones solo de participaciones sin horarios"
+
+#: src/templates/admin/invKoForm.php:117
+#: src/TouchPoint-WP/Settings.php:980
+msgid "Allows multiple meetings that are part of one larger event to be grouped together, such as sessions within a conference. For meetings to be collected, they must be in the same involvement and must not have gaps between them larger than 23 hours."
+msgstr "Permite agrupar varias reuniones que forman parte de un evento mayor, como las sesiones de una conferencia. Para que se recopilen, las reuniones deben estar relacionadas con la misma actividad y no deben tener intervalos superiores a 23 horas entre ellas."
+
+#: blocks/inv-list/index.js:25
+msgid "Involvement List"
+msgstr "Lista de Participaciones"
+
+#: blocks/inv-list/index.js:27
+msgid "A list of Involvements from TouchPoint"
+msgstr "Una lista de participaciones de TouchPoint"
+
+#: blocks/inv-list/index.js:81
+msgid "All"
+msgstr "Todos"
+
+#: blocks/inv-list/index.js:135
+msgid "Post Type"
+msgstr "tipo de publicación"
+
+#: blocks/inv-list/block.json
+msgctxt "block title"
+msgid "Involvement List"
+msgstr "Lista de Participaciones"
+
+#: blocks/inv-list/block.json
+msgctxt "block description"
+msgid "A list of Involvements from TouchPoint"
+msgstr "Una lista de participaciones de TouchPoint"
+
+#: src/TouchPoint-WP/Involvement.php:1680
+msgid "None right now."
+msgstr "Nada por ahora"
+
+#: blocks/inv-list/index.js:130
+msgid "To use this block, import Involvements in the TouchPoint-WP settings."
+msgstr "Para utilizar este bloque, importe Involvements en la configuración de TouchPoint-WP."
+
+#: blocks/inv-list/index.js:154
+msgid "Preview Only"
+msgstr "Solo vista previa"
diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot
index a748c21d..aa1fff7a 100644
--- a/i18n/TouchPoint-WP.pot
+++ b/i18n/TouchPoint-WP.pot
@@ -1,198 +1,263 @@
-# Copyright (C) 2024 James K
+# Copyright (C) 2025 James K
# This file is distributed under the AGPLv3+.
msgid ""
msgstr ""
-"Project-Id-Version: TouchPoint WP 0.0.37\n"
+"Project-Id-Version: TouchPoint WP 0.0.96\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n"
"Last-Translator: FULL NAME Wordpress Plugin - Modern Tribe and use this url:"
+#: src/TouchPoint-WP/Settings.php:866
+msgid "To use your Events Calendar events in the Custom mobile app, set the Provider to Wordpress Plugin - Modern Tribe (regardless of which provider you're using above) and use this url:"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:700
+#: src/TouchPoint-WP/Settings.php:868
msgid "Preview"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:715
+#: src/TouchPoint-WP/Settings.php:883
msgid "Use Standardizing Stylesheet"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:716
+#: src/TouchPoint-WP/Settings.php:884
msgid "Inserts some basic CSS into the events feed to clean up display"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:726
+#: src/TouchPoint-WP/Settings.php:896
+msgid "Meeting Calendars"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:897
+msgid "Import Meetings from TouchPoint to a calendar on your website."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:901
+msgid "Meeting Name (Plural)"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:902
+msgid "What you call Meetings at your church"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
+msgid "Meetings"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:907
+#: src/TouchPoint-WP/Settings.php:909
+msgid "Events"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:913
+msgid "Meeting Name (Singular)"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:914
+msgid "What you call a Meeting at your church"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
+msgid "Meeting"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:919
+#: src/TouchPoint-WP/Settings.php:921
+msgid "Event"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:925
+msgid "Meetings Slug"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:926
+msgid "The root path for Meetings"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:938
+msgid "Days of Future"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:939
+msgid "Meetings more than this many days in the future will not be imported."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:951
+msgid "Archive After Days"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:952
+msgid "Meetings more than this many days in the past will no longer update from TouchPoint, allowing you to keep some historical event information on the calendar for reference, even if you reuse and update the information in the Involvement."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:964
+msgid "Days of History"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:965
+msgid "Meetings will be kept on the calendar until the event is this many days in the past. Once an event is older than this, it'll be deleted. Strongly recommend either very little history (less than a month) or a lot of history (at least 15 months)."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:999
msgid "Divisions"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:727
+#: src/TouchPoint-WP/Settings.php:1000
msgid "Import Divisions from TouchPoint to your website as a taxonomy. These are used to classify users and involvements."
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:731
+#: src/TouchPoint-WP/Settings.php:1004
msgid "Division Name (Plural)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:732
+#: src/TouchPoint-WP/Settings.php:1005
msgid "What you call Divisions at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:742
+#: src/TouchPoint-WP/Settings.php:1016
msgid "Division Name (Singular)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:743
+#: src/TouchPoint-WP/Settings.php:1017
msgid "What you call a Division at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:753
+#: src/TouchPoint-WP/Settings.php:1028
msgid "Division Slug"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:754
+#: src/TouchPoint-WP/Settings.php:1029
msgid "The root path for the Division Taxonomy"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:766
+#: src/TouchPoint-WP/Settings.php:1042
msgid "These Divisions will be imported for the taxonomy"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:779
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:785
+#: src/TouchPoint-WP/Settings.php:1053
+#: src/TouchPoint-WP/Settings.php:1184
+msgid "Post Types"
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:1054
+msgid "Select post types which should have Divisions available as a native taxonomy."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:1068
+#: src/TouchPoint-WP/Settings.php:1074
msgid "Locations"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:780
+#: src/TouchPoint-WP/Settings.php:1069
msgid "Locations are physical places, probably campuses. None are required, but they can help present geographic information clearly."
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:804
+#: src/TouchPoint-WP/Settings.php:1093
msgid "Campuses"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:805
+#: src/TouchPoint-WP/Settings.php:1094
msgid "Import Campuses from TouchPoint to your website as a taxonomy. These are used to classify users and involvements."
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:812
+#: src/TouchPoint-WP/Settings.php:1101
msgid "Campus Name (Plural)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:813
+#: src/TouchPoint-WP/Settings.php:1102
msgid "What you call Campuses at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:823
+#: src/TouchPoint-WP/Settings.php:1113
msgid "Campus Name (Singular)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:824
+#: src/TouchPoint-WP/Settings.php:1114
msgid "What you call a Campus at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:834
+#: src/TouchPoint-WP/Settings.php:1125
msgid "Campus Slug"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:835
+#: src/TouchPoint-WP/Settings.php:1126
msgid "The root path for the Campus Taxonomy"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:849
+#: src/TouchPoint-WP/Settings.php:1142
msgid "Resident Codes"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:850
+#: src/TouchPoint-WP/Settings.php:1143
msgid "Import Resident Codes from TouchPoint to your website as a taxonomy. These are used to classify users and involvements that have locations."
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:854
+#: src/TouchPoint-WP/Settings.php:1147
msgid "Resident Code Name (Plural)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:855
+#: src/TouchPoint-WP/Settings.php:1148
msgid "What you call Resident Codes at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:865
+#: src/TouchPoint-WP/Settings.php:1159
msgid "Resident Code Name (Singular)"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:866
+#: src/TouchPoint-WP/Settings.php:1160
msgid "What you call a Resident Code at your church"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:876
+#: src/TouchPoint-WP/Settings.php:1171
msgid "Resident Code Slug"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:877
+#: src/TouchPoint-WP/Settings.php:1172
msgid "The root path for the Resident Code Taxonomy"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1034
+#: src/TouchPoint-WP/Settings.php:1185
+msgid "Select post types which should have Resident Codes available as a native taxonomy."
+msgstr ""
+
+#: src/TouchPoint-WP/Settings.php:1348
msgid "password saved"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1090
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1091
+#: src/TouchPoint-WP/Settings.php:1402
+#: src/TouchPoint-WP/Settings.php:1403
msgid "TouchPoint-WP"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1122
+#: src/TouchPoint-WP/Settings.php:1451
+#: blocks/inv-list/index.js:127
msgid "Settings"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1351
+#: src/TouchPoint-WP/Settings.php:1700
msgid "Script Update Failed"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1470
+#: src/TouchPoint-WP/Settings.php:1822
msgid "TouchPoint-WP Settings"
msgstr ""
-#: src/TouchPoint-WP/TouchPointWP_Settings.php:1521
+#: src/TouchPoint-WP/Settings.php:1873
msgid "Save Settings"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:69
+#: src/TouchPoint-WP/StatusWidget.php:41
+msgid "TouchPoint-WP Status"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:98
+msgid "Imported"
+msgstr ""
+
+#: src/TouchPoint-WP/StatusWidget.php:99
+msgid "Last Updated"
+msgstr ""
+
+#. translators: %s: taxonomy name, plural
+#: src/TouchPoint-WP/Taxonomies.php:51
+#, php-format
+msgid "Search %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, plural
+#: src/TouchPoint-WP/Taxonomies.php:53
+#, php-format
+msgid "All %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:55
+#, php-format
+msgid "Edit %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:57
+#, php-format
+msgid "Update %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:59
+#, php-format
+msgid "Add New %s"
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:61
+#, php-format
+msgid "New %s"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:651
+msgid "Classify posts by their general locations."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:680
+msgid "Classify posts by their church campus."
+msgstr ""
+
+#. translators: %s: taxonomy name, singular
+#: src/TouchPoint-WP/Taxonomies.php:711
+#, php-format
+msgid "Classify things by %s."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:742
+msgid "Classify involvements by the day on which they meet."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:743
+msgid "Weekdays"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:769
+msgid "Classify involvements by tense (present, future, past)"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:773
+msgid "Tense"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:773
+msgid "Tenses"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:796
+msgid "Classify involvements by the portion of the day in which they meet."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:802
+msgid "Times of Day"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:828
+msgid "Classify involvements and users by their age groups."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:831
+msgid "Age Groups"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:857
+msgid "Classify involvements by whether participants are mostly single or married."
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:863
+msgid "Marital Statuses"
+msgstr ""
+
+#: src/TouchPoint-WP/Taxonomies.php:896
+msgid "Classify Partners by category chosen in settings."
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:278
+msgid "Every 15 minutes"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2146
+msgid "Unknown Type"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2203
+msgid "Your Searches"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2206
+msgid "Public Searches"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2209
+msgid "Status Flags"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2214
+#: src/TouchPoint-WP/TouchPointWP.php:2215
+msgid "Current Value"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2405
+msgid "People Count Failed"
+msgstr ""
+
+#: src/TouchPoint-WP/TouchPointWP.php:2429
+msgid "People Query Failed"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities.php:149
msgctxt "e.g. event happens weekly on..."
msgid "Sundays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:70
+#: src/TouchPoint-WP/Utilities.php:150
msgctxt "e.g. event happens weekly on..."
msgid "Mondays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:71
+#: src/TouchPoint-WP/Utilities.php:151
msgctxt "e.g. event happens weekly on..."
msgid "Tuesdays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:72
+#: src/TouchPoint-WP/Utilities.php:152
msgctxt "e.g. event happens weekly on..."
msgid "Wednesdays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:73
+#: src/TouchPoint-WP/Utilities.php:153
msgctxt "e.g. event happens weekly on..."
msgid "Thursdays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:74
+#: src/TouchPoint-WP/Utilities.php:154
msgctxt "e.g. event happens weekly on..."
msgid "Fridays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:75
+#: src/TouchPoint-WP/Utilities.php:155
msgctxt "e.g. event happens weekly on..."
msgid "Saturdays"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:111
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:201
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Sun"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:112
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:202
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Mon"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:113
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:203
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Tue"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:114
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:204
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Wed"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:115
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:205
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Thu"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:116
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:206
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Fri"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:117
-msgctxt "e.g. event happens weekly on..."
+#: src/TouchPoint-WP/Utilities.php:207
+msgctxt "e.g. \"Event happens weekly on...\" or \"This ...\""
msgid "Sat"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:161
+#: src/TouchPoint-WP/Utilities.php:249
msgctxt "Time of Day"
msgid "Late Night"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:163
+#: src/TouchPoint-WP/Utilities.php:251
msgctxt "Time of Day"
msgid "Early Morning"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:165
+#: src/TouchPoint-WP/Utilities.php:253
msgctxt "Time of Day"
msgid "Morning"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:167
+#: src/TouchPoint-WP/Utilities.php:255
msgctxt "Time of Day"
msgid "Midday"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:169
+#: src/TouchPoint-WP/Utilities.php:257
msgctxt "Time of Day"
msgid "Afternoon"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:171
+#: src/TouchPoint-WP/Utilities.php:259
msgctxt "Time of Day"
msgid "Evening"
msgstr ""
-#: src/TouchPoint-WP/Utilities.php:173
+#: src/TouchPoint-WP/Utilities.php:261
msgctxt "Time of Day"
msgid "Night"
msgstr ""
-#: assets/js/base-defer.js:208
-#: assets/js/base-defer.js:1154
+#: src/TouchPoint-WP/Utilities.php:304
+msgctxt "list of items, and *others*"
+msgid "others"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities.php:513
+msgid "Expand"
+msgstr ""
+
+#. translators: %1$s is the start date/time, %2$s is the end date/time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:89
+#: src/TouchPoint-WP/Utilities/DateFormats.php:331
+#, php-format
+msgid "%1$s – %2$s"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:119
+#: src/TouchPoint-WP/Utilities/DateFormats.php:194
+msgid "Tonight"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:121
+#: src/TouchPoint-WP/Utilities/DateFormats.php:196
+msgid "Today"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:128
+#: src/TouchPoint-WP/Utilities/DateFormats.php:203
+msgid "Tomorrow"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:130
+#: src/TouchPoint-WP/Utilities/DateFormats.php:205
+msgid "Yesterday"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:137
+msgctxt "Date string for day of the week, when the year is current."
+msgid "l"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:138
+msgctxt "Date string when the year is current."
+msgid "F j"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:140
+msgctxt "Date string for day of the week, when the year is not current."
+msgid "l"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:141
+msgctxt "Date string when the year is not current."
+msgid "F j, Y"
+msgstr ""
+
+#. translators: %1$s is "Monday". %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:147
+#, php-format
+msgctxt "Date format string"
+msgid "Last %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Monday". %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:153
+#, php-format
+msgctxt "Date format string"
+msgid "This %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Monday". %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:159
+#, php-format
+msgctxt "Date format string"
+msgid "Next %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Monday". %2$s is "January 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:164
+#, php-format
+msgctxt "Date format string"
+msgid "%1$s, %2$s"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:211
+msgctxt "Short date string for day of the week, when the year is current."
+msgid "D"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:212
+msgctxt "Short date string when the year is current."
+msgid "M j"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:214
+msgctxt "Short date string for day of the week, when the year is not current."
+msgid "D"
+msgstr ""
+
+#: src/TouchPoint-WP/Utilities/DateFormats.php:215
+msgctxt "Short date string when the year is not current."
+msgid "M j, Y"
+msgstr ""
+
+#. translators: %1$s is "Mon". %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:221
+#, php-format
+msgctxt "Short date format string"
+msgid "Last %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon". %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:227
+#, php-format
+msgctxt "Short date format string"
+msgid "This %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon". %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:233
+#, php-format
+msgctxt "Short date format string"
+msgid "Next %1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is "Mon". %2$s is "Jan 1".
+#: src/TouchPoint-WP/Utilities/DateFormats.php:238
+#, php-format
+msgctxt "Short date format string"
+msgid "%1$s, %2$s"
+msgstr ""
+
+#. translators: %1$s is the start date, %2$s start time, %3$s is the end date, and %4$s end time.
+#: src/TouchPoint-WP/Utilities/DateFormats.php:364
+#, php-format
+msgid "%1$s at %2$s – %3$s at %4$s"
+msgstr ""
+
+#: assets/js/base-defer.js:215
+#: assets/js/base-defer.js:1148
msgid "Your Location"
msgstr ""
-#: assets/js/base-defer.js:229
+#: assets/js/base-defer.js:236
msgid "User denied the request for Geolocation."
msgstr ""
-#: assets/js/base-defer.js:233
+#: assets/js/base-defer.js:240
msgid "Location information is unavailable."
msgstr ""
-#: assets/js/base-defer.js:237
+#: assets/js/base-defer.js:244
msgid "The request to get user location timed out."
msgstr ""
-#: assets/js/base-defer.js:241
+#: assets/js/base-defer.js:248
msgid "An unknown error occurred."
msgstr ""
-#: assets/js/base-defer.js:277
-#: assets/js/base-defer.js:287
+#: assets/js/base-defer.js:284
+#: assets/js/base-defer.js:294
msgid "No geolocation option available."
msgstr ""
#. translators: %s is the name of an involvement, like a particular small group
-#: assets/js/base-defer.js:906
+#: assets/js/base-defer.js:923
+#, js-format
msgid "Added to %s"
msgstr ""
-#: assets/js/base-defer.js:909
-#: assets/js/base-defer.js:920
-#: assets/js/base-defer.js:946
-#: assets/js/base-defer.js:957
-#: assets/js/base-defer.js:1403
-#: assets/js/base-defer.js:1414
-#: assets/js/meeting-defer.js:175
-#: assets/js/meeting-defer.js:186
+#: assets/js/base-defer.js:926
+#: assets/js/base-defer.js:937
+#: assets/js/base-defer.js:963
+#: assets/js/base-defer.js:974
+#: assets/js/base-defer.js:1398
+#: assets/js/base-defer.js:1409
+#: assets/js/meeting-defer.js:203
+#: assets/js/meeting-defer.js:214
msgid "OK"
msgstr ""
-#: assets/js/base-defer.js:917
-#: assets/js/base-defer.js:954
-#: assets/js/base-defer.js:1411
-#: assets/js/meeting-defer.js:183
+#: assets/js/base-defer.js:934
+#: assets/js/base-defer.js:971
+#: assets/js/base-defer.js:1406
+#: assets/js/meeting-defer.js:211
msgid "Something strange happened."
msgstr ""
-#: assets/js/base-defer.js:943
-#: assets/js/base-defer.js:1400
+#: assets/js/base-defer.js:960
+#: assets/js/base-defer.js:1395
msgid "Your message has been sent."
msgstr ""
#. translators: %s is the name of an Involvement
-#: assets/js/base-defer.js:967
+#: assets/js/base-defer.js:984
+#, js-format
msgid "Join %s"
msgstr ""
-#: assets/js/base-defer.js:983
+#: assets/js/base-defer.js:1000
msgid "Who is joining the group?"
msgstr ""
-#: assets/js/base-defer.js:988
-#: assets/js/base-defer.js:1046
-#: assets/js/base-defer.js:1362
-#: assets/js/base-defer.js:1455
-#: assets/js/meeting-defer.js:225
+#: assets/js/base-defer.js:1005
+#: assets/js/base-defer.js:1059
+#: assets/js/base-defer.js:1357
+#: assets/js/base-defer.js:1450
+#: assets/js/meeting-defer.js:253
msgid "Cancel"
msgstr ""
-#: assets/js/base-defer.js:1001
+#: assets/js/base-defer.js:1018
msgid "Select who should be added to the group."
msgstr ""
#. translators: %s is the name of an involvement. This is a heading for a modal.
-#: assets/js/base-defer.js:1022
+#: assets/js/base-defer.js:1035
+#, js-format
msgid "Contact the Leaders of %s"
msgstr ""
-#: assets/js/base-defer.js:1039
-#: assets/js/base-defer.js:1355
+#: assets/js/base-defer.js:1052
+#: assets/js/base-defer.js:1350
msgid "From"
msgstr ""
-#: assets/js/base-defer.js:1040
-#: assets/js/base-defer.js:1356
+#: assets/js/base-defer.js:1053
+#: assets/js/base-defer.js:1351
msgid "Message"
msgstr ""
-#: assets/js/base-defer.js:1045
-#: assets/js/base-defer.js:1361
+#: assets/js/base-defer.js:1058
+#: assets/js/base-defer.js:1356
msgid "Send"
msgstr ""
-#: assets/js/base-defer.js:1055
-#: assets/js/base-defer.js:1371
+#: assets/js/base-defer.js:1068
+#: assets/js/base-defer.js:1366
msgid "Please provide a message."
msgstr ""
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1142
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1136
msgid "We don't know where you are."
msgstr ""
-#: assets/js/base-defer.js:1140
-#: assets/js/base-defer.js:1150
+#: assets/js/base-defer.js:1134
+#: assets/js/base-defer.js:1144
msgid "Click here to use your actual location."
msgstr ""
-#: assets/js/base-defer.js:1301
-#: assets/js/base-defer.js:1318
+#: assets/js/base-defer.js:1296
+#: assets/js/base-defer.js:1313
msgid "clear"
msgstr ""
-#: assets/js/base-defer.js:1307
+#: assets/js/base-defer.js:1302
msgid "Other Relatives..."
msgstr ""
#. translators: %s is a person's name. This is a heading for a contact modal.
-#: assets/js/base-defer.js:1338
+#: assets/js/base-defer.js:1333
+#, js-format
msgid "Contact %s"
msgstr ""
-#: assets/js/base-defer.js:1445
+#: assets/js/base-defer.js:1440
msgid "Tell us about yourself."
msgstr ""
-#: assets/js/base-defer.js:1447
-#: assets/js/base-defer.js:1502
+#: assets/js/base-defer.js:1442
+#: assets/js/base-defer.js:1497
msgid "Email Address"
msgstr ""
-#: assets/js/base-defer.js:1448
-#: assets/js/base-defer.js:1503
+#: assets/js/base-defer.js:1443
+#: assets/js/base-defer.js:1498
msgid "Zip Code"
msgstr ""
-#: assets/js/base-defer.js:1454
+#: assets/js/base-defer.js:1449
msgid "Next"
msgstr ""
-#: assets/js/base-defer.js:1488
+#: assets/js/base-defer.js:1483
msgid "Something went wrong."
msgstr ""
-#: assets/js/base-defer.js:1500
+#: assets/js/base-defer.js:1495
msgid "Our system doesn't recognize you,Request to $url
"; + } + + $r = $this->getHttpClient()->request( + $url, + [ + 'method' => 'GET', + 'headers' => [ + 'Authorization' => $this->getBasicAuth() + ], + 'timeout' => $timeout + ] + ); + + return self::parsePyApiResponse($r); + } + + + /** + * Do a POST to the Python-Defined API. + * + * @param string $command The thing to post + * @param ?mixed $data Data to post + * @param int $timeout Amount of time in sec to wait before timing out. + * @param float $timeTaken The time taken to complete the request. + * + * @return stdClass|array An object that corresponds to the Data python object in TouchPoint. + * @throws TouchPointWP_Exception If anything went wrong. + */ + public function pyPost(string $command, mixed $data = null, int $timeout = 5, float &$timeTaken = 0): array|stdClass + { + $this->checkApiValidity(); + + $host = $this->parent->host(); + + if ( ! $host) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception( + __("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002 + ); + } + + $data = json_encode(['inputData' => $data]); + + $url = $host . "/PythonApi/" . $this->settings()->api_script_name . "?" . http_build_query(['a' => $command]); + + self::$apiCallLog[] = $url; + $tik = microtime(true); + + $r = $this->getHttpClient()->request( + $url, + [ + 'method' => 'POST', + 'headers' => [ + 'Authorization' => 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass) + ], + 'body' => ['data' => $data], + 'timeout' => $timeout + ] + ); + + $timeTaken = microtime(true) - $tik; + + return self::parsePyApiResponse($r); + } + + + /** + * Prepares the request to be sent to the API. Handles common elements between all PAT requests. + * + * @param string $command The API endpoint to call + * @param mixed $headers Headers to send with the request. + * @param ?int $onBehalfPid The PID of the user to act on behalf of. + * + * @return string The URL to call. + * @throws TouchPointWP_Exception + */ + protected function prepareRequest(string $command, mixed &$headers, ?int $onBehalfPid): string + { + if (!is_array($headers)) { + $headers = (array)$headers; + } + + $this->checkApiValidity(); + $host = $this->parent->host(); + $url = $host . $command; + + self::$apiCallLog[] = $url; + + $headers['Authorization'] = 'PAT ' . $this->getPAT(); + + if (!isset($headers['Content-Type'])) { + $headers['Content-Type'] = 'text/plain'; + } + + if ($onBehalfPid) { + $headers['X-On-Behalf-Of'] = $onBehalfPid; + } + + return $url; + } + + + /** + * Do a GET to the standard API using a PAT. + * + * @param string $command The API endpoint to call + * @param array $parameters URL parameters to be added. + * @param array $headers Headers to send with the request. + * @param ?int $onBehalfPid The PID of the user to act on behalf of. + * @param int $timeout Amount of time in sec to wait before timing out. + * @param float $timeTaken The time taken to complete the request. + * + * @return array|WP_Error The response from the Http request call. + * @throws TouchPointWP_Exception If anything went wrong. + */ + public function get(string $command, array $parameters = [], array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error + { + $tik = microtime(true); + for ($attempt = 0; $attempt < 2; $attempt++) { + $url = $this->prepareRequest($command, $headers, $onBehalfPid); + + // build query string + if (!empty($parameters)) { + $url .= (!str_contains($url, '?') ? '?' : '&') . http_build_query($parameters); + } + + $r = $this->getHttpClient()->request( + $url, + [ + 'method' => 'GET', + 'headers' => $headers, + 'timeout' => $timeout + ] + ); + + if ($r instanceof WP_Error) { + return $r; + } + + if ($r['response']['code'] === Http::UNAUTHORIZED) { + //if unauthorized, cycle PAT + $this->cyclePAT(); + } elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) { + self::$allowApiCalls = false; + throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009); + } elseif ($r['response']['code'] === Http::OK) { + break; + } + } + + $timeTaken = microtime(true) - $tik; + + return $r; + } + + + /** + * Do a POST to the standard API using a PAT. + * + * @param string $command The API endpoint to call + * @param ?mixed $data Data to post + * @param array $headers Headers to send with the request. + * @param ?int $onBehalfPid The PID of the user to act on behalf of. + * @param int $timeout Amount of time in sec to wait before timing out. + * @param float $timeTaken The time taken to complete the request. + * + * @return array|WP_Error The response from the Http request call. + * @throws TouchPointWP_Exception If anything went wrong. + */ + public function post(string $command, mixed $data = null, array $headers = [], ?int $onBehalfPid = null, int $timeout = 5, float &$timeTaken = 0): array|WP_Error + { + $tik = microtime(true); + + for ($attempt = 0; $attempt < 2; $attempt++) { + $url = $this->prepareRequest($command, $headers, $onBehalfPid); + $r = $this->getHttpClient()->request( + $url, + [ + 'method' => 'POST', + 'headers' => $headers, + 'body' => $data, + 'timeout' => $timeout + ] + ); + + if ($r instanceof WP_Error) { + return $r; + } + + if ($r['response']['code'] === Http::UNAUTHORIZED) { + //if unauthorized, cycle PAT + $this->cyclePAT(); + } elseif ($r['response']['code'] === Http::TOO_MANY_REQUESTS) { + self::$allowApiCalls = false; + throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009); + } elseif ($r['response']['code'] === Http::OK) { + break; + } + } + + $timeTaken = microtime(true) - $tik; + + return $r; + } + + + /** + * Determine if PAT has not yet expired. + * + * @return bool + */ + protected function checkPATValidity(): bool + { + $expires = $this->settings()->api_pat_expires; + + if ($expires) { + $expires = strtotime($expires) - (60 * 60 * 24); // 1 day buffer + $now = time(); + + if ($now > $expires) { + return false; + } + } + + return true; + } + + + /** + * Gets the PAT token to use. Generates one if it doesn't exist. + * + * @throws TouchPointWP_Exception + */ + protected final function getPAT(): string + { + if (!$this->settings()->hasValidApiSettings()) { + throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001); + } + + if (!$this->settings()->api_pat) { + $this->cyclePAT(); + } + + if (!$this->checkPATValidity()) { + $this->cyclePAT(); + } + + return $this->settings()->api_pat; + } + + + /** + * Invalidate the existing PAT and get a new one. + * + * @return void + * @throws TouchPointWP_Exception + * @throws TouchPointWP_WPError + */ + protected final function cyclePAT(): void + { + $this->invalidatePAT(); + $this->getNewPAT(); + } + + + /** + * Invalidate the existing PAT, both here and on the server. + * + * @return void + */ + public final function invalidatePAT(): void + { + // get existing PAT + $pat = $this->settings()->api_pat; + $host = $this->parent->host(); + + // if existing PAT exists, send delete request to invalidate it on the server + if ($pat && $host) { + $url = $host . "/api/v1/Account/DeleteUserAccessToken"; + $this->getHttpClient()->request( + $url, + [ + 'method' => 'POST', + 'headers' => [ + 'Authorization' => 'Basic ' . base64_encode( + $this->settings()->api_user . ':' . $this->settings()->api_pass + ), + 'Content-Type' => 'text/plain' + ], + 'body' => $pat, + 'blocking' => false + ] + ); + } + + // remove it and the expiration date from the local settings + update_option('tp_api_pat', null); + update_option('tp_api_pat_expires', null); + } + + + /** + * Get a new PAT + * + * @throws TouchPointWP_Exception + * @throws TouchPointWP_WPError + */ + private function getNewPAT(): void + { + $host = $this->parent->host(); + + if ( ! $host) { + throw new TouchPointWP_Exception(__("Host appears to be missing from TouchPoint-WP configuration.", "TouchPoint-WP"), 170002); + } + + $url = $host . "/api/v1/Account/CreateUserAccessToken"; + + self::$apiCallLog[] = $url; + + $r = $this->getHttpClient()->request( + $url, + [ + 'method' => 'POST', + 'headers' => [ + 'Authorization' => 'Basic ' . base64_encode($this->settings()->api_user . ':' . $this->settings()->api_pass), + 'Content-Type' => 'text/plain' + ], + 'body' => Utilities::dateTimeNowPlus90D()->format("Y-m-d\TH:i:s"), + ] + ); + + if ($r instanceof WP_Error) { + throw new TouchPointWP_WPError($r); + } + + if ($r['response']['code'] !== 200) { + throw new TouchPointWP_Exception("Error Creating PAT: " . $r['response']['code'], 179006); + } + + $response = json_decode($r['body']); + + update_option('tp_api_pat', $response->personalAccessToken); + update_option('tp_api_pat_expires', $response->expirationDate ?? null); + + error_log("TouchPoint-WP INFO: PAT updated."); + } + + + /** + * @return WP_Http|null + */ + protected final function getHttpClient(): ?WP_Http + { + if ($this->httpClient === null) { + $this->httpClient = new WP_Http(); + } + + return $this->httpClient; + } + + + /** + * Check that we aren't hitting rate limits or have missing credentials. + * + * @throws TouchPointWP_Exception + */ + protected function checkApiValidity(): void + { + if ( ! $this->settings()->hasValidApiSettings()) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception(__("Invalid or incomplete API Settings.", "TouchPoint-WP"), 170001); + } + + if (!self::$allowApiCalls) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009); + } + + $mostCommon = ""; + if (count(self::$apiCallLog) > self::MAX_API_CALLS) { + if ($this->parent->debug) { + $counts = array_count_values(self::$apiCallLog); + arsort($counts); + $mostCommon = " Most Common: " . key($counts); + } + + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("Too many API calls have been attempted in this session.$mostCommon", 170009); + } + } + + + /** + * @param WP_Error|array $response + * + * @return stdClass|array + * @throws TouchPointWP_Exception + * @throws TouchPointWP_WPError + */ + private static function parsePyApiResponse(WP_Error|array $response): array|stdClass + { + if ($response instanceof WP_Error) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_WPError($response); + } + + if ($response['response']['code'] === 429) { + self::$allowApiCalls = false; + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("TouchPoint has received too many requests.", 170009); + } + + $respDecoded = json_decode($response['body']); + + if ($respDecoded === null) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("Connection Error", 179000); + } + + // Most likely the issue where a module import failed for no apparent reason. + if (property_exists($respDecoded, 'output') && + str_starts_with($respDecoded->output, "Traceback (most recent call last):")) { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179001); + } + + // Some other script error + if (property_exists($respDecoded, 'output') && $respDecoded->output !== '') { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception("Script error: " . $respDecoded->output, 179002); + } + + // Error caught by error handling within Python script + if (property_exists($respDecoded, 'message') && $respDecoded->message !== '') { + TouchPointWP::instance()->logoutServiceMaybe(); + throw new TouchPointWP_Exception($respDecoded->message, 179003); + } + + if ( ! property_exists($respDecoded->data, "VERSION") || $respDecoded->data->VERSION !== TouchPointWP::VERSION) { + if (in_array("updateScripts", $respDecoded->data->a ?? [])) { + if (class_exists("TouchPointWP_AdminAPI")) { + TouchPointWP_AdminAPI::showError( + __("The scripts on TouchPoint that interact with this plugin are out-of-date, and an automatic update failed.", "TouchPoint-WP") + ); + } + } else { + self::instance()->settings()->updateDeployedScripts(); + } + } + + return $respDecoded->data; + } +} \ No newline at end of file diff --git a/src/TouchPoint-WP/Auth.php b/src/TouchPoint-WP/Auth.php index a3feca0c..498ff472 100644 --- a/src/TouchPoint-WP/Auth.php +++ b/src/TouchPoint-WP/Auth.php @@ -5,6 +5,9 @@ namespace tp\TouchPointWP; +use Exception; +use tp\TouchPointWP\Interfaces\api; +use tp\TouchPointWP\Interfaces\module; use tp\TouchPointWP\Utilities\Http; use tp\TouchPointWP\Utilities\PersonQuery; use tp\TouchPointWP\Utilities\Session; @@ -16,25 +19,20 @@ } /** - * Allows users to login to WordPress with their TouchPoint credentials, and provides other user management + * Allows users to log in to WordPress with their TouchPoint credentials, and provides other user management * functionality. */ abstract class Auth implements api, module { - /** @const Number of seconds during which the user login tokens are valid. */ - protected const LOGIN_TIMEOUT_STANDARD = 30; + /** @noinspection SpellCheckingInspection */ + protected const LOGIN_PARAMETER = 'tptoken'; - /** @const How long until an API key needs to be replaced. */ - protected const API_KEY_TIMEOUT = 86400; - - /** @const number of seconds during which the login link is valid (amount of time before the login page (silently) expires). */ - protected const SESSION_TIMEOUT = 600; private static bool $_isLoaded = false; public static function init(): void { // Start the session - add_action('login_init', [self::class, 'startSession'], 10); +// add_action('login_init', [self::class, 'startSession'], 10); TODO remove // The authentication filter add_filter('authenticate', [self::class, 'authenticate'], 1, 3); @@ -54,10 +52,14 @@ public static function init(): void // If configured, bypass the login form and redirect straight to TouchPoint add_action('login_init', [self::class, 'redirectLoginFormMaybe'], 20); + // If configured, upon login, if no redirect is specified, redirect to the homepage + add_filter('login_redirect', [self::class, 'redirectLoginCompleteMaybe'], 10, 3); + // If configured, prevent admin bar from appearing for subscribers add_action('after_setup_theme', [self::class, 'removeAdminBarMaybe']); } + /** * Loads the module and initializes the other actions. * @@ -73,6 +75,9 @@ public static function load(): bool add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'init']); + // If configured, prevent user from accessing the admin area + add_action('admin_init', [self::class, 'preventAdminAccessMaybe']); + ////////////////// /// Shortcodes /// ////////////////// @@ -81,32 +86,17 @@ public static function load(): bool /// Syncing /// /////////////// - if (is_admin()) { - try { - self::createApiKeyIfNeeded(); - } catch (TouchPointWP_Exception $e) { - } - } - return true; } - /** - * Starts a new session. - */ - public static function startSession() - { - Session::startSession(); - } /** * Clear variables and potentially create a flag for the logout of TouchPoint. - * - * Does NOT actually log out of WordPress as this should be called by wp_logout, which accomplishes that. */ - public static function logout() + public static function logout(): void { - Session::sessionDestroy(); + wp_set_current_user(0); + $tpwp = TouchPointWP::instance(); if ($tpwp->settings->auth_full_logout === "on") { $redir = $tpwp->host() . '/PyScript/' . $tpwp->settings->api_script_name . '?' . http_build_query([ @@ -114,56 +104,49 @@ public static function logout() 'a' => "logout" ]); - wp_redirect($redir, 307); + wp_redirect($redir, Http::SEE_OTHER_TEMP); exit; } } + /** * Placeholder for automatic login. + * + * TODO: this */ public static function footer() { // echo to print in footer } + /** * Renders the link used to log in through TouchPoint. */ - public static function printLoginLink() + public static function printLoginLink(): void { - $html = ''; + $html = '
'; + $url = self::getLoginUrl(); /** @noinspection HtmlUnknownTarget */ - $html .= ''; + $html .= ""; $html .= sprintf( - // translators: %s is "what you call TouchPoint at your church", which is a setting - __('Sign in with your %s account', 'TouchPoint-WP'), + // translators: %s is "what you call TouchPoint at your church", which is a setting + __('Sign in with %s', 'TouchPoint-WP'), htmlentities(TouchPointWP::instance()->settings->system_name) ); - printf( - $html, - self::getLoginUrl() - ); + $html .= '
'; + echo $html; } + /** * Generates the URL used to initiate a sign-in with TouchPoint. * * @return string The authorization URL used for a TouchPoint login. - * @noinspection SpellCheckingInspection */ public static function getLoginUrl(): string { - try { - self::createApiKeyIfNeeded(); - } catch (TouchPointWP_Exception $e) { - } - - $antiforgeryId = self::generateAntiForgeryId(); - - $s = Session::instance(); - $s->auth_sessionToken = $antiforgeryId; - $tpwp = TouchPointWP::instance(); $redirectTo = $_GET['redirect_to'] ?? get_site_url(); @@ -171,129 +154,124 @@ public static function getLoginUrl(): string return $tpwp->host() . '/PyScript/' . $tpwp->settings->api_script_name . '?' . http_build_query( [ 'r' => $redirectTo, - 'sToken' => $antiforgeryId, 'a' => "login" ] ); } + /** - * Get a random string with a timestamp on the end. - * - * @return string + * Determines whether to redirect to the TouchPoint login automatically, and does so if appropriate. */ - public static function generateAntiForgeryId(): string + public static function redirectLoginFormMaybe(): void { - return strtolower(substr(Utilities::createGuid(), 0, 36) . "-" . dechex(time())); + $redirect = TouchPointWP::instance()->settings->auth_default === 'on'; + /** + * Controls whether to redirect to the TouchPoint login automatically. + * + * @param bool $redirect Value preset from setting TouchPoint login as default. + */ + $redirect = apply_filters('tp_auto_redirect_login', $redirect); + + if (isset($_GET[TouchPointWP::HOOK_PREFIX . 'no_redirect'])) { + $redirect = false; + } + + if (self::wantsToLogin() && $redirect && $_SERVER['REQUEST_METHOD'] === "GET") { + wp_redirect(self::getLoginUrl(), Http::SEE_OTHER_TEMP); + exit(); + } } + /** - * @param ?string $key The api key to test against. If no key is provided, validates the saved key. - * @param ?string $host The http hostname to use for this key. Will use $_SERVER['HTTP_HOST'] if no value is - * provided. - * - * @return string|bool - * Returns true if the key is valid. - * Returns false is the key is invalid. - * Returns a new key if the provided key is valid, but expired. (Does not send it to the server -- that needs to be - * handled separately.) + * Determines whether to redirect to allow the user to continue to the destination page after logging in. */ - public static function validateApiKey(string $key = null, string $host = null) + public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $requested_redirect_to = null, WP_User|WP_Error|null $user = null): string { - if ($host === null) { - $host = $_SERVER['HTTP_HOST']; + if (!is_a($user, 'WP_User')) { + return $redirect_to; } - $host = str_replace('.', '_', $host); - $tpwp = TouchPointWP::instance(); + $redirect = TouchPointWP::instance()->settings->auth_change_profile_urls === 'on'; + $redirect &= !TouchPointWP::userHasEditingPermissions(); - $k = $tpwp->settings->get('api_key_' . $host); - if ($k === false) { - return self::replaceApiKey($host); - } - - if ($key !== null && $key !== $k) { - return false; - } + /** + * Controls whether to redirect to the TouchPoint login automatically. + * + * @param bool $redirect Value preset from setting TouchPoint login as default. + */ + $redirect = apply_filters('tp_redirect_after_login', $redirect); - if ( ! self::AntiForgeryTimestampIsValid($k, self::API_KEY_TIMEOUT)) { - return self::replaceApiKey($host); + // if there is no defined redirect page, redirect to the home page + if ($redirect && (!isset($_GET['redirect_to']) || $_GET['redirect_to'] == '')) { + return home_url(); } - return true; + return $redirect_to; } + /** - * Generates a key and saves it. - * - * @param $host - * - * @return string + * Prevents the admin bar from being displayed for users who can't edit or change anything. */ - public static function replaceApiKey($host): string + public static function removeAdminBarMaybe(): void { - $tpwp = TouchPointWP::instance(); - $host = str_replace('.', '_', $host); + $removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on') + && !is_admin() + && !current_user_can('edit_posts'); - $key = Auth::generateAntiForgeryId(); - $tpwp->settings->set('api_key_' . $host, $key); + /** + * Allows for hiding the WordPress-provided Admin bar. + * + * @param bool $removeBar True if bar should be removed. + */ + $removeBar = apply_filters('tp_prevent_admin_bar', $removeBar); - return $key; + if ($removeBar) { + show_admin_bar(false); + } } + /** + * Prevents access to the WordPress admin area for users who can't edit or change anything. + * * @return void - * @throws TouchPointWP_Exception */ - private static function createApiKeyIfNeeded(): void + public static function preventAdminAccessMaybe(): void { - $host = $_SERVER['HTTP_HOST']; - $k = self::validateApiKey(null, $host); // will return true or a new key. + $preventAdmin = (TouchPointWP::instance()->settings->auth_change_profile_urls === 'on') + && is_admin() // means: request is in the admin area, not that user is an admin. + && !TouchPointWP::userHasEditingPermissions(); - if ($k !== true) { // Only if the saved key is unset or invalid. ( - TouchPointWP::instance()->apiPost("auth_key_set", [ - 'apiKey' => $k, - 'host' => $host - ]); - } - } - /** - * Determines whether to redirect to the TouchPoint login automatically, and does so if appropriate. - */ - public static function redirectLoginFormMaybe() - { - $redirect = apply_filters( - TouchPointWP::HOOK_PREFIX . 'auto_redirect_login', - (TouchPointWP::instance()->settings->auth_default === 'on') - ); + $destination = null; - if (isset($_GET[TouchPointWP::HOOK_PREFIX . 'no_redirect'])) { - $redirect = false; + if ($preventAdmin) { + // if profile.php, redirect to the profile page + if (isset($_SERVER['REQUEST_URI']) && str_contains($_SERVER['REQUEST_URI'], 'profile.php')) { + $destination = self::getProfileUrl(); + } else { + // otherwise, redirect to the home page + $destination = home_url(); + } } - if (self::wantsToLogin() && $redirect && $_SERVER['REQUEST_METHOD'] === "GET") { - wp_redirect(self::getLoginUrl(), 307); - die(); - } - } + /** + * Allows for preventing access to the WordPress admin area. + * + * @param ?string $destination The url to which the user should be redirected, or null to allow default behavior. + */ + $destination = apply_filters('tp_admin_area_redirect', $destination); - /** - * Prevents the admin bar from being displayed for users who can't edit or change anything. - */ - public static function removeAdminBarMaybe() - { - $removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on') - && ! is_admin() - && ! current_user_can('edit_posts'); - - $removeBar = apply_filters(TouchPointWP::HOOK_PREFIX . 'prevent_admin_bar', $removeBar); - - if ($removeBar) { - show_admin_bar(false); + if ($destination) { + wp_redirect($destination, Http::SEE_OTHER_TEMP); + exit; } } + /** * Checks to determine if the user wants to log in. * @@ -303,9 +281,9 @@ public static function removeAdminBarMaybe() */ private static function wantsToLogin(): bool { - $wants_to_login = false; + $wantsToLogin = false; // redirect back from TouchPoint after a successful login - if (isset($_GET['loginToken'])) { + if (isset($_GET[self::LOGIN_PARAMETER])) { return false; } @@ -315,12 +293,13 @@ private static function wantsToLogin(): bool // Exceptions $action = isset($_GET['loggedout']) ? 'loggedout' : $action; if ('login' == $action) { - $wants_to_login = true; + $wantsToLogin = true; } - return $wants_to_login; + return $wantsToLogin; } + /** * Replace the default WordPress profile link with a link to the user's TouchPoint profile. * @@ -332,16 +311,36 @@ public static function overwriteProfileUrl(string $url): string { $tpwp = TouchPointWP::instance(); if ($tpwp->settings->auth_change_profile_urls === 'on') { + $newUrl = self::getProfileUrl(); + if ($newUrl) + return $newUrl; + } + + return $url; + } + + /** + * Assembles the URL to the TouchPoint profile for a given People ID. Assumes current user if no peopleId is given. + * + * @param int|null $peopleId + * + * @return string|null + */ + public static function getProfileUrl(?int $peopleId = null): ?string + { + $tpwp = TouchPointWP::instance(); + if ($peopleId === null) { $userId = get_current_user_id(); $peopleId = (int)(get_user_meta($userId, Person::META_PEOPLEID, true)); - if ($peopleId > 0) { // make sure we have a PeopleId. Users aren't necessarily TouchPoint users. - return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal"; - } + } + if ($peopleId >= 0) { + return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal"; } - return $url; + return null; } + /** * Handle API requests * @@ -356,15 +355,6 @@ public static function api(array $uri): bool } switch (strtolower($uri['path'][2])) { - case "token": - if ($_SERVER['REQUEST_METHOD'] !== "POST") { - http_response_code(Http::METHOD_NOT_ALLOWED); - - return false; - } - self::handlePostFromTouchPoint(); - exit; - case "login.js": // Some hosts bypass PHP for js extensions, so this doesn't work. case "login.jsr": wp_redirect(content_url('/plugins/touchpoint-wp/ext/login.js'), Http::SEE_OTHER_TEMP); @@ -374,156 +364,112 @@ public static function api(array $uri): bool return false; } + /** * Authenticates the user with TouchPoint * - * @param WP_User|WP_Error $user A WP_User, if the user has already authenticated. - * @param mixed $username The username provided during form-based sign in. Not used. - * @param mixed $password The password provided during form-based sign in. Not used. + * @param WP_Error|WP_User|null $user A WP_User, if the user has already authenticated. + * @param mixed $username The username provided during form-based sign in. Not used. + * @param mixed $password The password provided during form-based sign in. Not used. * - * @return WP_User|WP_Error The authenticated WP_User, or a WP_Error if there were errors. The WP API expects + * @return WP_Error|WP_User|null The authenticated WP_User, or a WP_Error if there were errors. The WP API expects * WP_Error * * @noinspection PhpUnusedParameterInspection We don't use the username or password, but they're in the WP API. */ - public static function authenticate($user, $username, $password) + public static function authenticate(WP_Error|WP_User|null $user, mixed $username, mixed $password): WP_Error|WP_User|null { // Don't re-authenticate if already authenticated if (is_a($user, 'WP_User')) { return $user; } - // If 'loginToken' is present, this is the Authorization Response looping back through TouchPoint. - if (isset($_GET['loginToken'])) { + // If parameter token is present, this is the Authorization Response looping back through TouchPoint. + if (isset($_GET[self::LOGIN_PARAMETER])) { // Verify that the login token is valid. - if ( ! self::AntiForgeryTimestampIsValid($_GET['loginToken'], self::LOGIN_TIMEOUT_STANDARD)) { - return new WP_Error( - 177002, - __('Your login token expired.', 'TouchPoint-WP') . "$time seconds have elapsed.
"; + } } unset($type); - if ($success && $count !== 0) { - TouchPointWP::instance()->settings->set('inv_cron_last_run', time()); - } else { - TouchPointWP::instance()->settings->set('inv_cron_last_run', 0); + if ($applyChanges) { + if ($success && $count !== 0) { + TouchPointWP::instance()->settings->set('inv_cron_last_run', time()); + } else { + TouchPointWP::instance()->settings->set('inv_cron_last_run', 0); + } } if ($verbose) { @@ -400,28 +455,48 @@ public static function updateFromTouchPoint(bool $verbose = false) */ public static function templateFilter(string $template): string { - if (apply_filters(TouchPointWP::HOOK_PREFIX . 'use_default_templates', true, self::class)) { + $className = self::class; + $useTemplates = true; + + /** + * Determines whether the plugin's default templates should be used. Theme developers can return false in this + * filter to prevent the default templates from applying, especially if they conflict with the theme. + * + * Default is true. + * + * @since 0.0.6 Added + * + * @param bool $value The value to return. True will allow the default templates to be applied. + * @param string $className The name of the class calling for the template. + */ + if (!!apply_filters('tp_use_default_templates', $useTemplates, $className)) { $postTypesToFilter = Involvement_PostTypeSettings::getPostTypes(); - $templateFilesToOverwrite = TouchPointWP::TEMPLATES_TO_OVERWRITE; + $templateFilesToOverwrite = self::TEMPLATES_TO_OVERWRITE; if (count($postTypesToFilter) == 0) { return $template; } - if ( ! in_array(ltrim(strrchr($template, '/'), '/'), $templateFilesToOverwrite)) { + if (!in_array(ltrim(strrchr($template, '/'), '/'), $templateFilesToOverwrite)) { return $template; } + if (is_post_type_archive(Meeting::POST_TYPE) && file_exists( + TouchPointWP::$dir . '/src/templates/meeting-archive.php' + )) { + return TouchPointWP::$dir . '/src/templates/meeting-archive.php'; + } + if (is_post_type_archive($postTypesToFilter) && file_exists( TouchPointWP::$dir . '/src/templates/involvement-archive.php' )) { - $template = TouchPointWP::$dir . '/src/templates/involvement-archive.php'; + return TouchPointWP::$dir . '/src/templates/involvement-archive.php'; } if (is_singular($postTypesToFilter) && file_exists( TouchPointWP::$dir . '/src/templates/involvement-single.php' )) { - $template = TouchPointWP::$dir . '/src/templates/involvement-single.php'; + return TouchPointWP::$dir . '/src/templates/involvement-single.php'; } } @@ -435,50 +510,163 @@ public static function templateFilter(string $template): string * @return bool|string True if involvement can be joined. False if no registration exists. Or, a string with why * it can't be joined otherwise. */ - public function acceptingNewMembers() + public function acceptingNewMembers(): bool|string { - if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupFull", true) === '1') { - return __("Currently Full", 'TouchPoint-WP'); - } + if (!isset($this->_acceptingNewMembers)) { + if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupFull", true) === '1') { + $this->_acceptingNewMembers = __("Currently Full", 'TouchPoint-WP'); + return $this->_acceptingNewMembers; + } - if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupClosed", true) === '1') { - return __("Currently Closed", 'TouchPoint-WP'); - } + if (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "groupClosed", true) === '1') { + $this->_acceptingNewMembers = __("Currently Closed", 'TouchPoint-WP'); + return $this->_acceptingNewMembers; + } - $now = current_datetime(); - $regStart = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regStart", true); - if ($regStart !== false && $regStart !== '' && $regStart > $now) { - return __("Registration Not Open Yet", 'TouchPoint-WP'); - } + $now = Utilities::dateTimeNow(); + $regStart = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regStart", true); + if ($regStart !== false && $regStart !== '' && $regStart > $now) { + $this->_acceptingNewMembers = __("Registration Not Open Yet", 'TouchPoint-WP'); + return $this->_acceptingNewMembers; + } + + $regEnd = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regEnd", true); + if ($regEnd !== false && $regEnd !== '' && $regEnd < $now) { + $this->_acceptingNewMembers = __("Registration Closed", 'TouchPoint-WP'); + return $this->_acceptingNewMembers; + } + + if (intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) === 0) { + $this->_acceptingNewMembers = false; // no online registration available + return $this->_acceptingNewMembers; + } - $regEnd = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regEnd", true); - if ($regEnd !== false && $regEnd !== '' && $regEnd < $now) { - return __("Registration Closed", 'TouchPoint-WP'); + $this->_acceptingNewMembers = true; } - if (intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) === 0) { - return false; // no online registration available + return $this->_acceptingNewMembers; + } + private mixed $_acceptingNewMembers; + + + /** + * Gets a URL for registration. A registration url will be provided unless there is no viable registration url to + * send users to, in which case null will be returned. + * + * @return ?string + */ + public function getRegistrationUrl(): ?string + { + if ($this->_registrationUrl === "") { + $regUrl = get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regUrl", true); + $regType = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)); + $hasRegQuestions = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true)); + if ($hasRegQuestions && ($regUrl === "" || $regUrl === null)) { + $this->_registrationUrl = TouchPointWP::instance()->host() . "/OnlineReg/" . $this->invId; + } elseif ($regType === 0 || $regUrl === "" || $regUrl === null) { + $this->_registrationUrl = null; + } elseif (stristr($regUrl, "http") === false) { + $this->_registrationUrl = TouchPointWP::instance()->host() . $regUrl; + } else { + $this->_registrationUrl = $regUrl; + } } + return $this->_registrationUrl; + } + private ?string $_registrationUrl = ""; - return true; + + /** + * Get the registration type for the involvement. + * + * @return int enum of RegistrationType + */ + public function getRegistrationType(): int + { + if (!isset($this->_registrationType)) { + if ($this->acceptingNewMembers() !== true) { + $this->_registrationType = RegistrationType::CLOSED; + return $this->_registrationType; + } + + // Determine intended indication based on site setting. + $siteRegType = intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", true)); + $regUrl = $this->getRegistrationUrl(); + switch ($siteRegType) { + case 1: + $this->_registrationType = RegistrationType::FORM; + return $this->_registrationType; + + case 3: + $this->_registrationType = RegistrationType::RSVP; + return $this->_registrationType; + + case 5: + if ($regUrl !== null) { + $this->_registrationType = RegistrationType::EXTERNAL; + return $this->_registrationType; + } + break; // Registration isn't possible at a link, therefore, assume there was a mistake and continue. + + + case 7: + $this->_registrationType = RegistrationType::CLOSED; + return $this->_registrationType; + } + + // If the involvement has a redirection link, assume it's an external form + if ($regUrl !== null) { + $this->_registrationType = RegistrationType::EXTERNAL; + return $this->_registrationType; + } + + + // If the involvement has registration questions, assume it's a form. + if ( + // Has registration questions + intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true)) === 1 || + + // Has registration type not equal to Join + intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1 + ) { + $this->_registrationType = RegistrationType::FORM; + return $this->_registrationType; + } + + $this->_registrationType = RegistrationType::JOIN; + } + return $this->_registrationType; } + private int $_registrationType; + /** * Whether the involvement should link to a registration form, rather than directly joining the org. * + * @since 0.0.90 Deprecated + * @deprecated 0.0.90 Does not take into account all the possible registration types; will be removed in a future + * version. + * + * @noinspection PHPUnused * @return bool */ public function useRegistrationForm(): bool { if (!isset($this->_useRegistrationForm)) { $this->_useRegistrationForm = (get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", true) === '1' || - intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1); + intval(get_post_meta($this->post_id, TouchPointWP::SETTINGS_PREFIX . "regTypeId", true)) !== 1); } return $this->_useRegistrationForm; } private bool $_useRegistrationForm; + /** + * Get an array of objects that correspond to key details of meetings. Does NOT return the actual Meeting objects. + * Since this is used for involvements regardless of whether their meetings are imported, this pulls from the object + * array that's imported directly from the API. It does not take into account Meeting objects, or meetings that + * belong to child involvements. + * * @return stdClass[] */ protected function meetings(): array @@ -488,6 +676,14 @@ protected function meetings(): array if ($m === "") { $m = []; } + + // Make sure items are unique. #204 + $m = array_unique($m, SORT_REGULAR); + + usort($m, function ($a, $b) { + return $a->mtgStartDt <=> $b->mtgStartDt; + }); + $this->_meetings = $m; } @@ -511,49 +707,93 @@ protected function schedules(): array } /** - * Get a description of the meeting schedule in a human-friendly phrase, e.g. Sundays at 11:00am, starting January - * 14. + * Get the parent of this object **which may be an object of a different class**. + * + * Returns null if there is no parent. * - * This is separated out to a static method to prevent involvement from being instantiated (with those database hits) - * when the content is cached. (10x faster or more) + * @return Involvement|null + */ + public function getParent(): ?Involvement + { + if ($this->parentPostId === null) { + $this->parentPostId = $this->post->post_parent; + if ($this->parentPostId > 0) { + $parent = get_post($this->parentPostId); + if ($parent !== null) { + try { + $this->parentObject = self::fromPost($parent); + } catch (TouchPointWP_Exception) { + $this->parentObject = null; + } + } + } + } + return $this->parentObject; + } + protected ?int $parentPostId = null; + protected ?self $parentObject = null; + + /** + * Get the several different strings that can be used to describe the start/end/etc of this involvement. * * @param int $invId * @param ?Involvement $inv * - * @return string + * @return ?string[] */ - public static function scheduleString(int $invId, $inv = null): ?string + protected static function scheduleStrings(int $invId, $inv = null): ?array { - $cacheKey = $invId . "_" . get_locale(); + if (isset($inv->_scheduleStrings)) { + return $inv->_scheduleStrings; + } + + $cacheKey = $invId . "_" . get_locale() . "_v2"; $schStr = wp_cache_get($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP); - if (!! $schStr) { + if (!! $schStr && self::ENABLE_SCHEDULE_STRING_CACHE) { return $schStr; } if (! $inv) { try { $inv = self::fromInvId($invId); - } catch (TouchPointWP_Exception $e) { + } catch (TouchPointWP_Exception) { return null; } } - if (! isset($inv->_scheduleString)) { - $inv->_scheduleString = $inv->scheduleString_calc(); - wp_cache_set( - $cacheKey, - $inv->_scheduleString, - self::SCHEDULE_STRING_CACHE_GROUP, - self::SCHEDULE_STRING_CACHE_EXPIRATION - ); - } - return $inv->_scheduleString; + $inv->_scheduleStrings = $inv->scheduleStrings_calc(); + wp_cache_set( + $cacheKey, + $inv->_scheduleStrings, + self::SCHEDULE_STRING_CACHE_GROUP, + self::SCHEDULE_STRING_CACHE_EXPIRATION + ); + return $inv->_scheduleStrings; + } + + + /** + * Get a description of the meeting schedule in a human-friendly phrase, e.g. Sundays at 11:00am, starting January + * 14. + * + * This is separated out to a static method to prevent involvement from being instantiated (with those database + * hits) when the content is cached. (10x faster or more) + * + * @param int $objId Involvement Id. + * @param ?Involvement $obj + * + * @return ?string + */ + public static function scheduleString(int $objId, $obj = null): ?string + { + $s = self::scheduleStrings($objId, $obj); + return $s['combined']; } /** * Get the next meeting date/time from either the meetings or schedules. * - * @return DateTimeImmutable|null + * @return DateTimeExtended|null */ - public function nextMeeting(): ?DateTimeImmutable + public function nextMeeting(): ?DateTimeExtended { $now = new DateTimeImmutable(); $this->_nextMeeting = null; @@ -561,33 +801,27 @@ public function nextMeeting(): ?DateTimeImmutable if ($this->_nextMeeting === null) { // meetings foreach ($this->meetings() as $m) { - $mdt = $m->dt; + $mdt = $m->mtgStartDt; if ($mdt > $now) { + // meetings are sorted, so first one past now is the next meeting if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) { $this->_nextMeeting = $mdt; + break; } } } // schedules foreach ($this->schedules() as $s) { - $mdt = $s->next; - if ($mdt > $now) { - if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) { - $this->_nextMeeting = $mdt; - } + $mdt = $s->nextStartDt; + if ($mdt === null) { + continue; } - } - } - - // schedules + 1 week (assumes schedules are recurring weekly) - if ($this->_nextMeeting === null) { // really only needed if we don't have a date yet. - foreach ($this->schedules() as $s) { - $mdt = $s->next->modify("+1 week"); - if ($mdt > $now) { - if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) { - $this->_nextMeeting = $mdt; - } + if ($mdt <= $now) { // If "next meeting" is past, add a week and re-check. + $mdt = $mdt->modify("+1 week"); + } + if ($this->_nextMeeting === null || $mdt < $this->_nextMeeting) { + $this->_nextMeeting = $mdt; } } } @@ -596,17 +830,45 @@ public function nextMeeting(): ?DateTimeImmutable } /** + * @param \DateTimeInterface $apiMeeting + * + * @return bool + * + * TODO update with #184 + */ + protected static function apiMeetingIsAllDay($dateTime): bool + { + return $dateTime->format("His") === "000000"; + } + + + /** + * @param $apiSchedule + * + * @return bool + * + * TODO remove or change with #184 + */ + protected static function apiScheduleIsAllDay($apiSchedule): bool + { + return $apiSchedule->nextStartDt->format("His") === "000000"; + } + + /** + * Group meetings and schedules together such that typical recurrences can be stated. Only returns patterns that + * have at least N occurrences. + * * @param array $meetings * @param array $schedules + * @param int $minNumber (N) The minimum required number of recurrences. * * @return ?array[] */ - private static function computeCommonOccurrences(array $meetings = [], array $schedules = []): ?array + protected static function computeCommonOccurrences(array $meetings = [], array $schedules = [], int $minNumber = 3): ?array { try { - $siteTz = wp_timezone(); - $now = new DateTimeImmutable("now", $siteTz); - } catch (Exception $e) { + $now = Utilities::dateTimeNow(); + } catch (Exception) { return null; } @@ -618,15 +880,23 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc continue; } - $dt = $s->next; - - $coInx = $dt->format('w-Hi'); + /** @var DateTimeExtended $start */ + $start = $s->nextStartDt; + if ($start === null) { + continue; + } + if ($start->isAllDay) { + $coInx = $start->format('w-9999'); + } else { + $coInx = $start->format('w-Hi'); + } $commonOccurrences[$coInx] = [ - 'count' => 20, - 'example' => $dt + 'count' => 20, + 'example' => $start, + 'exampleEnd' => null ]; } - unset($dt, $coInx, $s); + unset($start, $coInx, $s); // If there isn't a schedule, but there are common meeting dates/times, use those. foreach ($meetings as $m) { @@ -634,84 +904,130 @@ private static function computeCommonOccurrences(array $meetings = [], array $sc continue; } - $dt = $m->dt; + /** @var DateTimeExtended $start */ + $start = $m->mtgStartDt; + + /** @var ?DateTimeExtended $end */ + $end = $m->mtgEndDt; - if ($dt < $now) { + if ($start < $now) { continue; } - $coInx = $dt->format('w-Hi'); + if ($start->isAllDay) { + $coInx = $start->format('w-9999'); + } else { + $coInx = $start->format('w-Hi'); + } if (isset($commonOccurrences[$coInx])) { $commonOccurrences[$coInx]['count']++; } else { $commonOccurrences[$coInx] = [ - 'count' => 1, - 'example' => $dt + 'count' => 1, + 'example' => $start, + 'exampleEnd' => $end ]; } } - unset($dt, $coInx, $m); + unset($start, $coInx, $m); - return array_filter($commonOccurrences, fn($co) => $co['count'] > 2); + return array_filter($commonOccurrences, fn($co) => $co['count'] >= $minNumber); } /** - * Calculate the schedule string. + * Calculate the schedule strings. * - * @return string + * @return string[] */ - protected function scheduleString_calc(): ?string + protected function scheduleStrings_calc(): array { $commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules()); - $dayStr = null; - $timeFormat = get_option('time_format'); $dateFormat = get_option('date_format'); - if (count($commonOccurrences) > 0) { - $uniqueTimeStrings = []; - $days = []; - if (count($commonOccurrences) > 1) { // this is only needed if there's multiple schedules - foreach ($commonOccurrences as $k => $co) { - $timeStr = substr($k, 2); - if ( ! in_array($timeStr, $uniqueTimeStrings, true)) { - $uniqueTimeStrings[] = $timeStr; - - $weekday = "d" . $k[0]; - if ( ! isset($days[$weekday])) { - $days[$weekday] = []; - } - $days[$weekday][] = $co['example']; - } + $r = [ + 'datetime' => null, + 'date' => null, + 'time' => null, + 'firstLast' => null, + 'combined' => null + ]; + + $uniqueTimeStrings = []; + $days = []; + $common = true; + if (count($commonOccurrences) > 1) { // this is only needed if there's multiple schedules + foreach ($commonOccurrences as $k => $co) { + $timeStr = substr($k, 2); + if ( ! in_array($timeStr, $uniqueTimeStrings, true)) { + $uniqueTimeStrings[] = $timeStr; + } + + $weekday = "d" . $k[0]; + if ( ! isset($days[$weekday])) { + $days[$weekday] = []; + } + + if ( ! in_array($co['example'], $days[$weekday], true)) { + $days[$weekday][] = $co['example']; + } + } + unset($timeStr, $k, $co, $weekday); + } elseif (count($commonOccurrences) > 0) { + $cok = array_key_first($commonOccurrences); + $days["d" . $cok[0]][] = $commonOccurrences[$cok]['example']; + } else { + $common = false; + $commonOccurrences = self::computeCommonOccurrences($this->meetings(), $this->schedules(), 0); + + foreach ($commonOccurrences as $k => $co) { + $timeStr = substr($k, 2); + if (!in_array($timeStr, $uniqueTimeStrings, true)) { + $uniqueTimeStrings[] = $timeStr; + } + + $weekday = "d" . $k[0]; + if ( ! isset($days[$weekday])) { + $days[$weekday] = []; + } + + if ( ! in_array($co['example'], $days[$weekday], true)) { + $days[$weekday][] = $co['example']; } - unset($timeStr, $k, $co, $weekday); - } else { - $cok = array_key_first($commonOccurrences); - $days["d" . $cok[0]][] = $commonOccurrences[$cok]['example']; } + unset($timeStr, $k, $co, $weekday); + } + if ($common) { if (count($uniqueTimeStrings) > 1) { // Multiple different times. Sun at 9am & 11am, and Sat at 6pm // multiple different times of day $dayStr = []; foreach ($days as $dk => $dta) { $timeStr = []; foreach ($dta as $dt) { - /** @var $dt DateTimeImmutable */ - $ts = $dt->format($timeFormat); - $ts = apply_filters(TouchPointWP::HOOK_PREFIX . 'adjust_time_string', $ts, $dt); - $timeStr[] = $ts; + /** @var $dt DateTimeExtended */ + if ($dt->isAllDay) { + continue; // skip all-days + } + $timeStr[] = DateFormats::TimeStringFormatted($dt); } - $timeStr = Utilities::stringArrayToListString($timeStr); if (count($days) > 1) { // Mon at 7pm & Tue at 8pm $day = Utilities::getDayOfWeekShortForNumber(intval($dk[1])); } else { $day = Utilities::getPluralDayOfWeekNameForNumber(intval($dk[1])); } - // translators: "Mon at 7pm" or "Sundays at 9am & 11am" - $dayStr[] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $day, $timeStr); + if (count($timeStr) > 0) { + $timeStr = Utilities::stringArrayToListString($timeStr); + // translators: %1$s is the date(s), %2$s is the time(s). + $dayStr[] = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $day, $timeStr); + } else { + // translators: "Mon All Day" or "Sundays All Day" + $dayStr[] = wp_sprintf(__('%1$s All Day', 'TouchPoint-WP'), $day); + } } $dayStr = Utilities::stringArrayToListString($dayStr); + $r['date'] = $dayStr; } else { // one time of day. Tue & Thu at 7pm if (count($days) > 1) { // more than one day per week @@ -725,73 +1041,151 @@ protected function scheduleString_calc(): ?string $k = array_key_first($days); $dayStr = Utilities::getPluralDayOfWeekNameForNumber(intval($k[1])); } + $r['date'] = $dayStr; $dt = array_values($days)[0][0]; - /** @var $dt DateTimeImmutable */ - $timeStr = $dt->format($timeFormat); - $timeStr = apply_filters(TouchPointWP::HOOK_PREFIX . 'adjust_time_string', $timeStr, $dt); - $dayStr = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr); + /** @var $dt DateTimeExtended */ + if ($dt->isAllDay) { + // translators: "Mon All Day" or "Sundays All Day" + $dayStr = wp_sprintf(__('%1$s All Day', 'TouchPoint-WP'), $dayStr); + $r['time'] = __('All Day', 'TouchPoint-WP'); + } else { + $timeStr = DateFormats::TimeStringFormatted($dt); + + // translators: %1$s is the date(s), %2$s is the time(s). + $dayStr = wp_sprintf(__('%1$s at %2$s', 'TouchPoint-WP'), $dayStr, $timeStr); + $r['time'] = $timeStr; + } } - } - // Convert start and end to string. - if ($this->firstMeeting !== null && $this->lastMeeting !== null) { - if ($dayStr === null) { - $dayStr = wp_sprintf( + // Convert start and end to string, + if ($this->firstMeeting !== null && $this->lastMeeting !== null) { + $r['firstLast'] = wp_sprintf( // translators: {start date} through {end date} e.g. February 14 through August 12 __('%1$s through %2$s', 'TouchPoint-WP'), $this->firstMeeting->format($dateFormat), $this->lastMeeting->format($dateFormat) ); - } else { - $dayStr = wp_sprintf( - // translators: {schedule}, {start date} through {end date} e.g. Sundays at 11am, February 14 through August 12 - __('%1$s, %2$s through %3$s', 'TouchPoint-WP'), - $dayStr, - $this->firstMeeting->format($dateFormat), - $this->lastMeeting->format($dateFormat) - ); - } - } elseif ($this->firstMeeting !== null) { - if ($dayStr === null) { - $dayStr = wp_sprintf( + if ($dayStr === null) { + $dayStr = $r['firstLast']; + } else { + $dayStr = wp_sprintf( + // translators: {schedule}, {start date} through {end date} e.g. Sundays at 11am, February 14 through August 12 + __('%1$s, %2$s through %3$s', 'TouchPoint-WP'), + $dayStr, + $this->firstMeeting->format($dateFormat), + $this->lastMeeting->format($dateFormat) + ); + } + } elseif ($this->firstMeeting !== null) { + $r['firstLast'] = wp_sprintf( // translators: Starts {start date} e.g. Starts September 15 __('Starts %1$s', 'TouchPoint-WP'), $this->firstMeeting->format($dateFormat) ); - } else { - $dayStr = wp_sprintf( - // translators: {schedule}, starting {start date} e.g. Sundays at 11am, starting February 14 - __('%1$s, starting %2$s', 'TouchPoint-WP'), - $dayStr, - $this->firstMeeting->format($dateFormat) - ); - } - } elseif ($this->lastMeeting !== null) { - if ($dayStr === null) { - $dayStr = wp_sprintf( + if ($dayStr === null) { + $dayStr = $r['firstLast']; + } else { + $dayStr = wp_sprintf( + // translators: {schedule}, starting {start date} e.g. Sundays at 11am, starting February 14 + __('%1$s, starting %2$s', 'TouchPoint-WP'), + $dayStr, + $this->firstMeeting->format($dateFormat) + ); + } + } elseif ($this->lastMeeting !== null) { + $r['firstLast'] = wp_sprintf( // translators: Through {end date} e.g. Through September 15 __('Through %1$s', 'TouchPoint-WP'), $this->lastMeeting->format($dateFormat) ); + if ($dayStr === null) { + $dayStr = $r['firstLast']; + } else { + $dayStr = wp_sprintf( + // translators: {schedule}, through {end date} e.g. Sundays at 11am, through February 14 + __('%1$s, through %2$s', 'TouchPoint-WP'), + $dayStr, + $this->lastMeeting->format($dateFormat) + ); + } + } + + $r['combined'] = $dayStr; + } else { // Uncommon schedules + + if (count($commonOccurrences) === 0) { + return $r; + } + + $forceDateTime = false; + $dateTimeArr = new StringableArray(); + $dateArr = new StringableArray(); + $timeArr = []; + $now = Utilities::dateTimeNow(); + + // filter meetings to only those not past + $meetings = $this->meetings(); + $meetings = array_filter($meetings, fn($m) => $m->status == 1); + $uncancelledMeetings = $meetings; // includes historical +// $originalMeetingCount = count($meetings); + $meetings = array_filter($meetings, fn($m) => $m->mtgEndDt > $now); + if (count($meetings) === 0) { // if no future, revert to historical. + $meetings = $uncancelledMeetings; + } +// $andOthers = (count($meetings) !== $originalMeetingCount); This, when fed to the ->toListString methods +// below can be used to add "and others" to the list of dates/times to indicate that there are historical +// meetings that are not being shown. However, this currently seems more confusing than helpful. + + foreach ($meetings as $m) { + $a = DateFormats::DurationToStringArray($m->mtgStartDt, $m->mtgEndDt, null, $m->mtgStartDt->isAllDay); + + if (isset($a['datetime'])) { + $forceDateTime = true; + $dateTimeArr[] = $a['datetime']; + } else { + $dateTimeArr[] = wp_sprintf( + // translators: %1$s is the date(s), %2$s is the time(s). + __('%1$s at %2$s', 'TouchPoint-WP'), $a['date'], $a['time'] + ); + if ( !$dateArr->contains(['date'])) { + $dateArr[] = $a['date']; + } + if (!in_array($a['time'], $timeArr)) { + $timeArr[] = $a['time']; + } + } + } + if (count($timeArr) > 1) { + $forceDateTime = true; + } + + if ($forceDateTime) { + $r['datetime'] = $dateTimeArr->toListString(2); + $r['combined'] = $r['datetime']; } else { - $dayStr = wp_sprintf( - // translators: {schedule}, through {end date} e.g. Sundays at 11am, through February 14 - __('%1$s, through %2$s', 'TouchPoint-WP'), - $dayStr, - $this->lastMeeting->format($dateFormat) + $dateStr = $dateArr->toListString(2); + + $r['date'] = $dateStr; + $r['time'] = $timeArr[0]; + $r['combined'] = wp_sprintf( + // translators: %1$s is the date(s), %2$s is the time(s). + __('%1$s at %2$s', 'TouchPoint-WP'), + $dateStr, + $timeArr[0] ); } } - return $dayStr; + return $r; } + /** - * Returns an array of the Involvement's Divisions, excluding those that cause it to be included. + * Gets the division terms for the involvement. * - * @return string[] + * @return WP_Term[] */ - public function getDivisionsStrings(): array + protected function getDivisions(): array { $exclude = $this->settings()->importDivs; @@ -810,17 +1204,46 @@ public function getDivisionsStrings(): array ]; } - $this->divisions = wp_get_post_terms($this->post_id, TouchPointWP::TAX_DIV, ['meta_query' => $mq]); + $this->divisions = wp_get_post_terms($this->post_id, Taxonomies::TAX_DIV, ['meta_query' => $mq]); } + return $this->divisions; + } + + /** + * Returns an array of the Involvement's Divisions, excluding those that cause it to be included. + * + * @return string[] + * @noinspection PhpUnused + */ + public function getDivisionsStrings(): array + { $out = []; - foreach ($this->divisions as $d) { + foreach ($this->getDivisions() as $d) { $out[] = $d->name; } return $out; } + + /** + * Returns an array of links to the Involvement's Divisions, excluding those that cause it to be included. + * + * @return string[] + */ + public function getDivisionsLinks(): array + { + $out = []; + foreach ($this->getDivisions() as $d) { + $name = $d->name; + $link = get_term_link($d); + $out[] = "$name"; + } + + return $out; + } + /** * Get the setting object for a specific post type or involvement type * @@ -852,6 +1275,26 @@ public static function getPostTypes(): array return $r; } + + /** + * Get an array of Involvement Post Types, with some basic info + * + * @return array[] + */ + public static function getPostTypesSummary(): array + { + $r = []; + foreach (self::allTypeSettings() as $pt) { + $r[] = [ + /** @var Involvement_PostTypeSettings $pt */ + 'postType' => $pt->postTypeWithoutPrefix(), + 'nameSingular' => $pt->nameSingular, + 'namePlural' => $pt->namePlural + ]; + } + return $r; + } + /** * Display action buttons for an involvement. Takes an id parameter for the Involvement ID. If not provided, * the current post will be used. @@ -895,7 +1338,7 @@ public static function actionsShortcode($params = [], string $content = ""): str try { $inv = self::fromPost($post); $iid = $inv->invId; - } catch (TouchPointWP_Exception $e) { + } catch (TouchPointWP_Exception) { $iid = null; } } @@ -982,7 +1425,7 @@ public static function filterShortcode($params = []): string // language=javascript " tpvm.addEventListener('Involvement_fromObjArray', function() { - TP_Involvement.initFilters(); + tpvm.TP_Involvement.initFilters(); });" ); self::$filterJsAdded = true; @@ -999,7 +1442,7 @@ public static function doInvolvementList(WP_Query $q, $params = []): void $q->set('orderby', 'title'); // will mostly be overwritten by geographic sort, if available. $q->set('order', 'ASC'); - if ($q->is_post_type_archive()) { + if ( ! isset($q->query['post_parent'])) { $q->set('post_parent', 0); } @@ -1060,7 +1503,7 @@ public static function doInvolvementList(WP_Query $q, $params = []): void } if (count($divs) > 0) { $taxQuery[] = [ - 'taxonomy' => TouchPointWP::TAX_DIV, + 'taxonomy' => Taxonomies::TAX_DIV, 'field' => 'ID', 'terms' => $divs ]; @@ -1077,7 +1520,10 @@ public static function doInvolvementList(WP_Query $q, $params = []): void } } - $containerClass = $params['class'] ?? self::$containerClass; + $containerClass = $params['class'] ?? []; + if (!str_contains(" " . $containerClass . " ", " " . self::$containerClass . " ")) { + $containerClass .= " " . self::$containerClass; + } // Groupings foreach ($terms as $termId => $name) { @@ -1109,7 +1555,10 @@ public static function doInvolvementList(WP_Query $q, $params = []): void usort($posts, [Involvement::class, 'sortPosts']); - foreach ($posts as $post) { + foreach ($posts as $postI) { + global $post; + $post = $postI; + $loadedPart = get_template_part('list-item', 'involvement-list-item'); if ($loadedPart === false) { require TouchPointWP::$dir . "/src/templates/parts/involvement-list-item.php"; @@ -1132,28 +1581,29 @@ public static function doInvolvementList(WP_Query $q, $params = []): void * Get a WP_Post by the Involvement ID if it exists. Return null if it does not. * * @param string|string[] $postType - * @param $involvementId + * @param mixed $involvementId * * @return int|WP_Post|null */ - private static function getWpPostByInvolvementId($postType, $involvementId) + private static function getWpPostByInvolvementId($postType, $involvementId): WP_Post|null { $involvementId = (string)$involvementId; $q = new WP_Query([ 'post_type' => $postType, - 'meta_key' => self::INVOLVEMENT_META_KEY, + 'meta_key' => TouchPointWP::INVOLVEMENT_META_KEY, 'meta_value' => $involvementId, 'numberposts' => 2 // only need one, but if there's two, there should be an error condition. ]); + /** @var $posts WP_Post[] */ $posts = $q->get_posts(); $counts = count($posts); if ($counts > 1) { // multiple posts match, which isn't great. new TouchPointWP_Exception("Multiple Posts Exist", 170006); } if ($counts > 0) { // post exists already. - return $posts[0]; + return reset($posts); } else { return null; } @@ -1163,11 +1613,11 @@ private static function getWpPostByInvolvementId($postType, $involvementId) * Print a list of involvements that match the given criteria. * * @param array|string $params - * @param string $content + * @param string $content A string that is shown if no content is available. * * @return string * - * @noinspection PhpUnusedParameterInspection + * @noinspection PhpMissingParamTypeInspection */ public static function listShortcode($params = [], string $content = ""): string { @@ -1185,7 +1635,17 @@ public static function listShortcode($params = [], string $content = ""): string 'type' => null, 'div' => null, 'class' => self::$containerClass, - 'includecss' => apply_filters(TouchPointWP::HOOK_PREFIX . 'use_css', true, self::class), + + /** + * Determines whether or not to automatically include the plugin-default CSS. Return false to use your + * own CSS instead. + * + * @since 0.0.15 Added + * + * @param bool $useCss Whether or not to include the default CSS. True = include + * @param string $className The name of the current calling class. + */ + 'includecss' => apply_filters('tp_use_css', true, self::class), 'itemclass' => self::$itemClass, 'usequery' => false ], @@ -1203,12 +1663,31 @@ public static function listShortcode($params = [], string $content = ""): string $render = ob_get_clean(); if (trim($render) == "") { + if ($content !== "") { + return apply_shortcodes($content); + } return ""; } return apply_shortcodes($render); } + + /** + * Get the list of involvements through API endpoint. This is used by the Involvement List Shortcode. + * + * @return void + */ + protected static function ajaxListShortcode(): void + { + // This is an AJAX call, so we need to set the headers. + if ( ! headers_sent()) { + TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_PRIVATE); + } + + echo self::listShortcode($_GET, __('None right now.', 'TouchPoint-WP')); + } + /** * @param array|string $params * @param string $content @@ -1216,7 +1695,7 @@ public static function listShortcode($params = [], string $content = ""): string * @return string * @noinspection PhpUnusedParameterInspection */ - public static function nearbyShortcode($params = [], string $content = ""): string + public static function nearbyShortcode(array|string $params = [], string $content = ""): string { TouchPointWP::requireScript("knockout-defer"); TouchPointWP::requireScript("base-defer"); @@ -1322,9 +1801,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po // Division if (in_array('div', $filters)) { $exclude = $settings->importDivs; - if (count( - $exclude - ) == 1) { // Exclude the imported div if there's only one, as all invs would have that div. + if (count($exclude) == 1) { // Exclude the imported div if there's only one as all would have it. $mq = ['relation' => "AND"]; foreach ($exclude as $e) { $mq[] = [ @@ -1346,7 +1823,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po } $dvName = TouchPointWP::instance()->settings->dv_name_singular; $dvList = get_terms([ - 'taxonomy' => TouchPointWP::TAX_DIV, + 'taxonomy' => Taxonomies::TAX_DIV, 'hide_empty' => true, 'meta_query' => $mq, TouchPointWP::HOOK_PREFIX . 'post_type' => $postType @@ -1394,7 +1871,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po $rcName = TouchPointWP::instance()->settings->rc_name_singular; $rcList = get_terms( [ - 'taxonomy' => TouchPointWP::TAX_RESCODE, + 'taxonomy' => Taxonomies::TAX_RESCODE, 'hide_empty' => true, TouchPointWP::HOOK_PREFIX . 'post_type' => $postType ] @@ -1416,12 +1893,12 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po // Campuses if (in_array('campus', $filters) && TouchPointWP::instance()->settings->enable_campuses === "on") { $cName = TouchPointWP::instance()->settings->camp_name_singular; - if (strtolower($cName) == "language") { + if (Translation::useCampusAsLanguage()) { $cName = __("Language", 'TouchPoint-WP'); } $cList = get_terms( [ - 'taxonomy' => TouchPointWP::TAX_CAMPUS, + 'taxonomy' => Taxonomies::TAX_CAMPUS, 'hide_empty' => true, TouchPointWP::HOOK_PREFIX . 'post_type' => $postType ] @@ -1445,7 +1922,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po $wdName = __("Weekday", 'TouchPoint-WP'); $wdList = get_terms( [ - 'taxonomy' => TouchPointWP::TAX_WEEKDAY, + 'taxonomy' => Taxonomies::TAX_WEEKDAY, 'hide_empty' => true, 'orderby' => 'id', TouchPointWP::HOOK_PREFIX . 'post_type' => $postType @@ -1471,7 +1948,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po $todName = __("Time of Day", 'TouchPoint-WP'); $todList = get_terms( [ - 'taxonomy' => TouchPointWP::TAX_DAYTIME, + 'taxonomy' => Taxonomies::TAX_DAYTIME, 'hide_empty' => true, 'orderby' => 'id', TouchPointWP::HOOK_PREFIX . 'post_type' => $postType @@ -1505,7 +1982,7 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po if (in_array('agegroup', $filters)) { $agName = __("Age", 'TouchPoint-WP'); $agList = get_terms([ - 'taxonomy' => TouchPointWP::TAX_AGEGROUP, + 'taxonomy' => Taxonomies::TAX_AGEGROUP, 'hide_empty' => true, 'orderby' => 't.id', TouchPointWP::HOOK_PREFIX . 'post_type' => $postType @@ -1522,19 +1999,19 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po if ($params['includeMapWarnings']) { $content .= ""; - $content .= sprintf( + $content .= wp_sprintf( "", - sprintf( + wp_sprintf( __("The %s listed are only those shown on the map.", 'TouchPoint-WP'), $settings->namePlural ) ); - $content .= sprintf( + $content .= wp_sprintf( "", - sprintf( + wp_sprintf( // translators: %s is the link to "reset the map" __("Zoom out or %s to see more.", 'TouchPoint-WP'), - sprintf( + wp_sprintf( "%s", _x("reset the map", "Zoom out or reset the map to see more.", 'TouchPoint-WP') ) @@ -1553,13 +2030,25 @@ protected static final function filterDropdownHtml(array $params, Involvement_Po * * @param WP_Post $post * - * @return Involvement + * @return ?Involvement * * @throws TouchPointWP_Exception If the involvement can't be created from the post, an exception is thrown. */ - public static function fromPost(WP_Post $post): Involvement + public static function fromPost(WP_Post $post): ?Involvement { - $iid = intval($post->{self::INVOLVEMENT_META_KEY}); + $iid = intval($post->{TouchPointWP::INVOLVEMENT_META_KEY}); + + if ($iid === 0) { + $iid = intval(get_post_meta($post->ID, TouchPointWP::INVOLVEMENT_META_KEY, true)); + } + + if (Meeting::postIsType($post) && !Involvement::postIsType($post)) { + throw new TouchPointWP_Exception("The post is a Meeting, not an Involvement.", 171004); + } + + if ($iid === 0) { + throw new TouchPointWP_Exception("Invalid Involvement ID provided.", 171002); + } if ( ! isset(self::$_instances[$iid])) { self::$_instances[$iid] = new Involvement($post); @@ -1569,6 +2058,30 @@ public static function fromPost(WP_Post $post): Involvement } + /** + * Create an Involvement object from an object from its involvement ID. + * + * @param string $postType + * @param int $involvementId + * + * @return ?Involvement + * + * @throws TouchPointWP_Exception If the involvement can't be created, an exception is thrown. + */ + public static function fromInvolvementId(string $postType, int $involvementId): ?Involvement + { + if ( ! isset(self::$_instances[$involvementId])) { + $post = self::getWpPostByInvolvementId($postType, $involvementId); + if ($post === null) { + return null; + } + self::$_instances[$involvementId] = Involvement::fromPost($post); + } + + return self::$_instances[$involvementId]; + } + + /** * Handle API requests * @@ -1596,10 +2109,26 @@ public static function api(array $uri): bool self::ajaxNearby(); exit; + case "list": + self::ajaxListShortcode(); + exit; + + /** @noinspection SpellCheckingInspection */ + case "posttypes": + // Return the post types that are available for involvements. + header('Content-Type: application/json'); + echo json_encode(Involvement::getPostTypesSummary()); + exit; + case "force-sync": TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE); echo self::updateFromTouchPoint(true); exit; + + case "preview-sync": + TouchPointWP::doCacheHeaders(TouchPointWP::CACHE_NONE); + echo self::updateFromTouchPoint(true, false); + exit; } return false; @@ -1616,7 +2145,7 @@ public static function ajaxNearby(): void $type = $_GET['type'] ?? ""; $lat = $_GET['lat'] ?? null; $lng = $_GET['lng'] ?? null; - $limit = $_GET['limit'] ?? null; + $limit = $_GET['limit'] ?? 10; $settings = self::getSettingsForPostType($type); @@ -1660,6 +2189,10 @@ public static function ajaxNearby(): void exit; } + if ($geoObj->type == "loc") { + $geoObj->type = "ip"; + } + $lat = $geoObj->lat; $lng = $geoObj->lng; @@ -1668,6 +2201,7 @@ public static function ajaxNearby(): void $geoObj = TouchPointWP::instance()->reverseGeocode($lat, $lng); if ($geoObj !== false) { + $geoObj->type = "nav"; $r['geo'] = $geoObj; } } @@ -1678,8 +2212,8 @@ public static function ajaxNearby(): void http_response_code(Http::NOT_FOUND); echo json_encode([ "invList" => [], - "error" => sprintf("No %s Found.", $settings->namePlural), - "error_i18n" => sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural) + "error" => wp_sprintf("No %s Found.", $settings->namePlural), + "error_i18n" => wp_sprintf(__("No %s Found.", "TouchPoint-WP"), $settings->namePlural) ]); exit; } @@ -1714,7 +2248,7 @@ public static function ajaxNearby(): void * @param int $limit Number of results to return. 0-100 inclusive. * * @return object[]|null An array of database query result objects, or null if the location isn't provided or - * valid. + * valid. */ private static function getInvsNear(float $lat, float $lng, string $postType, int $limit = 3): ?array { @@ -1728,6 +2262,7 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in global $wpdb; $settingsPrefix = TouchPointWP::SETTINGS_PREFIX; + $metaInvId = TouchPointWP::INVOLVEMENT_META_KEY; /** @noinspection SqlResolve */ $q = $wpdb->prepare( " @@ -1755,7 +2290,7 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in $wpdb->postmeta as pmClosed ON p.ID = pmClosed.post_id AND pmClosed.meta_key = '{$settingsPrefix}groupClosed' WHERE p.post_type = %s AND pmClosed.meta_value != 1 AND pmFull.meta_value != 1 ) as l - JOIN $wpdb->postmeta as pmInv ON l.ID = pmInv.post_id AND pmInv.meta_key = '{$settingsPrefix}invId' + JOIN $wpdb->postmeta as pmInv ON l.ID = pmInv.post_id AND pmInv.meta_key = '$metaInvId' ORDER BY distance LIMIT %d ", $lat, @@ -1769,25 +2304,6 @@ private static function getInvsNear(float $lat, float $lng, string $postType, in } - /** - * Create a Involvement object from an object from a database query. - * - * @param object $obj A database object from which an Involvement object should be created. - * - * @return Involvement - * @throws TouchPointWP_Exception - */ - private static function fromObj(object $obj): Involvement - { - $iid = intval($obj->invId); - - if ( ! isset(self::$_instances[$iid])) { - self::$_instances[$iid] = new Involvement($obj); - } - - return self::$_instances[$iid]; - } - /** * Create an Involvement object from an Involvement ID. Only Involvements that are already imported as Posts are * currently available. @@ -1851,9 +2367,6 @@ public static function load(): bool /// Syncing /// /////////////// - // Do an update if needed. - add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'checkUpdates']); - // Setup cron for updating Involvements daily. add_action(self::CRON_HOOK, [self::class, 'updateCron']); if ( ! wp_next_scheduled(self::CRON_HOOK)) { @@ -1865,6 +2378,9 @@ public static function load(): bool ); } + // Do an update if needed. + add_action(TouchPointWP::INIT_ACTION_HOOK, [self::class, 'checkUpdates']); + return true; } @@ -1878,8 +2394,24 @@ public static function updateCron(): void { try { self::updateFromTouchPoint(); - } catch (Exception $ex) { + } catch (Exception) { + } + } + + protected static DateTimeImmutable $_updateExpiry; + + protected static function updateExpiry(): DateTimeImmutable + { + if (!isset(self::$_updateExpiry)) { + $diff = TouchPointWP::instance()->settings->mc_archive_days; + try { + $interval = new DateInterval("P{$diff}D"); + self::$_updateExpiry = Utilities::dateTimeNow()->sub($interval); + } catch (Exception) { + self::$_updateExpiry = Utilities::dateTimeNow(); + } } + return self::$_updateExpiry; } /** @@ -1900,7 +2432,7 @@ public function getDistance(bool $useHiForFalse = false) return $useHiForFalse ? 25000 : false; } - return Utilities\Geo::distance( + return Geo::distance( $this->geo->lat, $this->geo->lng, self::$compareGeo->lat, @@ -1949,21 +2481,46 @@ public static function sort(Involvement $a, Involvement $b): int /** * Put Post objects that represent Small Groups in order of increasing distance. * - * @param WP_Post $a - * @param WP_Post $b + * @param WP_Post|Involvement $a + * @param WP_Post|Involvement $b * * @return int */ - public static function sortPosts(WP_Post $a, WP_Post $b): int + public static function sortPosts(WP_Post|Involvement $a, WP_Post|Involvement $b): int { - try { - $a = self::fromPost($a); - $b = self::fromPost($b); + $comparable = true; + if ($a instanceof WP_Post) { + try { + if (Meeting::postIsType($a)) { + $a = Meeting::fromPost($a)->involvement(); + } elseif (Involvement::postIsType($a)) { + $a = Involvement::fromPost($a); + } else { + $comparable = false; + } + } catch (TouchPointWP_Exception) { + $comparable = false; + } + } + if ($b instanceof WP_Post) { + try { + if (Meeting::postIsType($b)) { + $b = Meeting::fromPost($b)->involvement(); + } elseif (Involvement::postIsType($b)) { + $b = Involvement::fromPost($b); + } else { + $comparable = false; + } + } catch (TouchPointWP_Exception) { + $comparable = false; + } + } + if ($comparable) { return self::sort($a, $b); - } catch (TouchPointWP_Exception $ex) { - return $a <=> $b; } + + return $a <=> $b; } @@ -2017,6 +2574,22 @@ public static function mapShortcode($params = [], string $content = ""): string if ($params['all']) { self::requireAllObjectsInJs(); self::$_hasArchiveMap = true; + } else { + // enqueue this object for js instantiation + $post = get_post(); + if ($post) { + $inv = null; + try { + if (Meeting::postIsType($post)) { + $inv = Meeting::fromPost($post)?->involvement(); + } elseif (Involvement::postIsType($post)) { + $inv = Involvement::fromPost($post); + } + } catch (TouchPointWP_Exception) { + // If the post is not an involvement, do nothing. + } + $inv?->enqueueForJsInstantiation(); + } } $script = file_get_contents(TouchPointWP::$dir . "/src/js-partials/involvement-map-inline.js"); @@ -2028,7 +2601,6 @@ public static function mapShortcode($params = [], string $content = ""): string $script ); - // TODO move the style to a css file... or something. $content = "
"; } else { $content = ""; @@ -2037,7 +2609,6 @@ public static function mapShortcode($params = [], string $content = ""): string return $content; } - /** * Indicates whether a map of a single Involvement can be displayed. * @@ -2049,41 +2620,40 @@ public function hasGeo(): bool return false; } - return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null; + return $this->geo !== null && $this->geo->lat !== null && $this->geo->lng !== null && + is_numeric($this->geo->lat) && is_numeric($this->geo->lng); } - public function asGeoIFace(string $type = "unknown"): ?object + public function asGeoIFace(string $type = "unknown"): ?Geo { if ($this->hasGeo()) { - return (object)[ - 'lat' => $this->geo->lat, - 'lng' => $this->geo->lng, - 'human' => $this->name, - 'type' => $type - ]; + return new Geo( + $this->geo->lat, + $this->geo->lng, + $this->name, + $type + ); } return null; } - /** * Update posts that are based on an involvement. * * @param Involvement_PostTypeSettings $typeSets - * @param string|int $divs * @param bool $verbose + * @param bool $applyChanges * * @return false|int False on failure. Otherwise, the number of updates. */ - final protected static function updateInvolvementPostsForType( - Involvement_PostTypeSettings $typeSets, - $divs, - bool $verbose - ) { + final protected static function updateInvolvementPostsForType(Involvement_PostTypeSettings $typeSets, bool $verbose, bool $applyChanges = true): bool|int + { $siteTz = wp_timezone(); - set_time_limit(180); + if (!set_time_limit(180) && $verbose) { + echo "Time limit could not be extended. May not be able to complete all updates.
"; + } $qOpts = []; @@ -2096,12 +2666,28 @@ final protected static function updateInvolvementPostsForType( } try { - $response = TouchPointWP::instance()->apiGet( - "InvsForDivs", - array_merge($qOpts, ['divs' => $divs]), - 180 - ); - } catch (TouchPointWP_Exception $e) { + $qOpts['camps'] = Utilities::idArrayToIntArray($typeSets->importCampuses, false); + + if ($typeSets->postType === Meeting::POST_TYPE) { + $qOpts['featMtgs'] = 1; + $qOpts['exDivs'] = Utilities::idArrayToIntArray(Involvement_PostTypeSettings::getAllDivs(), false); + } else { + $qOpts['divs'] = Utilities::idArrayToIntArray($typeSets->importDivs, false); + } + + if (TouchPointWP::instance()->settings->enable_meeting_cal === 'on' || $typeSets->importMeetings) { + // Meetings to be imported + $qOpts['mtgHist'] = TouchPointWP::instance()->settings->mc_hist_days; + $qOpts['mtgFuture'] = TouchPointWP::instance()->settings->mc_future_days; + } else { + // Meetings for involvements that aren't imported. For schedule strings only. + $qOpts['mtgHist'] = 0; + $qOpts['mtgFuture'] = 365; + } + + $response = TouchPointWP::instance()->api->pyGet("Invs", $qOpts, 180, $verbose); + + } catch (TouchPointWP_Exception) { return false; } unset($qOpts); @@ -2116,75 +2702,27 @@ final protected static function updateInvolvementPostsForType( $postsToKeep = []; try { - $now = new DateTimeImmutable("now", $siteTz); - $aYear = new DateInterval('P1Y'); - $nowPlus1Y = $now->add($aYear); + $now = Utilities::dateTimeNow(); + $histDays = intval(TouchPointWP::instance()->settings->mc_hist_days); + $histVal = new DateInterval("P{$histDays}D"); + $nowMinusH = $now->sub($histVal); unset($aYear); } catch (Exception $e) { + if ($verbose) { + $m = $e->getMessage(); + echo "Could not calculate date values. Original Exception: $m
"; + } return false; } foreach ($invData as $inv) { set_time_limit(15); - if ($verbose) { - var_dump($inv); - } - - //////////////////////// // Standardize Inputs // //////////////////////// - // Start and end dates - if ($inv->firstMeeting !== null) { - try { - $inv->firstMeeting = new DateTimeImmutable($inv->firstMeeting, $siteTz); - } catch (Exception $e) { - $inv->firstMeeting = null; - } - } - if ($inv->lastMeeting !== null) { - try { - $inv->lastMeeting = new DateTimeImmutable($inv->lastMeeting, $siteTz); - } catch (Exception $e) { - $inv->lastMeeting = null; - } - } - - // Meeting and Schedule date/time strings as DateTimeImmutables - foreach ($inv->schedules as $i => $s) { - try { - $s->next = new DateTimeImmutable($s->next, $siteTz); - } catch (Exception $e) { - unset($inv->schedules[$i]); - } - } - foreach ($inv->meetings as $i => $m) { - try { - $m->dt = new DateTimeImmutable($m->dt, $siteTz); - } catch (Exception $e) { - unset($inv->meetings[$i]); - } - } - - // Registration start - if ($inv->regStart !== null) { - try { - $inv->regStart = new DateTimeImmutable($inv->regStart, $siteTz); - } catch (Exception $e) { - $inv->regStart = null; - } - } - - // Registration end - if ($inv->regEnd !== null) { - try { - $inv->regEnd = new DateTimeImmutable($inv->regEnd, $siteTz); - } catch (Exception $e) { - $inv->regEnd = null; - } - } + self::standardizeApiData($inv, $siteTz, $verbose); //////////////// @@ -2193,8 +2731,21 @@ final protected static function updateInvolvementPostsForType( // 'continue' causes involvement to be deleted (or not created). + // Exclude Meeting type if there are no meetings. + if ($typeSets->postType === Meeting::POST_TYPE && !$inv->isParent) { + if (count($inv->meetings) < 1) { + if ($verbose) { + echo "Stopping processing because no meetings were returned. Involvement will be deleted from WordPress.
"; + } + continue; + } + } + // Filter by end dates to stay relevant - if ($inv->lastMeeting !== null && $inv->lastMeeting < $now) { // last meeting already happened. + if ($inv->lastMeeting !== null && ( + (!$typeSets->importMeetings && $inv->lastMeeting < $now) || + ($typeSets->importMeetings && $inv->lastMeeting < $nowMinusH)) + ) { // last meeting was long enough ago to no longer be relevant. if ($verbose) { echo "Stopping processing because all meetings are in the past. Involvement will be deleted from WordPress.
"; } @@ -2260,62 +2811,136 @@ final protected static function updateInvolvementPostsForType( $post = self::getWpPostByInvolvementId($typeSets->postType, $inv->involvementId); - $titleToUse = $inv->regTitle ?? $inv->name; - $titleToUse = trim($titleToUse); + $inv->titleToUse = $inv->regTitle ?? $inv->name; + $inv->titleToUse = trim($inv->titleToUse); if ($post === null) { - $post = wp_insert_post( - [ // create new - 'post_type' => $typeSets->postType, - 'post_name' => $titleToUse, - 'meta_input' => [ - self::INVOLVEMENT_META_KEY => $inv->involvementId + if ($applyChanges) { + $post = wp_insert_post( + [ // create new + 'post_type' => $typeSets->postType, + 'post_title' => $inv->titleToUse, + 'post_name' => $inv->titleToUse, + 'post_status' => 'publish', + 'meta_input' => [ + TouchPointWP::INVOLVEMENT_META_KEY => $inv->involvementId + ] ] - ] - ); - $post = get_post($post); + ); + $post = get_post($post); + } elseif ($verbose) { + echo "Would create new Post for Involvement {$inv->involvementId} ({$inv->titleToUse}).
"; + } } - if ($post instanceof WP_Error) { - new TouchPointWP_WPError($post); - continue; - } + $postsToKeep = [...$postsToKeep, ...Involvement::doPostUpdate($post, $inv, $typeSets, $verbose, $applyChanges)]; + $postsToKeep[] = $post->ID; + } + unset($inv); - if ($post === null) { - new TouchPointWP_Exception("Post could not be found or created.", 171001); - continue; - } + ////////////////// + //// Removals //// + ////////////////// - /** @var $post WP_Post */ - if ($inv->description == null || trim($inv->description) == "") { - $post->post_content = null; - } else { - $post->post_content = Utilities::standardizeHtml($inv->description, "involvement-import"); - } - // Title & Slug -- slugs should only be updated if there's a reason, like a title change. Otherwise, they increment. - if ($post->post_title != $titleToUse || str_contains($post->post_name, "__trashed")) { - $post->post_title = $titleToUse; - $post->post_name = ''; // Slug will regenerate; + if ($verbose) { + $tsn = $typeSets->namePlural; + echo "Deleted $removals posts."; + } + + return $removals + count($invData); + } + + /** + * Does the heavy-lifting of updating a given post, with the given information. + * + * @param mixed $post + * @param object $inv + * @param Involvement_PostTypeSettings $typeSets + * @param bool $verbose + * @param bool $applyChanges + * + * @return int[] A list of Post IDs that should be kept. + */ + protected static function doPostUpdate($post, object $inv, Involvement_PostTypeSettings $typeSets, bool $verbose = false, bool $applyChanges = true): array + { + if ($post instanceof WP_Error) { + new TouchPointWP_WPError($post); + return []; + } + + if (!$applyChanges && $post === null) { + $post = new WP_Post((object)[]); // Create an empty placeholder to dry-run the logic. + } + + if ($post === null) { + new TouchPointWP_Exception("Post could not be found or created.", 171001); + return []; + } + + /** @var $post WP_Post */ + if ($inv->description == null || trim($inv->description) === "") { + $post->post_content = ""; + } else { + $post->post_content = Utilities::standardizeHtml($inv->description, "involvement-import"); + } + + // Title & Slug -- slugs should only be updated if there's a reason, like a title change. Otherwise, they increment. + if ($post->post_title != $inv->titleToUse || str_contains($post->post_name, "__trashed")) { + $post->post_title = $inv->titleToUse; + $post->post_name = ''; // Slug will regenerate; + } + + if ($verbose) { + $link = get_permalink($post); + echo "
Updating Post $post->ID based on Involvement $inv->involvementId ($inv->titleToUse).
"; + } + // Parent Post + if ($typeSets->hierarchical) { + $parent = 0; + if ($inv->parentInvId > 0) { + $parent = self::getWpPostByInvolvementId($typeSets->postType, $inv->parentInvId); + if ($parent !== null) { + $parent = $parent->ID; if ($verbose) { echo "Parent Post: $parent
"; } + } elseif ($verbose) { + echo "Parent Post could not be bound.
"; } + } + if ($parent > 0) { $post->post_parent = $parent; + } else { + $post->post_parent = 0; } + } - // Status & Submit - $post->post_status = 'publish'; + // Status & Submit + $post->post_status = 'publish'; + if ($applyChanges) { wp_update_post($post); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "locationName", $inv->location); @@ -2324,7 +2949,10 @@ final protected static function updateInvolvementPostsForType( update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupFull", ! ! $inv->groupFull); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "groupClosed", ! ! $inv->closed); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", ! ! $inv->hasRegQuestions); + update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regUrl", $inv->redirectUrl); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "regTypeId", intval($inv->regTypeId)); + update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "siteRegTypeId", intval($inv->siteRegTypeId)); + update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "hasRegQuestions", ! ! $inv->hasRegQuestions); // Registration start @@ -2343,223 +2971,758 @@ final protected static function updateInvolvementPostsForType( // Update image, if appropriate. $imageUrl = ""; - if (!!$typeSets->useImages) { + if ( ! ! $typeSets->useImages) { $imageUrl = $inv->imageUrl; } - Utilities::updatePostImageFromUrl($post->ID, $imageUrl, $post->post_title); + } + $imageId = Utilities::updatePostImageFromUrl($post->ID ?? 0, $imageUrl, $post->post_title, $verbose, $applyChanges); - //////////////////// - //// SCHEDULING //// - //////////////////// + //////////////////// + //// SCHEDULING //// + //////////////////// - // Establish a container - if ( ! is_array($inv->meetings)) { - $inv->meetings = []; - } + // Establish a container + if ( ! is_array($inv->meetings)) { + $inv->meetings = []; + } - // Determine schedule characteristics for terms - $upcomingDateTimes = self::computeCommonOccurrences($inv->meetings, $inv->schedules); - $uniqueTimeStrings = []; - $timeTerms = []; - $days = []; + // Determine schedule characteristics for terms + $upcomingDateTimes = self::computeCommonOccurrences($inv->meetings, $inv->schedules); + $uniqueTimeStrings = []; + $timeTerms = []; + $days = []; - foreach ($upcomingDateTimes as $dtString => $dt) { - $weekday = "d" . $dtString[0]; + foreach ($upcomingDateTimes as $dtString => $dt) { + $weekday = "d" . $dtString[0]; - // days - if ( ! isset($days[$weekday])) { - $days[$weekday] = []; + // days + if ( ! isset($days[$weekday])) { + $days[$weekday] = []; + } + $days[$weekday][] = $dt['example']; + + // times + $timeStr = substr($dtString, 2); + if ( ! in_array($timeStr, $uniqueTimeStrings)) { + $uniqueTimeStrings[] = $timeStr; + if ($timeStr === "9999") { + // All day; doesn't need to be categorized. TODO see #184 + continue; } - $days[$weekday][] = $dt['example']; - - // times - $timeStr = substr($dtString, 2); - if ( ! in_array($timeStr, $uniqueTimeStrings)) { - $uniqueTimeStrings[] = $timeStr; - $timeTerm = Utilities::getTimeOfDayTermForTime_noI18n($dt['example']); - if ( ! in_array($timeTerm, $timeTerms)) { - $timeTerms[] = $timeTerm; - } + $timeTerm = Utilities::getTimeOfDayTermForTime_noI18n($dt['example']); + if ( ! in_array($timeTerm, $timeTerms)) { + $timeTerms[] = $timeTerm; } - unset($timeStr, $weekday); } + unset($timeStr, $weekday); + } - // Start and end dates - $tense = TouchPointWP::TAX_TENSE_PRESENT; - if ($inv->firstMeeting !== null && $inv->firstMeeting < $now) { // First meeting already happened. - $inv->firstMeeting = null; // We don't need to list info from the past. - } + // first and last meeting dates + $tense = Taxonomies::TAX_TENSE_PRESENT; + if ($inv->firstMeeting !== null && $inv->firstMeeting < Utilities::dateTimeNow()) { // First meeting already happened. + $inv->firstMeeting = null; // We don't need to list info from the past. + } + if ($applyChanges) { if ($inv->firstMeeting === null) { delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting"); } else { update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "firstMeeting", $inv->firstMeeting); } + } - if ($inv->lastMeeting !== null && $inv->lastMeeting > $nowPlus1Y) { // Last mtg is > 1yr away - $inv->lastMeeting = null; // For all practical purposes: it's not ending. - } + if ($inv->lastMeeting !== null && $inv->lastMeeting > Utilities::dateTimeNowPlus1Y()) { // Last mtg is > 1yr away + $inv->lastMeeting = null; // For all practical purposes: it's not ending. + } + if ($applyChanges) { if ($inv->lastMeeting === null) { delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting"); } else { update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "lastMeeting", $inv->lastMeeting); } + } - // Clear Cached Schedule String - $cacheKey = $inv->involvementId . "_" . get_locale(); + // Clear Cached Schedule String + $cacheKey = $inv->involvementId . "_" . get_locale(); + if ($applyChanges) { wp_cache_delete($cacheKey, self::SCHEDULE_STRING_CACHE_GROUP); + } - // Tense - if ($inv->firstMeeting !== null) { - $tense = TouchPointWP::TAX_TENSE_FUTURE; - } + // Tense + if ($inv->firstMeeting !== null) { + $tense = Taxonomies::TAX_TENSE_FUTURE; + } + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [$tense], TouchPointWP::TAX_TENSE, false); + wp_set_post_terms($post->ID, [$tense], Taxonomies::TAX_TENSE, false); + } - // Update meetings and schedules + // Update meetings and schedules + if ($applyChanges) { update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "meetings", $inv->meetings); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "schedules", $inv->schedules); + } - // Day of week taxonomy - $dayTerms = []; - foreach ($days as $k => $d) { - $dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1])); - } + // Day of week taxonomy + $dayTerms = []; + foreach ($days as $k => $d) { + $dayTerms[] = Utilities::getDayOfWeekShortForNumber_noI18n(intval($k[1])); + } + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, $dayTerms, TouchPointWP::TAX_WEEKDAY, false); + wp_set_post_terms($post->ID, $dayTerms, Taxonomies::TAX_WEEKDAY, false); + } - // Time of day taxonomy + // Time of day taxonomy + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, $timeTerms, TouchPointWP::TAX_DAYTIME, false); + wp_set_post_terms($post->ID, $timeTerms, Taxonomies::TAX_DAYTIME, false); + } - //////////////// - //// People //// - //////////////// + //////////////// + //// People //// + //////////////// - // Leaders & Members are now imported through the Person sync. + // Leaders & Members are now imported through the Person sync. - //////////////////// - //// Geographic //// - //////////////////// + //////////////////// + //// Geographic //// + //////////////////// - // Handle locations for involvement types that are geo-enabled - if ($typeSets->useGeo) { - // Handle locations - if (property_exists($inv, "lat") && $inv->lat !== null && - property_exists($inv, "lng") && $inv->lng !== null) { + // Handle locations for involvement types that are geo-enabled + if ($typeSets->useGeo) { + // Handle locations + if (property_exists($inv, "lat") && $inv->lat !== null && + property_exists($inv, "lng") && $inv->lng !== null) { + if ($applyChanges) { update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat", $inv->lat); update_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng", $inv->lng); - } else { + } + } else { + if ($applyChanges) { delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lat"); delete_post_meta($post->ID, TouchPointWP::SETTINGS_PREFIX . "geo_lng"); } + } - // Handle Resident Code - if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) { + // Handle Resident Code + if (property_exists($inv, "resCodeName") && $inv->resCodeName !== null) { + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [$inv->resCodeName], TouchPointWP::TAX_RESCODE, false); - } else { + wp_set_post_terms($post->ID, [$inv->resCodeName], Taxonomies::TAX_RESCODE, false); + } + } else { + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [], TouchPointWP::TAX_RESCODE, false); + wp_set_post_terms($post->ID, [], Taxonomies::TAX_RESCODE, false); } } + } - //////////////// - //// Campus //// - //////////////// + //////////////// + //// Campus //// + //////////////// - if (TouchPointWP::instance()->settings->enable_campuses === "on") { - if (property_exists($inv, "campusName") && $inv->campusName !== null) { + if (TouchPointWP::instance()->settings->enable_campuses === "on") { + if (property_exists($inv, "campusName") && $inv->campusName !== null) { + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [$inv->campusName], TouchPointWP::TAX_CAMPUS, false); - } else { + wp_set_post_terms($post->ID, [$inv->campusName], Taxonomies::TAX_CAMPUS, false); + } + } else { + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [], TouchPointWP::TAX_CAMPUS, false); + wp_set_post_terms($post->ID, [], Taxonomies::TAX_CAMPUS, false); + } + } + + if (Translation::useCampusAsLanguage() && $inv->campusName !== null) { + + // Set content's original language based on Campus. + $langCode = Translation::getWpmlLangCodeForString($inv->campusName); + if ($langCode !== null) { + $args = [ + 'element_id' => $post->ID, + 'element_type' => apply_filters('wpml_element_type', $typeSets->postTypeWithPrefix()), + 'language_code' => $langCode, + 'source_language_code' => $langCode, + 'trid' => $post->ID + ]; + if ($applyChanges) { + do_action('wpml_set_element_language_details', $args); + } + if ($verbose) { + echo "Language Set to: $langCode
"; + } } } + } - ///////////////////// - //// Demographic //// - ///////////////////// + ///////////////////// + //// Demographic //// + ///////////////////// - // Handle Marital Status - $maritalTax = []; - if ($inv->marital_denom > 4) { // only include involvements with at least 4 people with known marital statuses. - $marriedProportion = (float)$inv->marital_married / $inv->marital_denom; - if ($marriedProportion > 0.7) { - $maritalTax[] = "mostly_married"; - } elseif ($marriedProportion < 0.3) { - $maritalTax[] = "mostly_single"; - } + // Handle Marital Status + $maritalTax = []; + if ($inv->marital_denom > 4) { // only include involvements with at least 4 people with known marital statuses. + $marriedProportion = (float)$inv->marital_married / $inv->marital_denom; + if ($marriedProportion > 0.7) { + $maritalTax[] = "mostly_married"; + } elseif ($marriedProportion < 0.3) { + $maritalTax[] = "mostly_single"; } + } + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, $maritalTax, TouchPointWP::TAX_INV_MARITAL, false); + wp_set_post_terms($post->ID, $maritalTax, Taxonomies::TAX_INV_MARITAL, false); + } - // Handle Age Groups + // Handle Age Groups + if ($applyChanges) { if ($inv->age_groups === null) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, [], TouchPointWP::TAX_AGEGROUP, false); + wp_set_post_terms($post->ID, [], Taxonomies::TAX_AGEGROUP, false); } else { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, $inv->age_groups, TouchPointWP::TAX_AGEGROUP, false); + wp_set_post_terms($post->ID, $inv->age_groups, Taxonomies::TAX_AGEGROUP, false); } + } - /////////////////// - //// Divisions //// - /////////////////// + /////////////////// + //// Divisions //// + /////////////////// - // Handle divisions - $divs = []; - if ($inv->divs !== null) { - foreach ($inv->divs as $d) { - $tid = TouchPointWP::getDivisionTermIdByDivId($d); - if ( ! ! $tid) { - $divs[] = $tid; - } - } + // Handle divisions + $divs = []; + if ($inv->divs !== null) { + foreach ($inv->divs as $d) { + $tid = TouchPointWP::getDivisionTermIdByDivId($d); + if ( ! ! $tid) { + $divs[] = $tid; + } } + } + if ($applyChanges) { /** @noinspection PhpRedundantOptionalArgumentInspection */ - wp_set_post_terms($post->ID, $divs, TouchPointWP::TAX_DIV, false); + wp_set_post_terms($post->ID, $divs, Taxonomies::TAX_DIV, false); + } - if ($verbose) { - echo "Division Terms:
"; - var_dump($divs); + if ($verbose) { + echo "Division Terms:
"; + Utilities::var_dump_expandable($divs); + } + + + ////////////////// + //// Meetings //// + ////////////////// + + $postsToKeep = self::updateMeetingsForInvolvement($post, $inv, $typeSets, $imageId, $verbose, $applyChanges); + + if ($verbose) { + echo "Multiple Posts Exist. An attempt will be made to remove them.
"; + } + + if (!$applyChanges) { // dont' loop forever, or do any deletions. + break; + } + for ($i = 1; $i <= $counts; $i++) { + wp_delete_post($mtgP[$i]->ID, true); + } + } + $loops++; + } while ($counts > 1 && $loops < 3); + + $eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < self::updateExpiry(); + + if ($counts > 0) { // post exists already. + $mtgP = reset($mtgP); + } elseif ($eventIsPast) { + if ($verbose) { + echo "Post not found for Meeting $mtgO->mtgId. As it is in the past, it will not be created.
"; + } + return null; + } else { if ($verbose) { - echo "Post not found for Meeting $mtgO->mtgId. Creating.
"; } + if ($applyChanges) { + // create new + $mtgP = wp_insert_post([ + 'post_type' => $typeSets->postTypeWithPrefix(), + 'post_title' => $mtgO->titleToUse, + 'post_name' => $mtgO->slugToUse, + 'post_parent' => $parentPost->ID, + 'post_status' => 'publish', + 'meta_input' => [ + Meeting::MEETING_META_KEY => $mtgO->mtgId + ] + ]); + $mtgP = get_post($mtgP); + } else { + if ($verbose) { + echo "Would create new Post for Meeting {$mtgO->mtgId} ({$mtgO->titleToUse}).
"; + } + $mtgP = new WP_Post((object)[]); // Create an empty placeholder to dry-run the logic. + } + } - unset($post); + $mtgP->post_title = $mtgO->titleToUse; + if (!$eventIsPast) { + if (isset($mtgO->isGroupMember) && $mtgO->isGroupMember) { + $mtgP->post_content = ""; + } else { + $mtgP->post_content = Utilities::standardizeHtml($inv->description, "meeting-import"); + } } - unset($inv); + $mtgP->post_parent = $parentPost->ID; - ////////////////// - //// Removals //// - ////////////////// + self::doMeetingMetaUpdates($mtgP, $mtgO, ! ! $inv->showInSites, $verbose, $applyChanges); - // Delete posts that are no longer current - $q = new WP_Query([ - 'post_type' => $typeSets->postType, - 'nopaging' => true, - 'post__not_in' => $postsToKeep - ]); - $removals = 0; - foreach ($q->get_posts() as $post) { - set_time_limit(10); - wp_delete_post($post->ID, true); - $removals++; + if ($applyChanges) { + wp_update_post($mtgP); + + + if ($imagePostId > 0) { + set_post_thumbnail($mtgP->ID, $imagePostId); + } else { + delete_post_thumbnail($mtgP->ID); + } + + if ($mtgP->post_name !== $mtgO->slugToUse) { + Utilities::forceSlugUpdate($mtgP->ID, $mtgO->slugToUse); + } } - return $removals + count($invData); + return $mtgP; } + /** + * Update meta fields specific to Meetings, such as start/end date/time. + * + * (This is included in this class and not in Meeting because it's a part of the Involvement import process and + * the protected access is appropriate.) + * + * @param WP_Post $mtgP + * @param ?object $mtgO + * @param bool $feature + * @param bool $verbose + * @param bool $applyChanges + * + * @return void + */ + protected static function doMeetingMetaUpdates(WP_Post $mtgP, ?object $mtgO, bool $feature, bool $verbose = false, bool $applyChanges = true): void + { + // If the main post was previously a single, it needs to have the meeting info removed. + if ($mtgO === null) { + if ($applyChanges) { + delete_post_meta($mtgP->ID, Meeting::MEETING_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_START_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_END_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY); + delete_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER); + } + } else { + if ($applyChanges) { + $eventIsPast = ($mtgO->mtgEndDt ?? $mtgO->mtgStartDt) < Utilities::dateTimeNow(); + + update_post_meta($mtgP->ID, Meeting::MEETING_META_KEY, $mtgO->mtgId); + update_post_meta( + $mtgP->ID, + Meeting::MEETING_START_META_KEY, + DateFormats::timestampWithoutOffset($mtgO->mtgStartDt) + ); + update_post_meta( + $mtgP->ID, + Meeting::MEETING_END_META_KEY, + DateFormats::timestampWithoutOffset($mtgO->mtgEndDt) + ); + update_post_meta($mtgP->ID, Meeting::MEETING_FEAT_META_KEY, ! ! $feature); + update_post_meta($mtgP->ID, Meeting::MEETING_INV_ID_META_KEY, $mtgO->involvementId); + update_post_meta($mtgP->ID, Meeting::MEETING_STATUS_META_KEY, intval($mtgO->status)); + update_post_meta($mtgP->ID, Meeting::MEETING_IS_GROUP_MEMBER, 1 * isset($mtgO->isGroupMember)); + + if ($mtgO->location !== null && ! $eventIsPast) { + update_post_meta($mtgP->ID, Meeting::MEETING_LOCATION_META_KEY, $mtgO->location); + } + } + + if ($verbose) { + $link = get_permalink($mtgP); + echo "Updating Post $mtgP->ID based on Meeting $mtgO->mtgId.
"; + } + } + } + + /** + * @param object $inv Involvement info from API + * @param DateTimeZone $siteTz Timezone object + * @param bool $verbose Print details + * + * @return void + */ + protected static function standardizeApiData(object $inv, DateTimeZone $siteTz, bool $verbose): void + { + if ($verbose) { + Utilities::var_dump_expandable($inv); + } + + // TODO convert firstMeeting, lastMeeting and schedules to RRules + + + // Start and end dates + if ($inv->firstMeeting !== null) { + try { + $inv->firstMeeting = new DateTimeExtended($inv->firstMeeting, $siteTz); + $inv->firstMeeting->isAllDay = true; + } catch (Exception) { + $inv->firstMeeting = null; + } + } + if ($inv->lastMeeting !== null) { + try { + $inv->lastMeeting = new DateTimeExtended($inv->lastMeeting, $siteTz); + $inv->lastMeeting->isAllDay = true; + } catch (Exception) { + $inv->lastMeeting = null; + } + } + + // Meeting and Schedule date/time strings as DateTimeExtended + foreach ($inv->schedules as $i => $s) { + try { + if ($s->nextStartDt === $s->nextEndDt || $s->nextEndDt == null) { + $s->nextEndDt = null; + } else { + $s->nextEndDt = new DateTimeExtended($s->nextEndDt, $siteTz); + } + $s->nextStartDt = new DateTimeExtended($s->nextStartDt, $siteTz); + $s->nextStartDt->isAllDay = self::apiScheduleIsAllDay($s); + } catch (Exception) { + unset($inv->schedules[$i]); + } + } + + // TODO: extract end of meeting series from RRule and set involvement last meeting appropriately. + // TODO: extract start of meeting series from series (not rrule necessarily) and set involvement first meeting appropriately. + // TODO: figure out how to make meetings and series related, perhaps? + // TODO: calculate recurrence better. + +// $rset = new RSet(); +// foreach ($inv->meetingSeries as $i => $ms) { +// try { +// if ($ms->seriesStartDt === $ms->seriesEndDt || $ms->seriesEndDt == null) { +// $ms->seriesEndDt = null; +// } else { +// $ms->seriesEndDt = new DateTimeExtended($ms->seriesEndDt, $siteTz); +// } +// $ms->seriesStartDt = new DateTimeExtended($ms->seriesStartDt, $siteTz); +// $ms->seriesStartDt->isAllDay = self::apiMeetingIsAllDay($ms->seriesStartDt); +// +// $ms->rro = RRule::createFromRfcString($ms->rRuleString ?? ""); +// $rset->addRRule($ms->rro); +// +// var_dump($ms->rro); +// var_dump($ms->rro->humanReadable()); +// echo "' . __('Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package.', 'TouchPoint-WP') . - ' ' . __('Upload the package to {tpName} here', 'TouchPoint-WP') . '.
-' . __('Generate Scripts', 'TouchPoint-WP') . '
+ '' . $this->__('Once your settings on this page are set and saved, use this tool to generate the scripts needed for TouchPoint in a convenient installation package.', 'TouchPoint-WP') . + ' ' . $this->__('Upload the package to {tpName} here', 'TouchPoint-WP') . '.
+' . $this->__('Generate Scripts', 'TouchPoint-WP') . '
', [ '{apiUrl}' => "/" . TouchPointWP::API_ENDPOINT . "/" . TouchPointWP::API_ENDPOINT_ADMIN_SCRIPTZIP, @@ -383,14 +526,14 @@ private function settingsFields($includeDetail = false): array $includeThis = $includeDetail === true || $includeDetail === 'people'; $urlParts = wp_parse_url(home_url()); $defaultUserPev = $urlParts['host'] . " User ID"; - $this->settings['people'] = [ - 'title' => __('People', 'TouchPoint-WP'), - 'description' => __('Manage how people are synchronized between TouchPoint and WordPress.', 'TouchPoint-WP'), + $settings['people'] = [ + 'title' => $this->__('People', 'TouchPoint-WP'), + 'description' => $this->__('Manage how people are synchronized between TouchPoint and WordPress.', 'TouchPoint-WP'), 'fields' => [ [ 'id' => 'people_contact_keywords', - 'label' => __('Contact Keywords', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Contact Keywords', 'TouchPoint-WP'), + 'description' => $this->__( 'These keywords will be used when someone clicks the "Contact" button on a Person\'s listing or profile.', 'TouchPoint-WP' ), @@ -401,8 +544,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'people_ev_wpId', - 'label' => __('Extra Value for WordPress User ID', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Value for WordPress User ID', 'TouchPoint-WP'), + 'description' => $this->__( 'The name of the extra value to use for the WordPress User ID. If you are using multiple WordPress instances with one TouchPoint database, you will need these values to be unique between WordPress instances. In most cases, the default is fine.', 'TouchPoint-WP' ), @@ -412,8 +555,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'people_ev_bio', - 'label' => __('Extra Value: Biography', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Value: Biography', 'TouchPoint-WP'), + 'description' => $this->__( 'Import a Bio from a Person Extra Value field. Can be an HTML or Text Extra Value. This will overwrite any values set by WordPress. Leave blank to not import.', 'TouchPoint-WP' ), @@ -423,8 +566,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'people_ev_custom', - 'label' => __('Extra Values to Import', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Values to Import', 'TouchPoint-WP'), + 'description' => $this->__( 'Import People Extra Value fields as User Meta data.', 'TouchPoint-WP' ), @@ -438,15 +581,15 @@ private function settingsFields($includeDetail = false): array } if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_authentication') === "on") { // TODO MULTI -// $includeThis = $includeDetail === true || $includeDetail === 'authentication'; - $this->settings['authentication'] = [ - 'title' => __('Authentication', 'TouchPoint-WP'), - 'description' => __('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'), +// $includeThis = $includeDetail === true || $includeDetail === 'authentication'; + $settings['authentication'] = [ + 'title' => $this->__('Authentication', 'TouchPoint-WP'), + 'description' => $this->__('Allow users to log into WordPress using TouchPoint.', 'TouchPoint-WP'), 'fields' => [ [ 'id' => 'auth_default', - 'label' => __('Make TouchPoint the default authentication method.', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Make TouchPoint the default authentication method.', 'TouchPoint-WP'), + 'description' => $this->__( 'By checking this box, the TouchPoint login page will become the default. To prevent the redirect and reach the standard WordPress login page, add \'tp_no_redirect\' as a URL parameter.', 'TouchPoint-WP' ), @@ -455,8 +598,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'auth_auto_provision', - 'label' => __('Enable Auto-Provisioning', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Enable Auto-Provisioning', 'TouchPoint-WP'), + 'description' => $this->__( 'Automatically create WordPress users, if needed, to match authenticated TouchPoint users.', 'TouchPoint-WP' ), @@ -465,8 +608,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'auth_change_profile_urls', - 'label' => __('Change \'Edit Profile\' links', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Change Profile Links', 'TouchPoint-WP'), + 'description' => $this->__( '"Edit Profile" links will take the user to their TouchPoint profile, instead of their WordPress profile.', 'TouchPoint-WP' ), @@ -475,15 +618,15 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'auth_full_logout', - 'label' => __('Enable full logout', 'TouchPoint-WP'), - 'description' => __('Logout of TouchPoint when logging out of WordPress.', 'TouchPoint-WP'), + 'label' => $this->__('Enable full logout', 'TouchPoint-WP'), + 'description' => $this->__('Logout of TouchPoint when logging out of WordPress.', 'TouchPoint-WP'), 'type' => 'checkbox', 'default' => 'on', ], [ 'id' => 'auth_prevent_admin_bar', - 'label' => __('Prevent Subscriber Admin Bar', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Prevent Subscriber Admin Bar', 'TouchPoint-WP'), + 'description' => $this->__( 'By enabling this option, users who can\'t edit anything won\'t see the Admin bar.', 'TouchPoint-WP' ), @@ -496,17 +639,18 @@ private function settingsFields($includeDetail = false): array if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_involvements') === "on") { // TODO MULTI $includeThis = $includeDetail === true || $includeDetail === 'involvements'; - $this->settings['involvements'] = [ - 'title' => __('Involvements', 'TouchPoint-WP'), - 'description' => __('Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more. Select the division(s) that immediately correspond to the type of Involvement you want to list. For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division. If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here.', 'TouchPoint-WP'), + $settings['involvements'] = [ + 'title' => $this->__('Involvements', 'TouchPoint-WP'), + 'description' => $this->__('Import Involvements from TouchPoint to list them on your website, for Small Groups, Classes, and more. Select the division(s) that immediately correspond to the type of Involvement you want to list. For example, if you want a Small Group list and have a Small Group Division, only select the Small Group Division. If you want Involvements to be filterable by additional Divisions, select those Divisions on the Divisions tab, not here.', 'TouchPoint-WP'), 'fields' => [ [ 'id' => 'inv_json', // involvement settings json (stored as a json string) 'type' => 'textarea', - 'label' => __('Involvement Post Types', 'TouchPoint-WP'), + 'label' => $this->__('Involvement Post Types', 'TouchPoint-WP'), 'default' => '[]', + 'autoload' => true, 'hidden' => true, - 'description' => ! $includeThis ? "" : function () { + 'description' => !$includeThis ? "" : function () { TouchPointWP::requireScript("base"); TouchPointWP::requireScript("knockout-defer"); TouchPointWP::requireScript("select2-defer"); @@ -531,14 +675,14 @@ private function settingsFields($includeDetail = false): array if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_global') === "on") { // TODO MULTI $includeThis = $includeDetail === true || $includeDetail === 'global'; - $this->settings['global'] = [ - 'title' => __('Global Partners', 'TouchPoint-WP'), - 'description' => __('Manage how global partners are imported from TouchPoint for listing on WordPress. Partners are grouped by family, and content is provided through Family Extra Values. This works for both People and Business records.', 'TouchPoint-WP'), + $settings['global'] = [ + 'title' => $this->__('Global Partners', 'TouchPoint-WP'), + 'description' => $this->__('Manage how global partners are imported from TouchPoint for listing on WordPress. Partners are grouped by family, and content is provided through Family Extra Values. This works for both People and Business records.', 'TouchPoint-WP'), 'fields' => [ [ 'id' => 'global_name_plural', - 'label' => __('Global Partner Name (Plural)', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Global Partner Name (Plural)', 'TouchPoint-WP'), + 'description' => $this->__( 'What you call Global Partners at your church', 'TouchPoint-WP' ), @@ -548,8 +692,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_name_singular', - 'label' => __('Global Partner Name (Singular)', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Global Partner Name (Singular)', 'TouchPoint-WP'), + 'description' => $this->__( 'What you call a Global Partner at your church', 'TouchPoint-WP' ), @@ -559,8 +703,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_name_plural_decoupled', - 'label' => __('Global Partner Name for Secure Places (Plural)', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Global Partner Name for Secure Places (Plural)', 'TouchPoint-WP'), + 'description' => $this->__( 'What you call Secure Global Partners at your church', 'TouchPoint-WP' ), @@ -570,8 +714,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_name_singular_decoupled', - 'label' => __('Global Partner Name for Secure Places (Singular)', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Global Partner Name for Secure Places (Singular)', 'TouchPoint-WP'), + 'description' => $this->__( 'What you call a Secure Global Partner at your church', 'TouchPoint-WP' ), @@ -581,20 +725,21 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_slug', - 'label' => __('Global Partner Slug', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Global Partner Slug', 'TouchPoint-WP'), + 'description' => $this->__( 'The root path for Global Partner posts', 'TouchPoint-WP' ), 'type' => 'text', 'default' => 'partners', + 'autoload' => true, 'placeholder' => 'partners', 'callback' => fn($new) => $this->validation_slug($new, 'global_slug') ], [ 'id' => 'global_search', - 'label' => __('Saved Search', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Saved Search', 'TouchPoint-WP'), + 'description' => $this->__( 'Anyone who is included in this saved search will be included in the listing.', 'TouchPoint-WP' ), @@ -604,8 +749,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_description', - 'label' => __('Extra Value: Description', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Value: Description', 'TouchPoint-WP'), + 'description' => $this->__( 'Import a description from a Family Extra Value field. Can be an HTML or Text Extra Value. This becomes the body of the Global Partner post.', 'TouchPoint-WP' ), @@ -615,8 +760,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_summary', - 'label' => __('Extra Value: Summary', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Value: Summary', 'TouchPoint-WP'), + 'description' => $this->__( 'Optional. Import a short description from a Family Extra Value field. Can be an HTML or Text Extra Value. If not provided, the full bio will be truncated.', 'TouchPoint-WP' ), @@ -626,8 +771,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_geo_lat', - 'label' => __('Latitude Override', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Latitude Override', 'TouchPoint-WP'), + 'description' => $this->__( 'Designate a text Family Extra Value that will contain a latitude that overrides any locations on the partner\'s profile for the partner map. Both latitude and longitude must be provided for an override to take place.', 'TouchPoint-WP' ), @@ -637,8 +782,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_geo_lng', - 'label' => __('Longitude Override', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Longitude Override', 'TouchPoint-WP'), + 'description' => $this->__( 'Designate a text Family Extra Value that will contain a longitude that overrides any locations on the partner\'s profile for the partner map. Both latitude and longitude must be provided for an override to take place.', 'TouchPoint-WP' ), @@ -648,8 +793,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_location', - 'label' => __('Public Location', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Public Location', 'TouchPoint-WP'), + 'description' => $this->__( 'Designate a text Family Extra Value that will contain the partner\'s location, as you want listed publicly. For partners who have DecoupleLocation enabled, this field will be associated with the map point, not the list entry.', 'TouchPoint-WP' ), @@ -659,8 +804,8 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_fev_custom', - 'label' => __('Extra Values to Import', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Extra Values to Import', 'TouchPoint-WP'), + 'description' => $this->__( 'Import Family Extra Value fields as Meta data on the partner\'s post', 'TouchPoint-WP' ), @@ -671,49 +816,72 @@ private function settingsFields($includeDetail = false): array ], [ 'id' => 'global_primary_tax', - 'label' => __('Primary Taxonomy', 'TouchPoint-WP'), - 'description' => __( + 'label' => $this->__('Primary Taxonomy', 'TouchPoint-WP'), + 'description' => $this->__( 'Import a Family Extra Value as the primary means by which partners are organized.', 'TouchPoint-WP' ), 'type' => 'select', 'options' => $includeThis ? $this->parent->getFamilyEvFieldsAsKVArray('code', true) : [], 'default' => "", + 'autoload' => true, ], ], ]; } - if (TouchPointWP::useTribeCalendar()) { + if (TouchPointWP::useTribeOrMeetingCalendars()) { + $options = []; + $default = ''; + if (TouchPointWP::useTribeCalendar()) { + $options['tribe'] = $this->__('Events Calendar plugin by Modern Tribe', 'TouchPoint-WP'); + $default = 'tribe'; + } + if (get_option(TouchPointWP::SETTINGS_PREFIX . 'enable_meeting_cal') === "on") { + $options['meetings'] = $this->__('TouchPoint Meetings', 'TouchPoint-WP'); + $default = 'meetings'; + } + /** @noinspection HtmlUnknownTarget */ - $this->settings['events_calendar'] = [ - 'title' => __('Events Calendar', 'TouchPoint-WP'), - 'description' => __('Integrate with The Events Calendar from ModernTribe.', 'TouchPoint-WP'), + $settings['events_calendar'] = [ + 'title' => $this->__('App 2.0 Calendar', 'TouchPoint-WP'), + 'description' => $this->__('Integrate Custom Mobile app version 2.0 with The Events Calendar from Modern Tribe.', 'TouchPoint-WP'), 'fields' => [ + [ + 'id' => 'ec_app_cal_provider', + 'label' => $this->__('Events Provider', 'TouchPoint-WP'), + 'description' => $this->__( + 'The source of events for version 2.0 of the Custom Mobile App.', + 'TouchPoint-WP' + ), + 'type' => 'select', + 'options' => $options, + 'default' => $default, + ], [ 'id' => 'ec_app_cal_url', - 'label' => __('Events for Custom Mobile App', 'TouchPoint-WP'), + 'label' => $this->__('Events for Custom Mobile App', 'TouchPoint-WP'), 'type' => 'instructions', 'description' => strtr( - '' . __('To use your Events Calendar events in the Custom mobile app, set the Provider to Wordpress Plugin - Modern Tribe and use this url:', 'TouchPoint-WP') . '
' . $this->__("To use your Events Calendar events in the Custom mobile app, set the Provider to Wordpress Plugin - Modern Tribe (regardless of which provider you're using above) and use this url:", 'TouchPoint-WP') . '
' . "\n"; $html .= '' . "\n"; - $html .= '' . "\n"; $html .= '
' . "\n"; @@ -1552,7 +1904,7 @@ protected function validation_secret(string $new, string $field): string * * @return string */ - protected function validation_slug($new, string $field): string + protected function validation_slug(mixed $new, string $field): string { if ($new != $this->$field) { // only validate the field if it's changing. $new = $this->validation_lowercase($new); @@ -1565,6 +1917,28 @@ protected function validation_slug($new, string $field): string return $new; } + + /** + * Validate that selected post types are actually post types that exist. + * + * @param ?array $new The new value. + * + * @return string[] + */ + protected function validation_postTypes(?array $new): array + { + $types = array_keys(Utilities::getRegisteredPostTypesAsKVArray()); + $r = []; + $new ??= []; + sort($new); + foreach ($new as $t) { + if (in_array($t, $types)) { + $r[] = $t; + } + } + return $r; + } + /** * Force a value to lowercase; used as a validator * @@ -1585,7 +1959,7 @@ public function validation_lowercase(string $data): string * * @return mixed lower-case string */ - protected function validation_updateScriptsIfChanged($new, string $field) + protected function validation_updateScriptsIfChanged(mixed $new, string $field): mixed { if ($new !== $this->$field) { TouchPointWP::queueUpdateDeployedScripts(); @@ -1594,10 +1968,27 @@ protected function validation_updateScriptsIfChanged($new, string $field) return $new; } + /** + * If a setting is changed that impacts the PATs, invalidate the existing PAT. + * + * @param mixed $new the new value, which could be anything + * @param string $field The name of the field that's getting updated + * + * @return mixed lower-case string + */ + protected function validation_invalidatePATIfChanged(mixed $new, string $field): mixed + { + if ($new !== $this->$field) { + TouchPointWP::instance()->api->invalidatePAT(); + } + + return $new; + } + /** * Cloning is forbidden. * - * @since 1.0.0 + * @since 0.0.90 Added */ public function __clone() { @@ -1611,7 +2002,7 @@ public function __clone() /** * Unserializing instances of this class is forbidden. * - * @since 1.0.0 + * @since 0.0.90 Added */ public function __wakeup() { diff --git a/src/TouchPoint-WP/Stats.php b/src/TouchPoint-WP/Stats.php new file mode 100644 index 00000000..bec3652c --- /dev/null +++ b/src/TouchPoint-WP/Stats.php @@ -0,0 +1,499 @@ + $value) { + if (property_exists($this, $key)) { + $this->$key = $value; + } + } + } + } + + if (empty($this->installId) || empty($this->privateKey)) { + $this->privateKey = Utilities::createGuid(); + $this->installId = Utilities::createGuid(); + $this->_dirty = true; + } + + $sid = get_site_option('tp_siteId', null); + if (empty($sid)) { + $sid = Utilities::createGuid(); + update_site_option('tp_siteId', $sid); + } + $this->siteId = $sid; + + $this->updateDb(); + } + + /** + * Make sure saves have happened before the object is destroyed. + * + * @throws Exception + */ + public function __destruct() + { + if ($this->_dirty) { + throw new Exception("Stats object was not saved."); + } + } + + /** + * Loads the module and initializes the other actions. + * + * @return bool + */ + public static function load(): bool + { + ////////////////// + /// Shortcodes /// + ////////////////// + + + /////////////// + /// Syncing /// + /////////////// + + // Setup cron for calling home weekly. + add_action(self::CRON_HOOK, [self::class, 'updateCron']); + if ( ! wp_next_scheduled(self::CRON_HOOK)) { + // Runs at 4am EST (9am UTC) + wp_schedule_event( + date('U', strtotime('tomorrow') + 3600 * 9), + 'weekly', + self::CRON_HOOK + ); + } + + return true; + } + + /** + * Call home, triggered by migration. + * + * @return void + */ + public static function migrate(): void + { + self::instance()->submitStats(); + } + + /** + * Call home, triggered by cron. + * + * @return void + */ + public static function updateCron(): void + { + $i = self::instance(); + $i->replacePrivateKey(); + $i->submitStats(); + } + + /** + * Check to see if a cron run is needed, and run it if so. Connected to an init function. + * + * @return void + */ + public static function checkUpdates(): void + { + // This method does nothing because the overhead is relatively great, and should not be hooked to every page load. + } + + /** + * Save the stats to the database. + * + * @return bool true on success (or if an update wasn't needed), false on failure. + */ + public function updateDb(): bool + { + if ($this->_dirty) { + $d = $this->jsonSerialize(); + unset($d['siteId']); + + // Check if update is actually needed. If not, return true. + $d = json_encode($d); + if ($d === get_option('tp_wp_stats')) { + $this->_dirty = false; + return true; + } + + $r = update_option('tp_wp_stats', $d); + if ($r) { + $this->_dirty = false; + } else if (WP_DEBUG) { + error_log("TouchPoint-WP: Stats: Failed to save update to local database."); + } + return $r; + } + return true; + } + + /** + * Setter. Allows particular statistics to be set. + * + * @param $name + * @param $value + * + * @throws InvalidArgumentException + * + * @return void + */ + public function __set($name, $value) + { + if (in_array($name, ['privateKey', 'siteId', 'installId'])) { + throw new InvalidArgumentException("Cannot set $name directly."); + } + + if (property_exists($this, $name)) { + if ($this->$name !== $value) { + $this->$name = $value; + $this->_dirty = true; + } + } + } + + /** + * @param string $name + * + * @return void + * + * @throws InvalidArgumentException + */ + public function __get(string $name) + { + if (property_exists($this, $name) && !str_starts_with($name, '_')) { + return $this->$name; + } + } + + /** + * Assemble the information that's submitted. + * + * @param bool $updateQueried + * + * @return array + */ + public function getStatsForSubmission(bool $updateQueried = false): array + { + if ($updateQueried) { + $this->updateQueriedStats(); + } + + $data = $this->jsonSerialize(); + + $sets = TouchPointWP::instance()->settings; + + $data['site'] = get_site_url(); + $data['plugin'] = 'TouchPointWP'; + $data['version'] = TouchPointWP::VERSION; + $data['php'] = phpversion(); + $data['wp'] = get_bloginfo('version'); + $data['wpLocale'] = get_locale(); + $data['wpTimezone'] = get_option('timezone_string'); + $data['adminEmail'] = get_option('admin_email'); + $data['siteName'] = get_bloginfo('name'); + $data['siteLogo'] = get_theme_mod('custom_logo'); + if ($data['siteLogo']) { + $data['siteLogo'] = esc_url(wp_get_attachment_image_src($data['siteLogo'], 'full')[0]); + } else { + $data['siteLogo'] = ''; + } + $data['listPublicly'] = 1 * ($sets->enable_public_listing === 'on'); + $data['installId'] = $this->installId; + $data['privateKey'] = $this->privateKey; + + return $data; + } + + /** + * Submit stats to Tenth. + * + * @param bool $blocking If true, will wait for the response from the server before returning and the method will print a status. + * + * @return void + */ + protected function submitStats(bool $blocking = false): void + { + $this->updateQueriedStats(); + + $data = $this->getStatsForSubmission(); + + $endpoint = self::SUBMISSION_ENDPOINT; + + /** + * This plugin is designed to be used by other churches, but to help troubleshoot and understand usage, some + * basic statistics are sent back to Tenth. This filter allows you to change the endpoint to which the data is + * sent, which may be necessary if you have a proxy system setup. It also allows you to disable the sending of + * all information back to Tenth by setting the value to an empty string. + * + * The URL must use https. + * + * @since 0.0.96 Added + * + * @param string $endpoint The endpoint value to use. + */ + $endpoint = (string)apply_filters('tp_stats_endpoint', $endpoint); + + if ( ! str_starts_with($endpoint, 'https://')) { + return; + } + + $r = wp_remote_post($endpoint, [ + 'body' => ['data' => $data], + 'timeout' => 10, + 'blocking' => $blocking, + ]); + + if (!$blocking) { + if (is_wp_error($r)) { + echo "error"; + error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . $r->get_error_message()); + } else { + $code = wp_remote_retrieve_response_code($r); + if ($code !== 200) { + echo "error"; + error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . wp_remote_retrieve_body($r)); + } else { + echo "ok"; + } + } + + } + } + + /** + * Assemble the object into a format that can be serialized to JSON. Only includes + * the parameters that are part of this class, not those that are loaded from the database separately, + * such as version numbers. + * + * @inheritDoc + */ + public function jsonSerialize(): array + { + $r = []; + + // all properties that don't start with an underscore + foreach (get_object_vars($this) as $key => $value) { + if ( ! str_starts_with($key, '_')) { + $r[$key] = $value; + } + } + + return $r; + } + + /** + * Replace the private key with a new one. Should be done periodically. + * + * @return void + */ + protected function replacePrivateKey(): void + { + $this->privateKey = Utilities::createGuid(); + $this->_dirty = true; + } + + /** + * Update the stats that are determined from queries. + * + * @return void + */ + protected function updateQueriedStats(): void + { + global $wpdb; + + $this->involvementPosts = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_invId'") ?? -1; + $this->reportPosts = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_report'") ?? -1; + $this->meetings = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->postmeta WHERE meta_key = 'tp_mtgId'") ?? -1; + $this->people = $wpdb->get_var("SELECT COUNT(DISTINCT meta_value) as c FROM $wpdb->usermeta WHERE meta_key = 'tp_peopleId';") ?? -1; + $this->partnerPosts = $wpdb->get_var("SELECT COUNT(*) as c FROM $wpdb->posts WHERE post_type = 'tp_partner'") ?? -1; + + $this->_dirty = true; + + $this->updateDb(); + } + + /** + * Get the singleton. + * + * @return Stats + */ + public static function instance(): Stats + { + if (self::$instance === null) { + self::$instance = new self(); + } + return self::$instance; + } + + /** + * Handle API requests + * + * @param array $uri The request URI already parsed by parse_url() + * + * @return bool False if endpoint is not found. Should print the result. + */ + public static function api(array $uri): bool + { + if (count($uri['path']) !== 3) { + return false; + } + + $s = self::instance(); + + switch (strtolower($uri['path'][2])) { + case "get": + if (strtolower($_GET['key'] ?? "") == strtolower($s->privateKey) || + current_user_can('manage_options')) { + header('Content-Type: application/json'); + echo json_encode($s->getStatsForSubmission(true)); + $s->updateDb(); + exit; + } + break; + + case "submit": + if ($_SERVER['REQUEST_METHOD'] === "POST") { + self::handleSubmission(); + } else { + $s->submitStats(true); + } + exit; + + } + + return false; + } + + /** + * Handle submissions received to this site (presumably tenth.org) from other users of the plugin. + * + * @return bool True on success + */ + public static function handleSubmission(): bool + { + + if ($_SERVER['REQUEST_METHOD'] !== "POST") { + http_response_code(Http::METHOD_NOT_ALLOWED); + echo "Only POST requests are allowed."; + return false; + } + + $data = $_POST['data'] ?? null; + + if (empty($data)) { + http_response_code(Http::BAD_REQUEST); + echo "No data was submitted."; + return false; + } + + // validate that privateKey, installId, and siteId are all included. + if ( ! isset($data['privateKey']) || ! isset($data['installId']) || ! isset($data['siteId'])) { + http_response_code(Http::BAD_REQUEST); + echo "Keys not provided."; + return false; + } + + // remove any fields that are not part of the stats object. + $s = self::instance(); + $data = array_intersect_key($data, $s->getStatsForSubmission()); + $data['updatedDT'] = date('Y-m-d H:i:s'); + + // upsert the data into the database into the stats table without destructive replace function + global $wpdb; + $r = $wpdb->update($wpdb->prefix . TouchPointWP::TABLE_STATS, $data, ['installId' => $data['installId']]); + if ($r < 1) { + $r = $wpdb->insert($wpdb->prefix . TouchPointWP::TABLE_STATS, $data); + } + + if ($r === false) { + http_response_code(Http::SERVER_ERROR); + echo "Server error."; + return false; + } + + echo $r; + return true; + } +} \ No newline at end of file diff --git a/src/TouchPoint-WP/StatusWidget.php b/src/TouchPoint-WP/StatusWidget.php new file mode 100644 index 00000000..95cfb153 --- /dev/null +++ b/src/TouchPoint-WP/StatusWidget.php @@ -0,0 +1,123 @@ +setTimezone(wp_timezone()); + + return wp_sprintf( + // translators: %1$s is the date(s), %2$s is the time(s). + __('%1$s at %2$s', 'TouchPoint-WP'), + DateFormats::DateStringFormattedShort($timestamp), + DateFormats::TimeStringFormatted($timestamp) + ); + } + + /** + * Print the widget content. + * + * @return void + */ + public static function render(): void + { + $stats = (object) Stats::instance()->getStatsForSubmission(true); + $settings = TouchPointWP::instance()->settings; + + global $wpdb; + $rpt = Report::POST_TYPE; + $reportData = $wpdb->get_row("SELECT MAX(post_modified) as ts, COUNT(*) as cnt FROM $wpdb->posts WHERE post_type = '$rpt'"); + + echo '| "; + + echo " | " . __("Imported", "TouchPoint-WP") . " | "; + echo "" . __("Last Updated", "TouchPoint-WP") . " |
|---|---|---|
| People | ' . $stats->people . ' | ' . self::timestampToFormated($settings->person_cron_last_run) . " |
| Involvements | ' . $stats->involvementPosts . ' | ' . self::timestampToFormated($settings->inv_cron_last_run) . " |
| Meetings | ' . $stats->meetings . ' | ' . self::timestampToFormated($settings->inv_cron_last_run) . " |
| Partners | ' . $stats->partnerPosts . ' | ' . self::timestampToFormated($settings->global_cron_last_run) . " |
| Reports | ' . $reportData->cnt . ' | ' . self::timestampToFormated($reportData->ts) . " |