',
- esc_attr($name),
- esc_attr($value),
- esc_attr($size),
- esc_attr($placeholder)
- );
- }
-
- /**
- * Gibt eine Checkbox für die Metabox aus
- *
- * @param string $label Beschriftung
- * @param string $name Feld-ID
- * @param bool $state Zustandswert
- */
- private function echoInputCheckbox($label, $name, $state)
- {
- printf(
- '',
- esc_attr($name),
- checked($state, '1', false),
- $label
- );
- }
-
- /**
- * @param WP_Term[] $terms
- * @param WP_Taxonomy $taxonomy
- * @param int[] $assignedIds
- */
- private function echoTermCheckboxes($terms, $taxonomy, $assignedIds)
- {
- $format = '';
- if ($taxonomy->hierarchical) {
- $format = str_replace('%2$s', '%2$d', $format);
- }
- foreach ($terms as $term) {
- $assigned = in_array($term->term_id, $assignedIds);
- printf(
- $format,
- $taxonomy->name,
- ($taxonomy->hierarchical ? esc_attr($term->term_id) : esc_attr($term->name)),
- checked($assigned, true, false),
- esc_html($term->name)
- );
- }
- }
-
/**
* Gibt die Namen aller bisher verwendeten Einsatzleiter zurück
*
* @return array
*/
- public function getEinsatzleiterNamen()
+ public function getEinsatzleiterNamen(): array
{
- /** @var wpdb $wpdb */
global $wpdb;
$names = array();
diff --git a/src/Admin/ReportListTable.php b/src/Admin/ReportListTable.php
index 1fa61376..47ba77f2 100644
--- a/src/Admin/ReportListTable.php
+++ b/src/Admin/ReportListTable.php
@@ -21,7 +21,7 @@ class ReportListTable
*
* @var array
*/
- private $customColumns = array();
+ private $customColumns;
/**
* ReportListTable constructor.
@@ -72,7 +72,7 @@ public function __construct()
*
* @return array
*/
- public function filterColumnsEinsatz($columns)
+ public function filterColumnsEinsatz($columns): array
{
unset($columns['author']);
unset($columns['date']);
@@ -96,7 +96,7 @@ public function filterColumnContentEinsatz($column, $postId)
{
$report = new IncidentReport($postId);
$content = $this->getColumnContent($column, $report);
- echo (empty($content) ? '-' : $content);
+ echo empty($content) ? '-' : $content;
}
/**
@@ -105,7 +105,7 @@ public function filterColumnContentEinsatz($column, $postId)
*
* @return string
*/
- public function getColumnContent($columnId, IncidentReport $report)
+ public function getColumnContent($columnId, IncidentReport $report): string
{
switch ($columnId) {
case 'e_nummer':
@@ -136,7 +136,7 @@ public function getColumnContent($columnId, IncidentReport $report)
$vehicleLinks = array_map(array($this, 'getTermFilterLink'), $vehicles);
return join(', ', $vehicleLinks);
case 'einsatzverwaltung_annotations':
- return AnnotationIconBar::getInstance()->render($report);
+ return AnnotationIconBar::getInstance()->render($report->getPostId());
case 'einsatzverwaltung_units':
$units = $report->getUnits();
$unitLinks = array_map(array($this, 'getTermFilterLink'), $units);
@@ -150,7 +150,7 @@ public function getColumnContent($columnId, IncidentReport $report)
* @param WP_Term|null $term
* @return string An HTML anchor to filter this list table for occurrences of a certain term
*/
- private function getTermFilterLink(WP_Term $term = null)
+ private function getTermFilterLink(WP_Term $term = null): string
{
if (empty($term)) {
return '';
@@ -220,7 +220,7 @@ private function echoEditCustomBox($columnName)
*
* @return bool
*/
- private function columnHasCustomBox($columnName)
+ private function columnHasCustomBox($columnName): bool
{
return array_key_exists($columnName, $this->customColumns) && $this->customColumns[$columnName]['quickedit'];
}
@@ -232,7 +232,7 @@ private function columnHasCustomBox($columnName)
*
* @return string
*/
- private function getColumnLabel($columnName)
+ private function getColumnLabel($columnName): string
{
if (!array_key_exists($columnName, $this->customColumns)) {
return '';
diff --git a/src/Admin/TasksPage.php b/src/Admin/TasksPage.php
index 15d91782..749b1ad0 100644
--- a/src/Admin/TasksPage.php
+++ b/src/Admin/TasksPage.php
@@ -79,8 +79,8 @@ public function renderPage()
echo '
Permalinks von ' . count($posts) . ' Einsatzberichten werden angepasst...
';
// Da nur die Titelform geändert wird, muss keine Aktualisierung der laufenden Nummern etc. anlaufen
- remove_action('private_einsatz', array($this->data, 'onPublish'), 10);
- remove_action('publish_einsatz', array($this->data, 'onPublish'), 10);
+ remove_action('private_einsatz', array($this->data, 'onPublish'));
+ remove_action('publish_einsatz', array($this->data, 'onPublish'));
$processed = 0;
foreach ($posts as $post) {
diff --git a/src/Core.php b/src/Core.php
index 5ff12e27..b00a6831 100644
--- a/src/Core.php
+++ b/src/Core.php
@@ -11,7 +11,7 @@
*/
class Core
{
- const VERSION = '1.8.0';
+ const VERSION = '1.9.0';
const DB_VERSION = 60;
/**
@@ -197,7 +197,7 @@ private function maybeUpdate()
/**
* @return Data
*/
- public function getData()
+ public function getData(): Data
{
return $this->data;
}
@@ -208,7 +208,7 @@ public function getData()
*
* @return Core
*/
- public static function getInstance()
+ public static function getInstance(): ?Core
{
if (null === self::$instance) {
self::$instance = new Core();
diff --git a/src/CustomFields/Checkbox.php b/src/CustomFields/Checkbox.php
index 6a93123d..94bd4351 100644
--- a/src/CustomFields/Checkbox.php
+++ b/src/CustomFields/Checkbox.php
@@ -29,7 +29,7 @@ public function __construct($key, $label, $checkboxLabel, $description, $default
/**
* @inheritDoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return sprintf(
'',
@@ -41,7 +41,7 @@ public function getAddTermInput()
/**
* @inheritDoc
*/
- public function getAddTermMarkup()
+ public function getAddTermMarkup(): string
{
return sprintf(
'
%2$s%4$s
%5$s
',
@@ -56,7 +56,7 @@ public function getAddTermMarkup()
/**
* @inheritDoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
$value = $this->getValue($termId);
return ($value === '1' ? __('Yes', 'einsatzverwaltung') : __('No', 'einsatzverwaltung'));
@@ -65,7 +65,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return sprintf(
'',
@@ -77,7 +77,7 @@ public function getEditPostInput(WP_Post $post)
/**
* @inheritDoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return sprintf(
'',
@@ -89,7 +89,7 @@ public function getEditTermInput($tag)
/**
* @inheritDoc
*/
- public function getEditTermMarkup($tag)
+ public function getEditTermMarkup($tag): string
{
return sprintf(
'
%2$s
%3$s
%5$s
',
diff --git a/src/CustomFields/ColorPicker.php b/src/CustomFields/ColorPicker.php
index e9dca70c..f22ad9c3 100644
--- a/src/CustomFields/ColorPicker.php
+++ b/src/CustomFields/ColorPicker.php
@@ -21,7 +21,7 @@ public function __construct($key, $label, $description, $defaultValue = '')
/**
* @inheritdoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return sprintf(
'',
@@ -32,7 +32,7 @@ public function getAddTermInput()
/**
* @inheritdoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return sprintf(
'',
@@ -44,7 +44,7 @@ public function getEditTermInput($tag)
/**
* @inheritdoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
$value = $this->getValue($termId);
if (empty($value)) {
@@ -60,7 +60,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return sprintf(
'',
diff --git a/src/CustomFields/CustomField.php b/src/CustomFields/CustomField.php
index 4844468a..f28e7f82 100644
--- a/src/CustomFields/CustomField.php
+++ b/src/CustomFields/CustomField.php
@@ -34,7 +34,7 @@ public function __construct($key, $label, $description, $defaultValue = false)
/**
* @return string The markup for the form field shown when adding a new term.
*/
- public function getAddTermMarkup()
+ public function getAddTermMarkup(): string
{
return sprintf(
'
%4$s
%3$s
',
@@ -49,7 +49,7 @@ public function getAddTermMarkup()
* @param WP_Term $tag Current taxonomy term object.
* @return string The markup for the form field shown when editing an existing term.
*/
- public function getEditTermMarkup($tag)
+ public function getEditTermMarkup($tag): string
{
return sprintf(
'
%4$s
%3$s
',
@@ -80,23 +80,23 @@ public function getValue($objectId)
/**
* @return string The markup for the input shown when adding a new term.
*/
- abstract public function getAddTermInput();
+ abstract public function getAddTermInput(): string;
/**
* @param int $termId
* @return string
*/
- abstract public function getColumnContent($termId);
+ abstract public function getColumnContent($termId): string;
/**
* @param WP_Post $post Currently edited post object
* @return string HTML markup for the input
*/
- abstract public function getEditPostInput(WP_Post $post);
+ abstract public function getEditPostInput(WP_Post $post): string;
/**
* @param WP_Term $tag Current taxonomy term object.
* @return string The markup for the input shown when editing an existing term.
*/
- abstract public function getEditTermInput($tag);
+ abstract public function getEditTermInput($tag): string;
}
diff --git a/src/CustomFields/NumberInput.php b/src/CustomFields/NumberInput.php
index b1a424a4..532db70e 100644
--- a/src/CustomFields/NumberInput.php
+++ b/src/CustomFields/NumberInput.php
@@ -21,7 +21,7 @@ public function __construct($key, $label, $description, $defaultValue = 0)
/**
* @inheritdoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return sprintf(
'',
@@ -33,7 +33,7 @@ public function getAddTermInput()
/**
* @inheritdoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return sprintf(
'',
@@ -45,7 +45,7 @@ public function getEditTermInput($tag)
/**
* @inheritdoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
return esc_html($this->getValue($termId));
}
@@ -53,7 +53,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return sprintf(
'',
diff --git a/src/CustomFields/PostSelector.php b/src/CustomFields/PostSelector.php
index 4618dc45..4979d2b1 100644
--- a/src/CustomFields/PostSelector.php
+++ b/src/CustomFields/PostSelector.php
@@ -44,7 +44,7 @@ public function __construct($key, $label, $description, $postTypes = array('post
* }
* @return string HTML-Code für Auswahlfeld
*/
- public function dropdownPosts($args)
+ public function dropdownPosts($args): string
{
$defaults = array(
'echo' => true,
@@ -108,7 +108,7 @@ public function dropdownPosts($args)
/**
* @inheritdoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return $this->dropdownPosts(array(
'echo' => false,
@@ -120,7 +120,7 @@ public function getAddTermInput()
/**
* @inheritdoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return $this->dropdownPosts(array(
'echo' => false,
@@ -133,7 +133,7 @@ public function getEditTermInput($tag)
/**
* @inheritdoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
$postId = $this->getValue($termId);
@@ -154,7 +154,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return $this->dropdownPosts(array(
'echo' => false,
diff --git a/src/CustomFields/TextInput.php b/src/CustomFields/TextInput.php
index d1749498..0c52abda 100644
--- a/src/CustomFields/TextInput.php
+++ b/src/CustomFields/TextInput.php
@@ -21,7 +21,7 @@ public function __construct($key, $label, $description, $defaultValue = '')
/**
* @inheritdoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return sprintf(
'',
@@ -32,7 +32,7 @@ public function getAddTermInput()
/**
* @inheritdoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return sprintf(
'',
@@ -44,7 +44,7 @@ public function getEditTermInput($tag)
/**
* @inheritdoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
return esc_html($this->getValue($termId));
}
@@ -52,7 +52,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return sprintf(
'',
diff --git a/src/CustomFields/UnitSelector.php b/src/CustomFields/UnitSelector.php
new file mode 100644
index 00000000..0664cccc
--- /dev/null
+++ b/src/CustomFields/UnitSelector.php
@@ -0,0 +1,84 @@
+ _x('- none -', 'unit dropdown', 'einsatzverwaltung'),
+ 'orderby' => 'NAME',
+ 'order' => 'ASC',
+ 'hide_empty' => false,
+ 'echo' => false,
+ 'name' => $this->key,
+ 'taxonomy' => Unit::getSlug(),
+ ));
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getEditTermInput($tag): string
+ {
+ return wp_dropdown_categories(array(
+ 'show_option_none' => _x('- none -', 'unit dropdown', 'einsatzverwaltung'),
+ 'orderby' => 'NAME',
+ 'order' => 'ASC',
+ 'hide_empty' => false,
+ 'echo' => false,
+ 'name' => $this->key,
+ 'taxonomy' => Unit::getSlug(),
+ 'selected' => $this->getValue($tag->term_id),
+ ));
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getColumnContent($termId): string
+ {
+ $unitTermId = $this->getValue($termId);
+
+ $unit = get_term($unitTermId, Unit::getSlug());
+ if (empty($unit) || is_wp_error($unit)) {
+ return '';
+ }
+
+ return esc_html($unit->name);
+ }
+
+ /**
+ * @inheritDoc
+ * @throws Exception
+ */
+ public function getEditPostInput(WP_Post $post): string
+ {
+ throw new Exception('Not yet implemented');
+ }
+}
diff --git a/src/CustomFields/UrlInput.php b/src/CustomFields/UrlInput.php
index c98d807b..76003dd7 100644
--- a/src/CustomFields/UrlInput.php
+++ b/src/CustomFields/UrlInput.php
@@ -23,7 +23,7 @@ public function __construct($key, $label, $description, $defaultValue = '')
/**
* @inheritDoc
*/
- public function getAddTermInput()
+ public function getAddTermInput(): string
{
return sprintf(
'',
@@ -35,7 +35,7 @@ public function getAddTermInput()
/**
* @inheritDoc
*/
- public function getColumnContent($termId)
+ public function getColumnContent($termId): string
{
$url = $this->getValue($termId);
if (empty($url)) {
@@ -52,7 +52,7 @@ public function getColumnContent($termId)
/**
* @inheritDoc
*/
- public function getEditPostInput(WP_Post $post)
+ public function getEditPostInput(WP_Post $post): string
{
return sprintf(
'',
@@ -64,7 +64,7 @@ public function getEditPostInput(WP_Post $post)
/**
* @inheritDoc
*/
- public function getEditTermInput($tag)
+ public function getEditTermInput($tag): string
{
return sprintf(
'',
diff --git a/src/CustomFieldsRepository.php b/src/CustomFieldsRepository.php
index 2fe8280a..5ce16f24 100644
--- a/src/CustomFieldsRepository.php
+++ b/src/CustomFieldsRepository.php
@@ -76,7 +76,7 @@ public function add(CustomType $customType, CustomField $customField)
*
* @return CustomField[]
*/
- public function getFieldsForType($slug)
+ public function getFieldsForType($slug): array
{
if ($this->hasPostType($slug)) {
return $this->postTypeFields[$slug];
@@ -94,7 +94,7 @@ public function getFieldsForType($slug)
*
* @return bool
*/
- private function hasPostType($postType)
+ private function hasPostType($postType): bool
{
return array_key_exists($postType, $this->postTypeFields) && is_array($this->postTypeFields[$postType]);
}
@@ -106,7 +106,7 @@ private function hasPostType($postType)
*
* @return bool
*/
- private function hasTaxonomy($taxonomy)
+ private function hasTaxonomy($taxonomy): bool
{
return array_key_exists($taxonomy, $this->taxonomyFields) && is_array($this->taxonomyFields[$taxonomy]);
}
@@ -148,7 +148,7 @@ public function onEditFormFields($tag, $taxonomy)
* @param array $columns
* @return array
*/
- public function onCustomColumns($columns)
+ public function onCustomColumns($columns): array
{
$screen = get_current_screen();
@@ -220,7 +220,7 @@ public function onPostColumnContent($columnId, $postId)
*
* @return string Inhalt der Spalte
*/
- public function onTaxonomyColumnContent($string, $columnName, $termId)
+ public function onTaxonomyColumnContent($string, $columnName, $termId): string
{
$term = get_term($termId);
if (empty($term) || is_wp_error($term)) {
diff --git a/src/Data.php b/src/Data.php
index ffc9fcd5..a42db22b 100644
--- a/src/Data.php
+++ b/src/Data.php
@@ -46,7 +46,7 @@ class Data
*
* @param Options $options
*/
- public function __construct($options)
+ public function __construct(Options $options)
{
$this->options = $options;
}
@@ -56,9 +56,8 @@ public function __construct($options)
*
* @return int[]
*/
- public function getYearsWithReports()
+ public function getYearsWithReports(): array
{
- /** @var wpdb $wpdb */
global $wpdb;
$yearStrings = $wpdb->get_col($wpdb->prepare(
@@ -75,7 +74,7 @@ public function getYearsWithReports()
* @param int $postId ID des Posts
* @param WP_Post $post Das Post-Objekt
*/
- public function savePostdata($postId, $post)
+ public function savePostdata(int $postId, WP_Post $post)
{
// Schreibrechte prüfen
if (!current_user_can('edit_einsatzbericht', $postId)) {
@@ -212,7 +211,7 @@ public function updateSequenceNumbers($yearToUpdate = null)
* @param int $postId Die ID des Einsatzberichts
* @param WP_Post $post Das Post-Objekt des Einsatzberichts
*/
- public function onPublish($postId, $post)
+ public function onPublish(int $postId, WP_Post $post)
{
$report = new IncidentReport($post);
@@ -238,7 +237,7 @@ public function onPublish($postId, $post)
* @param string $oldStatus
* @param WP_Post $post
*/
- public function onTransitionPostStatus($newStatus, $oldStatus, WP_Post $post)
+ public function onTransitionPostStatus(string $newStatus, string $oldStatus, WP_Post $post)
{
if (get_post_type($post) !== Report::getSlug()) {
return;
@@ -282,7 +281,7 @@ private function adjustPostDate(WP_Post $post)
* @param int $postId Die ID des Einsatzberichts
* @param WP_Post $post Das Post-Objekt des Einsatzberichts
*/
- public function onTrash($postId, $post)
+ public function onTrash(int $postId, WP_Post $post)
{
// Laufende Nummern aktualisieren
if (true === $this->assignSequenceNumbers) {
@@ -314,7 +313,7 @@ public function resumeAutoSequenceNumbers()
* @param int $postId ID des Einsatzberichts
* @param string $seqNum Zu setzende laufende Nummer
*/
- public function setSequenceNumber($postId, $seqNum)
+ public function setSequenceNumber(int $postId, string $seqNum)
{
if (empty($postId) || empty($seqNum)) {
return;
@@ -326,7 +325,7 @@ public function setSequenceNumber($postId, $seqNum)
/**
* @return bool
*/
- private function isBulkEdit()
+ private function isBulkEdit(): bool
{
if (isset($_REQUEST['filter_action']) && ! empty($_REQUEST['filter_action'])) {
return false;
diff --git a/src/Export/Formats/AbstractFormat.php b/src/Export/Formats/AbstractFormat.php
index 74f71300..a78e168a 100644
--- a/src/Export/Formats/AbstractFormat.php
+++ b/src/Export/Formats/AbstractFormat.php
@@ -25,7 +25,7 @@ abstract class AbstractFormat implements Format
/**
* @inheritDoc
*/
- public function setFilters($startDate, $endDate)
+ public function setFilters(string $startDate, string $endDate)
{
$this->startDate = $startDate;
$this->endDate = $endDate;
@@ -37,7 +37,7 @@ public function setFilters($startDate, $endDate)
*
* @return WP_Query
*/
- protected function getQuery()
+ protected function getQuery(): WP_Query
{
// Wähle nur veröffentlichte Einsatzberichte aus
$args = array(
@@ -67,7 +67,7 @@ protected function getQuery()
*
* @return array
*/
- protected function getColumnNames()
+ protected function getColumnNames(): array
{
return array(
'Einsatznummer',
@@ -93,7 +93,7 @@ protected function getColumnNames()
* @param WP_Post $post
* @return array
*/
- protected function getValuesForReport(WP_Post $post)
+ protected function getValuesForReport(WP_Post $post): array
{
$report = new IncidentReport($post);
@@ -127,7 +127,7 @@ protected function getValuesForReport(WP_Post $post)
* @param WP_Post|WP_Term $object
* @return string
*/
- private function getName($object)
+ private function getName($object): string
{
if ($object instanceof WP_Term) {
return $object->name;
@@ -140,13 +140,15 @@ private function getName($object)
/**
* @param array $array
+ *
* @return mixed
*/
- abstract protected function getArrayRepresentation($array);
+ abstract protected function getArrayRepresentation(array $array);
/**
* @param bool $bool
+ *
* @return mixed
*/
- abstract protected function getBooleanRepresentation($bool);
+ abstract protected function getBooleanRepresentation(bool $bool);
}
diff --git a/src/Export/Formats/Csv.php b/src/Export/Formats/Csv.php
index 85de3076..8dcdd035 100644
--- a/src/Export/Formats/Csv.php
+++ b/src/Export/Formats/Csv.php
@@ -32,7 +32,7 @@ class Csv extends AbstractFormat
/**
* @inheritDoc
*/
- public function getTitle()
+ public function getTitle(): string
{
return 'CSV';
}
@@ -91,7 +91,7 @@ public function setOptions(array $options)
/**
* @inheritDoc
*/
- public function getFilename()
+ public function getFilename(): string
{
return 'Einsatzberichte.csv';
}
@@ -125,18 +125,20 @@ public function export()
/**
* @param bool $bool
+ *
* @return mixed
*/
- protected function getBooleanRepresentation($bool)
+ protected function getBooleanRepresentation(bool $bool): string
{
return ($bool === true ? 'Ja' : 'Nein');
}
/**
* @param array $array
+ *
* @return mixed
*/
- protected function getArrayRepresentation($array)
+ protected function getArrayRepresentation(array $array)
{
return join(',', $array);
}
diff --git a/src/Export/Formats/Excel.php b/src/Export/Formats/Excel.php
index adeb3281..7c384056 100644
--- a/src/Export/Formats/Excel.php
+++ b/src/Export/Formats/Excel.php
@@ -12,7 +12,7 @@ class Excel extends Csv
/**
* @inheritDoc
*/
- public function getTitle()
+ public function getTitle(): string
{
return 'CSV für Microsoft Excel';
}
diff --git a/src/Export/Formats/Format.php b/src/Export/Formats/Format.php
index 4a5e3f5b..8149d9b4 100644
--- a/src/Export/Formats/Format.php
+++ b/src/Export/Formats/Format.php
@@ -11,7 +11,7 @@ interface Format
*
* @return string
*/
- public function getTitle();
+ public function getTitle(): string;
/**
* Gibt die Optionen im HTML-Format für dieses Exportformat aus.
@@ -25,11 +25,12 @@ public function renderOptions();
* Die Inhalte im Array müssen überprüft werden, da es sich um Eingaben vom
* Benutzer handelt.
*
- * @param string $startDate Jahr und Monat im Format YYYY-MM oder 0
- * @param string $endDate Jahr und Monat im Format YYYY-MM oder 0
+ * @param string $startDate Jahr und Monat im Format YYYY-MM oder 0
+ * @param string $endDate Jahr und Monat im Format YYYY-MM oder 0
+ *
* @return void
*/
- public function setFilters($startDate, $endDate);
+ public function setFilters(string $startDate, string $endDate);
/**
* Erwartet ein Array mit Optionen zum Konfigurieren des Exportformats.
@@ -46,7 +47,7 @@ public function setOptions(array $options);
*
* @return string
*/
- public function getFilename();
+ public function getFilename(): string;
/**
* Gibt den Inhalt der Datei, die beim Export erstellt wird, aus.
diff --git a/src/Export/Formats/Json.php b/src/Export/Formats/Json.php
index 9946c10f..481be27a 100644
--- a/src/Export/Formats/Json.php
+++ b/src/Export/Formats/Json.php
@@ -17,7 +17,7 @@ class Json extends AbstractFormat
/**
* @inheritDoc
*/
- public function getTitle()
+ public function getTitle(): string
{
return 'JSON';
}
@@ -40,7 +40,7 @@ public function renderOptions()
/**
* @inheritDoc
*/
- public function getFilename()
+ public function getFilename(): string
{
return 'Einsatzberichte.json';
}
@@ -107,18 +107,20 @@ public function export()
/**
* @param bool $bool
+ *
* @return mixed
*/
- protected function getBooleanRepresentation($bool)
+ protected function getBooleanRepresentation(bool $bool): bool
{
return $bool;
}
/**
* @param array $array
+ *
* @return mixed
*/
- protected function getArrayRepresentation($array)
+ protected function getArrayRepresentation(array $array): array
{
return $array;
}
diff --git a/src/Export/Tool.php b/src/Export/Tool.php
index 38d156ac..eb1f0213 100644
--- a/src/Export/Tool.php
+++ b/src/Export/Tool.php
@@ -137,7 +137,8 @@ public function renderToolPage()
";
+ $timeOfAlerting = $report->getTimeOfAlerting();
+ $dateAndTime = empty($timeOfAlerting) ? '-' : sprintf(
+ /* translators: 1: Date, 2: Time. */
+ __('%1$s at %2$s', 'einsatzverwaltung'),
+ date_i18n(get_option('date_format'), $timeOfAlerting->getTimestamp()),
+ date_i18n(get_option('time_format'), $timeOfAlerting->getTimestamp())
+ );
+ $headerstring = $this->getDetailString(__('Date', 'einsatzverwaltung'), $dateAndTime);
+
+ $headerstring .= $this->getDetailString('Alarmierungsart', $this->formatter->getTypesOfAlerting($report));
+ $headerstring .= $this->getDetailString(__('Duration', 'einsatzverwaltung'), $durationString);
+ $headerstring .= $this->getDetailString(__('Incident Category', 'einsatzverwaltung'), $art);
+ $headerstring .= $this->getDetailString(__('Location', 'einsatzverwaltung'), $report->getLocation());
+ $headerstring .= $this->getDetailString('Einsatzleiter', $report->getIncidentCommander());
+ $headerstring .= $this->getDetailString('Mannschaftsstärke', $report->getWorkforce());
+
+ // If at least one unit has been assigned to any report, show the vehicles grouped by unit
+ if (Unit::isActivelyUsed()) {
+ $headerstring .= $this->getDetailString(
+ __('Vehicles', 'einsatzverwaltung'),
+ $this->formatter->getVehiclesByUnitString($report->getVehiclesByUnit()),
+ false
+ );
+ } else {
+ $headerstring .= $this->getDetailString(
+ __('Vehicles', 'einsatzverwaltung'),
+ $this->formatter->getVehicleString($report->getVehicles(), $mayContainLinks, $showArchiveLinks)
+ );
}
- return "";
+
+ $additionalForces = $this->formatter->getAdditionalForces($report, $mayContainLinks, $showArchiveLinks);
+ $headerstring .= $this->getDetailString('Weitere Kräfte', $additionalForces);
+
+ return "
$headerstring
";
}
@@ -139,13 +150,20 @@ public function getEinsatzberichtHeader($post, $mayContainLinks = true, $showArc
*
* @return string Formatiertes Einsatzdetail
*/
- private function getDetailString($title, $value, $newline = true)
+ private function getDetailString(string $title, string $value, bool $newline = true): string
{
if ($this->options->isHideEmptyDetails() && (!isset($value) || $value === '')) {
return '';
}
- return ''.$title.' '.$value.($newline ? ' ' : ' ');
+ /* translators: Single incident detail, 1: Label, 2: Value */
+ $format = __('%1$s: %2$s', 'einsatzverwaltung');
+ $filteredFormat = wp_kses($format, ['b' => []]);
+ if ($newline) {
+ $filteredFormat .= ' ';
+ }
+
+ return sprintf($filteredFormat, $title, $value);
}
@@ -156,7 +174,7 @@ private function getDetailString($title, $value, $newline = true)
*
* @return string Mit Einsatzdetails angereicherter Beitragstext
*/
- public function renderContent($content)
+ public function renderContent(string $content): string
{
global $post;
@@ -177,7 +195,7 @@ public function renderContent($content)
$content = sprintf('
%s
', esc_html($replacementText));
}
- $templateWithData = $this->formatter->formatIncidentData($template, array(), $post, 'post');
+ $templateWithData = $this->formatter->formatIncidentData($template, array(), $post);
$templateWithContent = str_replace('%content%', $content, $templateWithData);
return stripslashes(wp_filter_post_kses(addslashes($templateWithContent)));
}
@@ -187,7 +205,7 @@ public function renderContent($content)
}
// Fallback auf das klassische Layout
- $header = $this->getEinsatzberichtHeader($post, true, true);
+ $header = $this->getEinsatzberichtHeader($post);
$content = $this->prepareContent($content);
return $header . '' . $content;
@@ -198,7 +216,7 @@ public function renderContent($content)
*
* @return bool
*/
- private function useReportTemplate()
+ private function useReportTemplate(): bool
{
$useTemplate = get_option('einsatzverwaltung_use_reporttemplate', 'no');
@@ -229,7 +247,7 @@ private function useReportTemplate()
* @return string Der Beitragstext mit einer vorangestellten Überschrift. Wenn der Beitragstext leer ist, wird ein
* Ersatztext zurückgegeben
*/
- private function prepareContent($content)
+ private function prepareContent(string $content): string
{
$replacementText = get_option('einsatzverwaltung_report_contentifempty', '');
if (!empty($replacementText)) {
@@ -249,7 +267,7 @@ private function prepareContent($content)
*
* @return string Der Auszug
*/
- public function filterEinsatzExcerpt($excerpt)
+ public function filterEinsatzExcerpt(string $excerpt): string
{
global $post;
if (get_post_type() !== 'einsatz') {
@@ -275,7 +293,7 @@ public function filterEinsatzExcerpt($excerpt)
*
* @param WP_Query $query
*/
- public function addReportsToQuery($query)
+ public function addReportsToQuery(WP_Query $query)
{
// Nur, wenn Filter erlaubt sind, soll weitergemacht werden
if (!empty($query->query_vars['suppress_filters'])) {
diff --git a/src/Frontend/AnnotationIconBar.php b/src/Frontend/AnnotationIconBar.php
index 8bd3b4a1..e1ecec9e 100644
--- a/src/Frontend/AnnotationIconBar.php
+++ b/src/Frontend/AnnotationIconBar.php
@@ -1,7 +1,6 @@
getAnnotationIcon(
$icon,
array($annotation->getLabelWhenInactive(), $annotation->getLabelWhenActive()),
- $annotation->getStateForReport($report)
+ $annotation->getStateForReport($postId)
);
}
return $string;
@@ -105,7 +104,7 @@ public function render($report, $annotationIds = array())
*
* @return string
*/
- private function getAnnotationIcon($icon, $titles, $state)
+ private function getAnnotationIcon($icon, $titles, $state): string
{
return sprintf(
'',
@@ -118,7 +117,7 @@ private function getAnnotationIcon($icon, $titles, $state)
/**
* @return string
*/
- private function getAnnotationColorOff()
+ private function getAnnotationColorOff(): string
{
if (is_admin()) {
return self::DEFAULT_COLOR_OFF;
diff --git a/src/Frontend/ReportList/Column.php b/src/Frontend/ReportList/Column.php
index b0843da5..c34f1127 100644
--- a/src/Frontend/ReportList/Column.php
+++ b/src/Frontend/ReportList/Column.php
@@ -54,7 +54,7 @@ public function __construct($identifier, $name, $longName = '', $noWrap = false)
/**
* @return string
*/
- public function getIdentifier()
+ public function getIdentifier(): string
{
return $this->identifier;
}
@@ -62,7 +62,7 @@ public function getIdentifier()
/**
* @return string
*/
- public function getName()
+ public function getName(): string
{
return $this->name;
}
@@ -70,7 +70,7 @@ public function getName()
/**
* @return string
*/
- public function getNameForSettings()
+ public function getNameForSettings(): string
{
if (empty($this->longName)) {
return $this->name;
@@ -82,7 +82,7 @@ public function getNameForSettings()
/**
* @return bool
*/
- public function isNoWrap()
+ public function isNoWrap(): bool
{
return $this->noWrap;
}
diff --git a/src/Frontend/ReportList/ColumnRepository.php b/src/Frontend/ReportList/ColumnRepository.php
index b454ca39..20f3b901 100644
--- a/src/Frontend/ReportList/ColumnRepository.php
+++ b/src/Frontend/ReportList/ColumnRepository.php
@@ -59,7 +59,7 @@ private function addColumn(Column $column)
/**
* @return Column[]
*/
- public function getAvailableColumns()
+ public function getAvailableColumns(): array
{
return $this->columns;
}
@@ -69,7 +69,7 @@ public function getAvailableColumns()
*
* @return Column|null
*/
- public function getColumn($identifier)
+ public function getColumn($identifier): ?Column
{
if (!$this->hasColumn($identifier)) {
return null;
@@ -83,7 +83,7 @@ public function getColumn($identifier)
*
* @return Column[]
*/
- public function getColumnsByIdentifier($identifiers)
+ public function getColumnsByIdentifier($identifiers): array
{
$columns = array();
foreach ($identifiers as $identifier) {
@@ -97,7 +97,7 @@ public function getColumnsByIdentifier($identifiers)
/**
* @return Column[]
*/
- public function getDefaultColumns()
+ public function getDefaultColumns(): array
{
return $this->getColumnsByIdentifier(explode(',', self::DEFAULT_COLUMNS));
}
@@ -107,7 +107,7 @@ public function getDefaultColumns()
*
* @return string
*/
- public function getIdentifiers($columns)
+ public function getIdentifiers($columns): string
{
$columnIds = array_map(function (Column $column) {
return $column->getIdentifier();
@@ -119,7 +119,7 @@ public function getIdentifiers($columns)
/**
* @return ColumnRepository
*/
- public static function getInstance()
+ public static function getInstance(): ColumnRepository
{
if (empty(self::$instance)) {
self::$instance = new self();
@@ -133,7 +133,7 @@ public static function getInstance()
*
* @return bool
*/
- public function hasColumn($identifier)
+ public function hasColumn($identifier): bool
{
return array_key_exists($identifier, $this->columns);
}
@@ -146,7 +146,7 @@ public function hasColumn($identifier)
* @return string Der Eingabestring ohne ungültige Spalten-Ids, bei Problemen werden die Standardspalten
* zurückgegeben
*/
- public static function sanitizeColumns($input)
+ public static function sanitizeColumns($input): string
{
if (empty($input)) {
return self::DEFAULT_COLUMNS;
@@ -166,7 +166,7 @@ public static function sanitizeColumns($input)
*
* @return string[]
*/
- public static function sanitizeColumnsArray($inputArray)
+ public static function sanitizeColumnsArray($inputArray): array
{
$validColumnIds = self::sanitizeColumnsArrayNoDefault($inputArray);
@@ -184,7 +184,7 @@ public static function sanitizeColumnsArray($inputArray)
*
* @return string[]
*/
- public static function sanitizeColumnsArrayNoDefault($inputArray)
+ public static function sanitizeColumnsArrayNoDefault($inputArray): array
{
$columnRepository = self::getInstance();
diff --git a/src/Frontend/ReportList/Renderer.php b/src/Frontend/ReportList/Renderer.php
index c8bf6a15..64ddada9 100644
--- a/src/Frontend/ReportList/Renderer.php
+++ b/src/Frontend/ReportList/Renderer.php
@@ -143,7 +143,7 @@ private function constructList($reports, Parameters $parameters)
*
* @return string HTML-Code der Liste
*/
- public function getList($reports, Parameters $parameters)
+ public function getList($reports, Parameters $parameters): string
{
$this->string = '';
$this->constructList($reports, $parameters);
@@ -232,7 +232,7 @@ private function insertRow($report, Parameters $parameters)
*
* @return string HTML markup for the table cell only visible on devices with a small screen (e.g. smartphones)
*/
- private function getSmallScreenCell(IncidentReport $report, Parameters $parameters)
+ private function getSmallScreenCell(IncidentReport $report, Parameters $parameters): string
{
$content = '';
$annotations = '';
@@ -273,7 +273,7 @@ private function getSmallScreenCell(IncidentReport $report, Parameters $paramete
*
* @return string
*/
- private function getCellMarkup(IncidentReport $report, Parameters $parameters, $columnId)
+ private function getCellMarkup(IncidentReport $report, Parameters $parameters, $columnId): string
{
$cellContent = $this->getCellContent($report, $columnId, $parameters);
@@ -297,7 +297,7 @@ private function getCellMarkup(IncidentReport $report, Parameters $parameters, $
*
* @return bool
*/
- private function isCellLinkToReport(IncidentReport $report, $columnId, Parameters $parameters)
+ private function isCellLinkToReport(IncidentReport $report, $columnId, Parameters $parameters): bool
{
$linkToReport = $parameters->linkEmptyReports || $report->hasContent();
$columnsLinkingReport = $parameters->getColumnsLinkingReport();
@@ -325,7 +325,7 @@ private function insertZebraCorrection($numberOfColumns)
*
* @return string
*/
- private function getCellContent($report, $colId, Parameters $parameters)
+ private function getCellContent($report, $colId, Parameters $parameters): string
{
if (empty($report)) {
return ' ';
@@ -364,7 +364,7 @@ private function getCellContent($report, $colId, Parameters $parameters)
$cellContent = $this->formatter->getDurationString($minutes, true);
break;
case 'vehicles':
- $cellContent = $this->formatter->getVehicles($report, $parameters->linkVehicles, false);
+ $cellContent = $this->formatter->getVehicleString($report->getVehicles(), $parameters->linkVehicles, false);
break;
case 'alarmType':
$cellContent = $this->formatter->getTypesOfAlerting($report);
@@ -388,10 +388,10 @@ private function getCellContent($report, $colId, Parameters $parameters)
}
break;
case 'annotationImages':
- $cellContent = AnnotationIconBar::getInstance()->render($report, array('images'));
+ $cellContent = AnnotationIconBar::getInstance()->render($report->getPostId(), array('images'));
break;
case 'annotationSpecial':
- $cellContent = AnnotationIconBar::getInstance()->render($report, array('special'));
+ $cellContent = AnnotationIconBar::getInstance()->render($report->getPostId(), array('special'));
break;
default:
$cellContent = '';
@@ -477,7 +477,7 @@ private function insertSplit(Parameters $parameters, $class, $heading)
*
* @return string
*/
- public static function getDynamicCss()
+ public static function getDynamicCss(): string
{
if (empty(self::$settings)) {
self::$settings = new Settings();
diff --git a/src/Frontend/ReportList/Settings.php b/src/Frontend/ReportList/Settings.php
index 67baa159..3373827a 100644
--- a/src/Frontend/ReportList/Settings.php
+++ b/src/Frontend/ReportList/Settings.php
@@ -17,7 +17,7 @@ class Settings
*
* @return string
*/
- public function getZebraColor()
+ public function getZebraColor(): string
{
$option = get_option('einsatzvw_list_zebracolor', self::DEFAULT_ZEBRACOLOR);
$sanitized = sanitize_hex_color($option);
@@ -33,7 +33,7 @@ public function getZebraColor()
*
* @return string
*/
- public function getZebraNthChildArg()
+ public function getZebraNthChildArg(): string
{
$option = get_option('einsatzvw_list_zebra_nth', self::DEFAULT_NTHCHILD);
return $this->sanitizeZebraNthChildArg($option);
@@ -44,7 +44,7 @@ public function getZebraNthChildArg()
*
* @return boolean
*/
- public function isZebraTable()
+ public function isZebraTable(): bool
{
return (get_option('einsatzvw_list_zebra', '1') !== '0');
}
@@ -56,7 +56,7 @@ public function isZebraTable()
*
* @return string
*/
- public function sanitizeZebraNthChildArg($input)
+ public function sanitizeZebraNthChildArg($input): string
{
if (!in_array($input, array('odd', 'even'))) {
return self::DEFAULT_NTHCHILD;
diff --git a/src/Loader.php b/src/Loader.php
index 048036a4..528226b8 100644
--- a/src/Loader.php
+++ b/src/Loader.php
@@ -19,7 +19,7 @@ class Loader
*
* @param string $class The fully-qualified name of the class to load
*/
- public static function load($class)
+ public static function load(string $class)
{
// Do not load classes from other namespaces
if (strpos($class, 'abrain\\Einsatzverwaltung') === false) {
diff --git a/src/Model/IncidentReport.php b/src/Model/IncidentReport.php
index 37c778da..54fba3d7 100644
--- a/src/Model/IncidentReport.php
+++ b/src/Model/IncidentReport.php
@@ -4,14 +4,20 @@
use abrain\Einsatzverwaltung\Types\Unit;
use abrain\Einsatzverwaltung\Types\Vehicle;
+use abrain\Einsatzverwaltung\Utilities;
use DateTime;
use WP_Post;
use WP_Term;
+use function array_key_exists;
+use function array_keys;
use function get_post;
use function get_post_type;
use function error_log;
+use function get_the_terms;
use function intval;
use function is_numeric;
+use function is_wp_error;
+use function usort;
/**
* Datenmodellklasse für Einsatzberichte
@@ -53,7 +59,7 @@ public function __construct($post = null)
*
* @return string Die Beschriftung oder $field, wenn es das Feld nicht gibt
*/
- public static function getFieldLabel($field)
+ public static function getFieldLabel($field): string
{
$fields = self::getFields();
return (array_key_exists($field, $fields) ? $fields[$field]['label'] : $field);
@@ -63,7 +69,7 @@ public static function getFieldLabel($field)
* Gibt ein Array aller Felder und deren Namen zurück,
* Hauptverwendungszweck ist das Mapping beim Import
*/
- public static function getFields()
+ public static function getFields(): array
{
return array_merge(self::getMetaFields(), self::getTerms(), self::getPostFields());
}
@@ -73,7 +79,7 @@ public static function getFields()
*
* @return array
*/
- public static function getMetaFields()
+ public static function getMetaFields(): array
{
return array(
'einsatz_einsatzort' => array(
@@ -134,7 +140,7 @@ public function getDuration()
*
* @return array
*/
- public static function getTerms()
+ public static function getTerms(): array
{
return array(
'alarmierungsart' => array(
@@ -157,7 +163,7 @@ public static function getTerms()
*
* @return array
*/
- public static function getPostFields()
+ public static function getPostFields(): array
{
return array(
'post_date' => array(
@@ -175,7 +181,7 @@ public static function getPostFields()
/**
* @return array
*/
- public function getAdditionalForces()
+ public function getAdditionalForces(): array
{
return $this->getTheTerms('exteinsatzmittel');
}
@@ -185,7 +191,7 @@ public function getAdditionalForces()
*
* @return string
*/
- public function getIncidentCommander()
+ public function getIncidentCommander(): string
{
return $this->getPostMeta('einsatz_einsatzleiter');
}
@@ -195,7 +201,7 @@ public function getIncidentCommander()
*
* @return string
*/
- public function getLocation()
+ public function getLocation(): string
{
return $this->getPostMeta('einsatz_einsatzort');
}
@@ -205,7 +211,7 @@ public function getLocation()
*
* @return string
*/
- public function getNumber()
+ public function getNumber(): string
{
return $this->getPostMeta('einsatz_incidentNumber');
}
@@ -223,7 +229,7 @@ public function getPostId()
*
* @return string
*/
- private function getPostMeta($key)
+ private function getPostMeta($key): string
{
if (empty($this->post)) {
return '';
@@ -241,9 +247,9 @@ private function getPostMeta($key)
/**
* Gibt die laufende Nummer des Einsatzberichts bezogen auf das Kalenderjahr zurück
*
- * @return mixed
+ * @return string
*/
- public function getSequentialNumber()
+ public function getSequentialNumber(): string
{
return $this->getPostMeta('einsatz_seqNum');
}
@@ -290,7 +296,7 @@ private function getPostDate()
*
* @return string
*/
- public function getTimeOfEnding()
+ public function getTimeOfEnding(): string
{
return $this->getPostMeta('einsatz_einsatzende');
}
@@ -298,9 +304,9 @@ public function getTimeOfEnding()
/**
* Gibt das Term-Objekt der Alarmierungsart zurück
*
- * @return array
+ * @return WP_Term[]
*/
- public function getTypesOfAlerting()
+ public function getTypesOfAlerting(): array
{
return $this->getTheTerms('alarmierungsart');
}
@@ -313,7 +319,7 @@ public function getTypesOfAlerting()
*
* @return WP_Term[] Die Terms oder ein leeres Array
*/
- private function getTheTerms($taxonomy)
+ private function getTheTerms(string $taxonomy): array
{
if (empty($this->post)) {
return array();
@@ -334,7 +340,7 @@ private function getTheTerms($taxonomy)
*
* @return WP_Term
*/
- public function getTypeOfIncident()
+ public function getTypeOfIncident(): ?WP_Term
{
$terms = $this->getTheTerms('einsatzart');
@@ -351,7 +357,9 @@ public function getTypeOfIncident()
*/
public function getUnits(): array
{
- return $this->getTheTerms(Unit::getSlug());
+ $units = $this->getTheTerms(Unit::getSlug());
+ usort($units, array(Unit::class, 'compare'));
+ return $units;
}
/**
@@ -359,9 +367,9 @@ public function getUnits(): array
*
* @return WP_Term[]
*/
- public function getVehicles()
+ public function getVehicles(): array
{
- $vehicles = $this->getTheTerms('fahrzeug');
+ $vehicles = $this->getTheTerms(Vehicle::getSlug());
if (empty($vehicles)) {
return array();
@@ -372,10 +380,20 @@ public function getVehicles()
return $vehicles;
}
+ public function getVehiclesByUnit(): array
+ {
+ $vehicles = $this->getTheTerms(Vehicle::getSlug());
+ if (empty($vehicles)) {
+ return [];
+ }
+
+ return Utilities::groupVehiclesByUnit($vehicles);
+ }
+
/**
* @return int The weight of the report (i. e. how many reports it represents)
*/
- public function getWeight()
+ public function getWeight(): int
{
$weight = $this->getPostMeta('einsatz_weight');
if (empty($weight) || !is_numeric($weight)) {
@@ -390,7 +408,7 @@ public function getWeight()
*
* @return string
*/
- public function getWorkforce()
+ public function getWorkforce(): string
{
return $this->getPostMeta('einsatz_mannschaft');
}
@@ -400,7 +418,7 @@ public function getWorkforce()
*
* @return bool
*/
- public function hasContent()
+ public function hasContent(): bool
{
return !empty($this->post->post_content);
}
@@ -410,7 +428,7 @@ public function hasContent()
*
* @return bool
*/
- public function hasImages()
+ public function hasImages(): bool
{
return ($this->getPostMeta('einsatz_hasimages') == 1);
}
@@ -420,7 +438,7 @@ public function hasImages()
*
* @return bool
*/
- public function isDraft()
+ public function isDraft(): bool
{
return in_array($this->post->post_status, array('draft', 'pending', 'auto-draft'));
}
@@ -430,7 +448,7 @@ public function isDraft()
*
* @return bool
*/
- public function isFalseAlarm()
+ public function isFalseAlarm(): bool
{
return ($this->getPostMeta('einsatz_fehlalarm') == 1);
}
@@ -440,7 +458,7 @@ public function isFalseAlarm()
*
* @return bool
*/
- public function isSpecial()
+ public function isSpecial(): bool
{
return ($this->getPostMeta('einsatz_special') == 1);
}
@@ -450,7 +468,7 @@ public function isSpecial()
*
* @return bool
*/
- private function isFuture()
+ private function isFuture(): bool
{
return $this->post->post_status === 'future';
}
@@ -460,7 +478,7 @@ private function isFuture()
*
* @param int $category Die ID der Kategorie
*/
- public function addToCategory($category)
+ public function addToCategory(int $category)
{
wp_set_post_categories($this->getPostId(), $category, true);
}
diff --git a/src/Model/ReportAnnotation.php b/src/Model/ReportAnnotation.php
index 1117cfe1..72250597 100644
--- a/src/Model/ReportAnnotation.php
+++ b/src/Model/ReportAnnotation.php
@@ -69,7 +69,7 @@ public function __construct($identifier, $name, $metaKey, $icon, $labelWhenActiv
/**
* @return string
*/
- public function getIcon()
+ public function getIcon(): string
{
return $this->icon;
}
@@ -77,7 +77,7 @@ public function getIcon()
/**
* @return string
*/
- public function getIdentifier()
+ public function getIdentifier(): string
{
return $this->identifier;
}
@@ -85,7 +85,7 @@ public function getIdentifier()
/**
* @return string
*/
- public function getLabelWhenActive()
+ public function getLabelWhenActive(): string
{
return $this->labelWhenActive;
}
@@ -93,7 +93,7 @@ public function getLabelWhenActive()
/**
* @return string
*/
- public function getLabelWhenInactive()
+ public function getLabelWhenInactive(): string
{
return $this->labelWhenInactive;
}
@@ -101,19 +101,19 @@ public function getLabelWhenInactive()
/**
* @return string
*/
- public function getName()
+ public function getName(): string
{
return $this->name;
}
/**
- * @param IncidentReport $report
+ * @param int $postId
*
* @return bool
*/
- public function getStateForReport($report)
+ public function getStateForReport(int $postId): bool
{
- $get_post_meta = get_post_meta($report->getPostId(), $this->metaKey, true);
+ $get_post_meta = get_post_meta($postId, $this->metaKey, true);
return 1 == $get_post_meta;
}
}
diff --git a/src/Options.php b/src/Options.php
index edc383f5..b6001147 100644
--- a/src/Options.php
+++ b/src/Options.php
@@ -27,7 +27,7 @@ class Options
*
* @return mixed
*/
- public function getOption($key)
+ public function getOption(string $key)
{
if (array_key_exists($key, $this->defaults)) {
return get_option($key, $this->defaults[$key]);
@@ -46,7 +46,7 @@ public function getOption($key)
*
* @return bool
*/
- public function getBoolOption($key)
+ public function getBoolOption(string $key): bool
{
$option = $this->getOption($key);
return $this->toBoolean($option);
@@ -59,7 +59,7 @@ public function getBoolOption($key)
*
* @return int Die ID der Kategorie oder -1, wenn nicht gesetzt
*/
- public function getEinsatzberichteCategory()
+ public function getEinsatzberichteCategory(): int
{
$categoryId = $this->getOption('einsatzvw_category');
return (false === $categoryId ? -1 : intval($categoryId));
@@ -70,7 +70,7 @@ public function getEinsatzberichteCategory()
*
* @return bool
*/
- public function isFlushRewriteRules()
+ public function isFlushRewriteRules(): bool
{
return $this->getBoolOption('einsatzvw_flush_rewrite_rules');
}
@@ -80,7 +80,7 @@ public function isFlushRewriteRules()
*
* @return bool
*/
- public function isHideEmptyDetails()
+ public function isHideEmptyDetails(): bool
{
$option = $this->getOption('einsatzvw_einsatz_hideemptydetails');
return $this->toBoolean($option);
@@ -92,7 +92,7 @@ public function isHideEmptyDetails()
*
* @return bool
*/
- public function isOnlySpecialInLoop()
+ public function isOnlySpecialInLoop(): bool
{
return $this->getBoolOption('einsatzvw_loop_only_special');
}
@@ -101,7 +101,7 @@ public function isOnlySpecialInLoop()
/**
* @return bool
*/
- public function isOpenExtEinsatzmittelNewWindow()
+ public function isOpenExtEinsatzmittelNewWindow(): bool
{
$option = $this->getOption('einsatzvw_open_ext_in_new');
return $this->toBoolean($option);
@@ -110,7 +110,7 @@ public function isOpenExtEinsatzmittelNewWindow()
/**
* @return bool
*/
- public function isShowEinsatzartArchive()
+ public function isShowEinsatzartArchive(): bool
{
$option = $this->getOption('einsatzvw_show_einsatzart_archive');
return $this->toBoolean($option);
@@ -119,7 +119,7 @@ public function isShowEinsatzartArchive()
/**
* @return bool
*/
- public function isShowReportsInLoop()
+ public function isShowReportsInLoop(): bool
{
$option = $this->getOption('einsatzvw_show_einsatzberichte_mainloop');
return $this->toBoolean($option);
@@ -128,7 +128,7 @@ public function isShowReportsInLoop()
/**
* @return bool
*/
- public function isShowExtEinsatzmittelArchive()
+ public function isShowExtEinsatzmittelArchive(): bool
{
$option = $this->getOption('einsatzvw_show_exteinsatzmittel_archive');
return $this->toBoolean($option);
@@ -137,18 +137,19 @@ public function isShowExtEinsatzmittelArchive()
/**
* @return bool
*/
- public function isShowFahrzeugArchive()
+ public function isShowFahrzeugArchive(): bool
{
$option = $this->getOption('einsatzvw_show_fahrzeug_archive');
return $this->toBoolean($option);
}
/**
+ * @param bool $value
+ *
* @since 1.0.0
*
- * @param bool $value
*/
- public function setFlushRewriteRules($value)
+ public function setFlushRewriteRules(bool $value)
{
update_option('einsatzvw_flush_rewrite_rules', $value ? 1 : 0);
}
@@ -158,7 +159,7 @@ public function setFlushRewriteRules($value)
*
* @return bool
*/
- private function toBoolean($value)
+ private function toBoolean($value): bool
{
return in_array($value, array(1, true, '1', 'yes', 'on'), true);
}
diff --git a/src/PermalinkController.php b/src/PermalinkController.php
index 13712aa0..d7ac5487 100644
--- a/src/PermalinkController.php
+++ b/src/PermalinkController.php
@@ -67,7 +67,7 @@ public function addRewriteRules(Report $report)
*
* @return string
*/
- public function buildSelector(WP_Post $post, $structure)
+ public function buildSelector(WP_Post $post, string $structure): string
{
$tagReplacements = array(
$post->post_name,
@@ -80,7 +80,7 @@ public function buildSelector(WP_Post $post, $structure)
/**
* @param WP_Query $query
*/
- public function einsatznummerMetaQuery($query)
+ public function einsatznummerMetaQuery(WP_Query $query)
{
$enr = $query->get('einsatznummer');
if (!empty($enr)) {
@@ -98,7 +98,7 @@ public function einsatznummerMetaQuery($query)
*
* @return string
*/
- public function filterPostTypeLink($postLink, WP_Post $post, $leavename, $sample)
+ public function filterPostTypeLink(string $postLink, WP_Post $post, bool $leavename, bool $sample): string
{
global $wp_rewrite;
@@ -126,9 +126,9 @@ public function filterPostTypeLink($postLink, WP_Post $post, $leavename, $sample
*
* @param array $queryvars
*
- * @return mixed
+ * @return array
*/
- public function filterRequest($queryvars)
+ public function filterRequest(array $queryvars): array
{
global $wp_rewrite;
@@ -143,7 +143,7 @@ public function filterRequest($queryvars)
/**
* @return string
*/
- public function getRewriteBase()
+ private function getRewriteBase(): string
{
global $wp_rewrite;
return ltrim($wp_rewrite->front, '/') . $this->reportRewriteSlug;
@@ -156,7 +156,7 @@ public function getRewriteBase()
*
* @return string
*/
- public function getSelectorRegEx($permalink)
+ public function getSelectorRegEx(string $permalink): string
{
$regex = str_replace($this->rewriteTags, $this->rewriteTagRegEx, $permalink);
return '/^' . str_replace('/', '\/', $regex) . '$/';
@@ -167,7 +167,7 @@ public function getSelectorRegEx($permalink)
*
* @return string
*/
- public function getPermalink($selector)
+ public function getPermalink(string $selector): string
{
$path = sprintf('%s/%s', $this->getRewriteBase(), $selector);
return home_url(user_trailingslashit($path));
@@ -180,7 +180,7 @@ public function getPermalink($selector)
*
* @return string
*/
- public function getYearArchiveLink($year)
+ public function getYearArchiveLink(string $year): string
{
global $wp_rewrite;
$link = get_post_type_archive_link(Report::getSlug());
@@ -196,7 +196,7 @@ public function getYearArchiveLink($year)
*
* @return array
*/
- public function modifyQueryVars($queryVars, $reportPermalink)
+ public function modifyQueryVars(array $queryVars, string $reportPermalink): array
{
// Do nothing, if the request is not about reports
if (!array_key_exists('einsatz', $queryVars)) {
@@ -235,7 +235,7 @@ public function modifyQueryVars($queryVars, $reportPermalink)
*
* @return string
*/
- public static function sanitizePermalink($permalink)
+ public static function sanitizePermalink(string $permalink): string
{
preg_match('/^(%[a-z_]+%)(-(%[a-z_]+%))*$/', $permalink, $matches);
if (empty($matches)) {
diff --git a/src/ReportAnnotationRepository.php b/src/ReportAnnotationRepository.php
index 5b3f2179..7ffaef90 100644
--- a/src/ReportAnnotationRepository.php
+++ b/src/ReportAnnotationRepository.php
@@ -35,7 +35,7 @@ private function __construct()
*
* @return ReportAnnotationRepository
*/
- public static function getInstance()
+ public static function getInstance(): ReportAnnotationRepository
{
if (null === self::$instance) {
self::$instance = new ReportAnnotationRepository();
@@ -55,7 +55,7 @@ public function addAnnotation(ReportAnnotation $annotation)
/**
* @return ReportAnnotation[]
*/
- public function getAnnotations()
+ public function getAnnotations(): array
{
return $this->annotations;
}
@@ -63,7 +63,7 @@ public function getAnnotations()
/**
* @return string[]
*/
- public function getAnnotationIdentifiers()
+ public function getAnnotationIdentifiers(): array
{
return array_keys($this->annotations);
}
diff --git a/src/ReportNumberController.php b/src/ReportNumberController.php
index 66738b09..dff0e2eb 100644
--- a/src/ReportNumberController.php
+++ b/src/ReportNumberController.php
@@ -21,6 +21,7 @@
class ReportNumberController
{
const DEFAULT_SEQNUM_DIGITS = 3;
+ const DEFAULT_SEPARATOR = 'none';
/**
* @var Data
@@ -45,7 +46,7 @@ public function __construct(Data $data)
* @param string $metaKey Der Key des postmeta-Eintrags
* @param string $metaValue Der Wert des postmeta-Eintrags
*/
- public function onPostMetaChanged($metaId, $objectId, $metaKey, $metaValue)
+ public function onPostMetaChanged(int $metaId, int $objectId, string $metaKey, string $metaValue)
{
// Bail, if this is not about reports
if (get_post_type($objectId) !== 'einsatz') {
@@ -53,15 +54,15 @@ public function onPostMetaChanged($metaId, $objectId, $metaKey, $metaValue)
}
if ($metaKey === 'einsatz_seqNum' && self::isAutoIncidentNumbers()) {
- $this->adjustIncidentNumber($objectId, $metaValue);
+ $this->adjustIncidentNumber($objectId, (int)$metaValue);
}
}
/**
* @param int $postId
- * @param string $sequenceNumber
+ * @param int $sequenceNumber
*/
- private function adjustIncidentNumber($postId, $sequenceNumber)
+ private function adjustIncidentNumber(int $postId, int $sequenceNumber)
{
$date = date_create(get_post_field('post_date', $postId));
$newIncidentNumber = $this->formatEinsatznummer(date_format($date, 'Y'), $sequenceNumber);
@@ -76,18 +77,35 @@ private function adjustIncidentNumber($postId, $sequenceNumber)
*
* @return string Formatierte Einsatznummer
*/
- private function formatEinsatznummer($jahr, $nummer)
+ public function formatEinsatznummer(string $jahr, int $nummer): string
{
- $stellen = self::sanitizeEinsatznummerStellen(get_option('einsatzvw_einsatznummer_stellen'));
- $lfdvorne = (get_option('einsatzvw_einsatznummer_lfdvorne', false) == '1');
- $format = $lfdvorne ? '%2$s%1$s' : '%1$s%2$s';
- return sprintf($format, $jahr, str_pad($nummer, $stellen, "0", STR_PAD_LEFT));
+ $stellen = self::sanitizeNumberOfDigits(get_option('einsatzvw_einsatznummer_stellen'));
+ $sequentialFirst = (get_option('einsatzvw_einsatznummer_lfdvorne', false) == '1');
+
+ // Determine the separator
+ switch (self::sanitizeSeparator(get_option('einsatzvw_numbers_separator', self::DEFAULT_SEPARATOR))) {
+ case 'slash':
+ $separator = '/';
+ break;
+ case 'hyphen':
+ $separator = '-';
+ break;
+ default:
+ $separator = '';
+ }
+
+ return sprintf(
+ $sequentialFirst ? '%2$s%3$s%1$s' : '%1$s%3$s%2$s',
+ $jahr,
+ str_pad($nummer, $stellen, "0", STR_PAD_LEFT),
+ $separator
+ );
}
/**
* @return bool
*/
- public static function isAutoIncidentNumbers()
+ public static function isAutoIncidentNumbers(): bool
{
return (get_option('einsatzverwaltung_incidentnumbers_auto', '0') === '1');
}
@@ -96,7 +114,7 @@ public static function isAutoIncidentNumbers()
* @param string $option Name of the added option
* @param mixed $value Value of the added option
*/
- public function onOptionAdded($option, $value)
+ public function onOptionAdded(string $option, $value)
{
if ($option === 'einsatzverwaltung_incidentnumbers_auto') {
$this->maybeAutoIncidentNumbersChanged($option, '', $value);
@@ -110,7 +128,7 @@ public function onOptionAdded($option, $value)
*
* @return int
*/
- public static function sanitizeEinsatznummerStellen($input)
+ public static function sanitizeNumberOfDigits($input): int
{
if (!is_numeric($input)) {
return self::DEFAULT_SEQNUM_DIGITS;
@@ -124,6 +142,22 @@ public static function sanitizeEinsatznummerStellen($input)
return $val;
}
+ /**
+ * Sanitizes the option value for the separator between year and sequential number.
+ *
+ * @param string $input
+ *
+ * @return string
+ */
+ public static function sanitizeSeparator(string $input): string
+ {
+ if (in_array($input, ['none', 'slash', 'hyphen'])) {
+ return $input;
+ }
+
+ return self::DEFAULT_SEPARATOR;
+ }
+
/**
* Generiert für alle Einsatzberichte eine Einsatznummer gemäß dem aktuell konfigurierten Format.
*/
@@ -138,7 +172,7 @@ private function updateAllIncidentNumbers()
$reports = $reportQuery->getReports();
foreach ($reports as $report) {
- $newIncidentNumber = $this->formatEinsatznummer($year, $report->getSequentialNumber());
+ $newIncidentNumber = $this->formatEinsatznummer($year, (int)$report->getSequentialNumber());
update_post_meta($report->getPostId(), 'einsatz_incidentNumber', $newIncidentNumber);
}
}
@@ -149,10 +183,10 @@ private function updateAllIncidentNumbers()
* aktualisiert werden müssen
*
* @param string $option Name der Option
- * @param string $oldValue Der alte Wert
- * @param string $newValue Der neue Wert
+ * @param mixed $oldValue Der alte Wert
+ * @param mixed $newValue Der neue Wert
*/
- public function maybeAutoIncidentNumbersChanged($option, $oldValue, $newValue)
+ public function maybeAutoIncidentNumbersChanged(string $option, $oldValue, $newValue)
{
// Wir sind nur an einer bestimmten Option interessiert
if ('einsatzverwaltung_incidentnumbers_auto' != $option) {
@@ -175,13 +209,18 @@ public function maybeAutoIncidentNumbersChanged($option, $oldValue, $newValue)
* müssen
*
* @param string $option Name der Option
- * @param string $oldValue Der alte Wert
- * @param string $newValue Der neue Wert
+ * @param mixed $oldValue Der alte Wert
+ * @param mixed $newValue Der neue Wert
*/
- public function maybeIncidentNumberFormatChanged($option, $oldValue, $newValue)
+ public function maybeIncidentNumberFormatChanged(string $option, $oldValue, $newValue)
{
// Wir sind nur an bestimmten Optionen interessiert
- if (!in_array($option, array('einsatzvw_einsatznummer_stellen', 'einsatzvw_einsatznummer_lfdvorne'))) {
+ $formatOptions = array(
+ 'einsatzvw_einsatznummer_stellen',
+ 'einsatzvw_einsatznummer_lfdvorne',
+ 'einsatzvw_numbers_separator'
+ );
+ if (!in_array($option, $formatOptions)) {
return;
}
diff --git a/src/Settings/MainPage.php b/src/Settings/MainPage.php
index c8d0130b..4a375b4d 100644
--- a/src/Settings/MainPage.php
+++ b/src/Settings/MainPage.php
@@ -93,7 +93,7 @@ public function echoSettingsPage()
}
echo '
';
- echo '
Einstellungen › Einsatzverwaltung
';
+ echo sprintf('
%s › Einsatzverwaltung
', __('Settings', 'einsatzverwaltung'));
// Check if any page uses the same permalink as the archive
$conflictingPage = $this->getConflictingPage();
@@ -154,7 +154,7 @@ public function echoSettingsPage()
*
* @return WP_Post|null
*/
- private function getConflictingPage()
+ private function getConflictingPage(): ?WP_Post
{
$reportArchiveUrl = get_post_type_archive_link(ReportType::getSlug());
@@ -171,7 +171,7 @@ private function getConflictingPage()
/**
* @return SubPage
*/
- private function getCurrentSubPage()
+ private function getCurrentSubPage(): SubPage
{
$flags = FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH;
$tab = filter_input(INPUT_GET, 'tab', FILTER_SANITIZE_STRING, $flags);
@@ -189,7 +189,7 @@ private function getCurrentSubPage()
*
* @return bool Returns true if the supplied sub page matches the currently displayed sub page
*/
- private function isCurrentSubPage(SubPage $subPage)
+ private function isCurrentSubPage(SubPage $subPage): bool
{
return $subPage === $this->getCurrentSubPage();
}
diff --git a/src/Settings/Pages/About.php b/src/Settings/Pages/About.php
index ce094422..541ae62e 100644
--- a/src/Settings/Pages/About.php
+++ b/src/Settings/Pages/About.php
@@ -18,12 +18,10 @@ public function __construct()
public function addSettingsFields()
{
- return;
}
public function addSettingsSections()
{
- return;
}
/**
@@ -64,13 +62,12 @@ public function echoStaticContent()
/**
* @inheritDoc
*/
- public function hasForm()
+ public function hasForm(): bool
{
return false;
}
public function registerSettings()
{
- return;
}
}
diff --git a/src/Settings/Pages/Advanced.php b/src/Settings/Pages/Advanced.php
index 60a32f6b..0305ec18 100644
--- a/src/Settings/Pages/Advanced.php
+++ b/src/Settings/Pages/Advanced.php
@@ -1,9 +1,11 @@
array(
- 'label' => 'Beitragstitel mit angehängtem Zähler (Standard)'
- ),
- '%post_id%-%postname_nosuffix%' => array(
- 'label' => 'Beitragsnummer und Beitragstitel ohne angehängten Zähler'
- )
- );
+ /**
+ * @var array[]
+ */
+ private $permalinkOptions;
+
/**
* @var PermalinkController
*/
@@ -35,6 +34,15 @@ public function __construct(PermalinkController $permalinkController)
parent::__construct('advanced', __('Advanced', 'einsatzverwaltung'));
$this->permalinkController = $permalinkController;
+ $this->permalinkOptions = [
+ PermalinkController::DEFAULT_REPORT_PERMALINK => [
+ 'label' => __('Title with counter', 'einsatzverwaltung')
+ ],
+ '%post_id%-%postname_nosuffix%' => [
+ 'label' => __('ID + title without counter', 'einsatzverwaltung')
+ ]
+ ];
+
add_filter('pre_update_option_einsatzvw_rewrite_slug', array($this, 'maybeRewriteSlugChanged'), 10, 2);
}
@@ -42,28 +50,28 @@ public function addSettingsFields()
{
add_settings_field(
'einsatzvw_permalinks_base',
- 'Basis',
+ __('Base', 'einsatzverwaltung'),
array($this, 'echoFieldBase'),
$this->settingsApiPage,
'einsatzvw_settings_permalinks'
);
add_settings_field(
'einsatzvw_permalinks_struct',
- 'URL-Struktur für Einsatzberichte',
+ __('URL structure for reports', 'einsatzverwaltung'),
array($this, 'echoFieldUrlStructure'),
$this->settingsApiPage,
'einsatzvw_settings_permalinks'
);
add_settings_field(
'einsatzvw_advreport_corefeatures',
- 'Beitragsfunktionen',
+ __('Post features', 'einsatzverwaltung'),
array($this, 'echoFieldCoreFeatures'),
$this->settingsApiPage,
'einsatzvw_settings_advreport'
);
add_settings_field(
'einsatzvw_advreport_gutenberg',
- 'Gutenberg',
+ __('Block editor', 'einsatzverwaltung'),
array($this, 'echoFieldGutenberg'),
$this->settingsApiPage,
'einsatzvw_settings_advreport'
@@ -91,7 +99,10 @@ function () {
);
echo '';
}
- echo '
Eine Änderung der Permalinkstruktur hat zur Folge, dass bisherige Links auf Einsatzberichte nicht mehr funktionieren. Dem solltest du als Seitenbetreiber mit Weiterleitungen entgegenwirken.
';
+ printf(
+ "
%s
",
+ esc_html__('Changing the permalink structure breaks existing links to reports and archives. In case you are setting up the plugin for the first time, this is not a problem. If you have been using the plugin for some time, you should redirect the broken URLs to the working ones.', 'einsatzverwaltung')
+ );
},
$this->settingsApiPage
);
@@ -128,9 +139,18 @@ public function echoFieldBase()
);
echo '
';
printf(
- 'Basis für Links zu Einsatzberichten, zum %s und zum %s.',
- sprintf('%s', get_post_type_archive_link('einsatz'), 'Archiv'),
- sprintf('%s', get_post_type_archive_feed_link('einsatz'), 'Feed')
+ /* translators: 1: archive, 2: feed */
+ __('Base for links to single reports, the %s, and the %s.', 'einsatzverwaltung'),
+ sprintf(
+ '%s',
+ get_post_type_archive_link(\abrain\Einsatzverwaltung\Types\Report::getSlug()),
+ esc_html__('archive', 'einsatzverwaltung')
+ ),
+ sprintf(
+ '%s',
+ get_post_type_archive_feed_link(\abrain\Einsatzverwaltung\Types\Report::getSlug()),
+ esc_html__('feed', 'einsatzverwaltung')
+ )
);
echo '
';
}
@@ -147,7 +167,10 @@ public function echoFieldCoreFeatures()
'einsatz_support_posttag',
__('Tags', 'einsatzverwaltung')
);
- echo '
Diese Funktionen, die du von Beiträgen kennst, können auch für Einsatzberichte aktiviert werden.
';
+ printf(
+ '
%s
',
+ __('You can activate these features of Posts also for Incident Reports.', 'einsatzverwaltung')
+ );
echo '';
}
@@ -178,29 +201,20 @@ public function echoFieldUrlStructure()
);
printf(
__('By default, WordPress uses the post name to build the URL. To ensure uniqueness across posts, the post name can have a number appended if there are other posts with the same title (e.g. %1$s, %2$s, %3$s, ...).', 'einsatzverwaltung'),
- $sampleSlug,
- "$sampleSlug-2",
- "$sampleSlug-3"
+ esc_html($sampleSlug),
+ esc_html("$sampleSlug-2"),
+ esc_html("$sampleSlug-3")
);
echo '';
}
- /**
- * @inheritDoc
- */
- public function echoStaticContent()
- {
- echo '
Die erweiterten Einstellungen können weitreichende Konsequenzen haben und sollten entsprechend nicht leichtfertig geändert werden.
';
- return;
- }
-
/**
* @param WP_Post $post
* @param string $permalinkStructure
*
* @return string
*/
- private function getSampleUrl(WP_Post $post, $permalinkStructure)
+ private function getSampleUrl(WP_Post $post, $permalinkStructure): string
{
$selector = $this->permalinkController->buildSelector($post, $permalinkStructure);
return $this->permalinkController->getPermalink($selector);
@@ -214,7 +228,7 @@ private function getSampleUrl(WP_Post $post, $permalinkStructure)
* @param string $oldValue Der alte Wert
* @return string Der zu speichernde Wert
*/
- public function maybeRewriteSlugChanged($newValue, $oldValue)
+ public function maybeRewriteSlugChanged($newValue, $oldValue): string
{
if ($newValue != $oldValue) {
self::$options->setFlushRewriteRules(true);
@@ -233,22 +247,22 @@ public function registerSettings()
register_setting(
'einsatzvw_settings_advanced',
'einsatz_permalink',
- array('\abrain\Einsatzverwaltung\PermalinkController', 'sanitizePermalink')
+ array(PermalinkController::class, 'sanitizePermalink')
);
register_setting(
'einsatzvw_settings_advanced',
'einsatz_support_excerpt',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
register_setting(
'einsatzvw_settings_advanced',
'einsatz_support_posttag',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
register_setting(
'einsatzvw_settings_advanced',
'einsatz_disable_blockeditor',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
}
}
diff --git a/src/Settings/Pages/Capabilities.php b/src/Settings/Pages/Capabilities.php
index ed2a45d7..12861d0b 100644
--- a/src/Settings/Pages/Capabilities.php
+++ b/src/Settings/Pages/Capabilities.php
@@ -1,7 +1,8 @@
isOnlySpecialInLoop();
foreach ($reports as $report) {
if (!$onlySpecialInCategory || $report->isSpecial()) {
- $report->addToCategory($newValue);
+ $report->addToCategory((int)$newValue);
}
}
}
@@ -143,7 +142,7 @@ public function maybeCategoryChanged($newValue, $oldValue)
*
* @return string Der zu speichernde Wert
*/
- public function maybeCategorySpecialChanged($newValue, $oldValue)
+ public function maybeCategorySpecialChanged(string $newValue, string $oldValue): string
{
// Nur Änderungen sind interessant
if ($newValue == $oldValue) {
@@ -187,7 +186,7 @@ public function registerSettings()
register_setting(
'einsatzvw_settings_general',
'einsatzvw_show_einsatzberichte_mainloop',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
register_setting(
'einsatzvw_settings_general',
@@ -197,7 +196,7 @@ public function registerSettings()
register_setting(
'einsatzvw_settings_general',
'einsatzvw_loop_only_special',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
register_setting(
'einsatzvw_settings_general',
diff --git a/src/Settings/Pages/Numbers.php b/src/Settings/Pages/Numbers.php
index 9a131f27..e9493744 100644
--- a/src/Settings/Pages/Numbers.php
+++ b/src/Settings/Pages/Numbers.php
@@ -1,8 +1,11 @@
settingsApiPage,
'einsatzvw_settings_numbers'
);
add_settings_field(
- 'einsatzvw_einsatznummer_stellen',
- 'Format der Einsatznummer',
- array($this, 'echoFieldFormat'),
+ 'einsatzvw_einsatznummer_order',
+ __('Order', 'einsatzverwaltung'),
+ array($this, 'echoFieldOrder'),
+ $this->settingsApiPage,
+ 'einsatzvw_settings_numbers'
+ );
+ add_settings_field(
+ 'einsatzvw_einsatznummer_digits',
+ __('Number of digits', 'einsatzverwaltung'),
+ array($this, 'echoFieldDigits'),
+ $this->settingsApiPage,
+ 'einsatzvw_settings_numbers'
+ );
+ add_settings_field(
+ 'einsatzvw_einsatznummer_separator',
+ __('Separator', 'einsatzverwaltung'),
+ array($this, 'echoFieldSeparator'),
$this->settingsApiPage,
'einsatzvw_settings_numbers'
);
@@ -48,27 +65,54 @@ public function echoFieldAuto()
{
$this->echoSettingsCheckbox(
'einsatzverwaltung_incidentnumbers_auto',
- 'Einsatznummern automatisch verwalten'
+ __('Generate incident numbers automatically', 'einsatzverwaltung')
+ );
+ printf(
+ '
%s
',
+ __('If deactivated, incident numbers can be maintained manually.', 'einsatzverwaltung')
);
- echo '
Ist diese Option aktiv, kann die Einsatznummer nicht mehr manuell geändert werden. Sie wird automatisch gemäß den nachfolgenden Regeln generiert und aktualisiert.
';
}
- /**
- *
- */
- public function echoFieldFormat()
+ public function echoFieldDigits()
{
echo '';
+ printf(
+ '
%s
',
+ __('The sequential number gets padded with leading zeros until it has this length.', 'einsatzverwaltung')
+ );
+ }
+
+ public function echoFieldOrder()
+ {
+ $this->echoSettingsCheckbox(
+ 'einsatzvw_einsatznummer_lfdvorne',
+ __('Put the sequential number first', 'einsatzverwaltung')
+ );
+ printf(
+ '
%s
',
+ __('By default, the year comes before the sequential number. Activate this option to reverse the order.', 'einsatzverwaltung')
);
- echo '
Beispiel für den fünften Einsatz in 2014: bei 2 Stellen: 201405 bei 4 Stellen: 20140005
';
- $this->echoSettingsCheckbox('einsatzvw_einsatznummer_lfdvorne', 'Laufende Nummer vor das Jahr stellen');
-
- echo '
Hinweis: Nach einer Änderung des Formats erhalten die bestehenden Einsatzberichte nur dann automatisch aktualisierte Nummern, wenn die Option Einsatznummern automatisch verwalten aktiviert ist.
';
+ }
+
+ public function echoFieldSeparator()
+ {
+ echo '';
+ printf(
+ '
%s
',
+ __('This character separates the year and the sequential number.', 'einsatzverwaltung')
+ );
}
public function registerSettings()
@@ -76,17 +120,22 @@ public function registerSettings()
register_setting(
'einsatzvw_settings_numbers',
'einsatzverwaltung_incidentnumbers_auto',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
);
register_setting(
'einsatzvw_settings_numbers',
'einsatzvw_einsatznummer_stellen',
- array('\abrain\Einsatzverwaltung\ReportNumberController', 'sanitizeEinsatznummerStellen')
+ array(ReportNumberController::class, 'sanitizeEinsatznummerStellen')
);
register_setting(
'einsatzvw_settings_numbers',
'einsatzvw_einsatznummer_lfdvorne',
- array('\abrain\Einsatzverwaltung\Utilities', 'sanitizeCheckbox')
+ array(Utilities::class, 'sanitizeCheckbox')
+ );
+ register_setting(
+ 'einsatzvw_settings_numbers',
+ 'einsatzvw_numbers_separator',
+ array(ReportNumberController::class, 'sanitizeSeparator')
);
}
}
diff --git a/src/Settings/Pages/Report.php b/src/Settings/Pages/Report.php
index edda2009..23dc8b38 100644
--- a/src/Settings/Pages/Report.php
+++ b/src/Settings/Pages/Report.php
@@ -1,7 +1,8 @@
useReportTemplateOptions))) {
return 'no';
@@ -262,7 +263,7 @@ public function sanitizeReportTemplateUsage($input)
* @param string $input
* @return string
*/
- public function sanitizeTemplate($input)
+ public function sanitizeTemplate($input): string
{
return stripslashes(wp_filter_post_kses(addslashes($input)));
}
diff --git a/src/Settings/Pages/ReportList.php b/src/Settings/Pages/ReportList.php
index 34254767..01239da1 100644
--- a/src/Settings/Pages/ReportList.php
+++ b/src/Settings/Pages/ReportList.php
@@ -1,10 +1,11 @@
reportListSettings, 'sanitizeZebraNthChildArg')
+ [$this->reportListSettings, 'sanitizeZebraNthChildArg']
);
}
}
diff --git a/src/Settings/Pages/SubPage.php b/src/Settings/Pages/SubPage.php
index 097dd466..77480c1f 100644
--- a/src/Settings/Pages/SubPage.php
+++ b/src/Settings/Pages/SubPage.php
@@ -4,6 +4,8 @@
use abrain\Einsatzverwaltung\Options;
use abrain\Einsatzverwaltung\Settings\MainPage;
+use function esc_html;
+use function sprintf;
/**
* Base class for a sub page of the plugin settings
@@ -54,7 +56,6 @@ abstract public function registerSettings();
*/
public function beforeContent()
{
- return;
}
/**
@@ -105,7 +106,11 @@ protected function echoRadioButtons($name, $options, $defaultValue)
{
$currentValue = get_option($name, $defaultValue);
foreach ($options as $value => $option) {
- $label = esc_html($option['label']);
+ if ($value === $defaultValue) {
+ $label = esc_html(sprintf(__('%s (default)', 'einsatzverwaltung'), $option['label']));
+ } else {
+ $label = esc_html($option['label']);
+ }
if (array_key_exists('code', $option) && !empty($option['code'])) {
$label .= sprintf('%s', esc_html($option['code']));
}
@@ -179,7 +184,6 @@ protected function echoSettingsInput($name, $value, $size = 20)
*/
public function echoStaticContent()
{
- return;
}
/**
@@ -188,7 +192,7 @@ public function echoStaticContent()
*
* @return bool
*/
- public function hasForm()
+ public function hasForm(): bool
{
return true;
}
diff --git a/src/TypeRegistry.php b/src/TypeRegistry.php
index 816a2f64..382b29bb 100644
--- a/src/TypeRegistry.php
+++ b/src/TypeRegistry.php
@@ -95,7 +95,7 @@ private function registerPostType(CustomPostType $customPostType)
*
* @throws TypeRegistrationException
*/
- private function registerTaxonomy(CustomTaxonomy $customTaxonomy, $postType)
+ private function registerTaxonomy(CustomTaxonomy $customTaxonomy, string $postType)
{
$slug = $customTaxonomy::getSlug();
if (get_taxonomy($slug) !== false) {
diff --git a/src/Types/Report.php b/src/Types/Report.php
index 96bc0870..51bb2e4a 100644
--- a/src/Types/Report.php
+++ b/src/Types/Report.php
@@ -4,6 +4,7 @@
use abrain\Einsatzverwaltung\CustomFieldsRepository;
use abrain\Einsatzverwaltung\Model\ReportAnnotation;
use abrain\Einsatzverwaltung\ReportAnnotationRepository;
+use abrain\Einsatzverwaltung\Utilities;
use function register_meta;
/**
@@ -221,7 +222,7 @@ private function registerPostMeta()
'type' => 'boolean',
'description' => 'Vermerk, ob es sich um einen Fehlalarm handelte.',
'single' => true,
- 'sanitize_callback' => array('Utilities', 'sanitizeCheckbox'),
+ 'sanitize_callback' => array(Utilities::class, 'sanitizeCheckbox'),
'show_in_rest' => false
));
@@ -230,7 +231,7 @@ private function registerPostMeta()
'type' => 'boolean',
'description' => 'Vermerk, ob der Einsatzbericht Bilder enthält.',
'single' => true,
- 'sanitize_callback' => array('Utilities', 'sanitizeCheckbox'),
+ 'sanitize_callback' => array(Utilities::class, 'sanitizeCheckbox'),
'show_in_rest' => false
));
@@ -257,7 +258,7 @@ private function registerPostMeta()
'type' => 'boolean',
'description' => 'Vermerk, ob es sich um einen besonderen Einsatzbericht handelt.',
'single' => true,
- 'sanitize_callback' => array('Utilities', 'sanitizeCheckbox'),
+ 'sanitize_callback' => array(Utilities::class, 'sanitizeCheckbox'),
'show_in_rest' => false
));
diff --git a/src/Types/Unit.php b/src/Types/Unit.php
index 6bc8e410..1d49cadd 100644
--- a/src/Types/Unit.php
+++ b/src/Types/Unit.php
@@ -1,6 +1,7 @@
term_id, 'unit_order', true);
+ $order2 = get_term_meta($unit2->term_id, 'unit_order', true);
+
+ if (empty($order1) && !empty($order2)) {
+ return 1;
+ }
+
+ if (!empty($order1) && empty($order2)) {
+ return -1;
+ }
+
+ // If no order is set on both or if they are equal, sort by name
+ if (empty($order1) && empty($order2) || $order1 == $order2) {
+ return strcasecmp($unit1->name, $unit2->name);
+ }
+
+ return ($order1 < $order2) ? -1 : 1;
+ }
+
/**
* Retrieve the URL to more info about a given Unit. This can be a permalink to an internal page or an external URL.
*
@@ -118,6 +151,12 @@ public static function getSlug(): string
return 'evw_unit';
}
+ public static function isActivelyUsed(): bool
+ {
+ $unitCount = get_terms(['taxonomy' => self::getSlug(), 'fields' => 'count']);
+ return is_numeric($unitCount) && $unitCount > 0;
+ }
+
/**
* @inheritDoc
*/
@@ -134,6 +173,11 @@ public function registerCustomFields(CustomFieldsRepository $customFields)
__('External URL', 'einsatzverwaltung'),
__('You can specify a URL that points to more information about this unit. If set, this takes precedence over the page selected above.', 'einsatzverwaltung')
));
+ $customFields->add($this, new NumberInput(
+ 'unit_order',
+ 'Reihenfolge',
+ 'Optionale Angabe, mit der die Anzeigereihenfolge der Einheiten beeinflusst werden kann. Einheiten mit der kleineren Zahl werden zuerst angezeigt, anschließend diejenigen ohne Angabe bzw. dem Wert 0. Haben mehrere Einheiten den gleichen Wert, werden sie in alphabetischer Reihenfolge ausgegeben.'
+ ));
}
/**
diff --git a/src/Types/Vehicle.php b/src/Types/Vehicle.php
index f684cb52..7c8eb9c9 100644
--- a/src/Types/Vehicle.php
+++ b/src/Types/Vehicle.php
@@ -4,6 +4,7 @@
use abrain\Einsatzverwaltung\CustomFields\Checkbox;
use abrain\Einsatzverwaltung\CustomFields\NumberInput;
use abrain\Einsatzverwaltung\CustomFields\PostSelector;
+use abrain\Einsatzverwaltung\CustomFields\UnitSelector;
use abrain\Einsatzverwaltung\CustomFields\UrlInput;
use WP_REST_Response;
use WP_Term;
@@ -113,6 +114,11 @@ public function getRewriteSlug(): string
*/
public function registerCustomFields(CustomFieldsRepository $customFields)
{
+ $customFields->add($this, new UnitSelector(
+ 'vehicle_unit',
+ _x('Unit', 'taxonomy singular name', 'einsatzverwaltung'),
+ 'Falls du auf dieser Seite mehrere Einheiten (Abteilungen o.ä.) unterscheidest, kannst du hier das Fahrzeug einer davon zuordnen.'
+ ));
$customFields->add($this, new PostSelector(
'fahrzeugpid',
__('Page with further information', 'einsatzverwaltung'),
diff --git a/src/Util/Formatter.php b/src/Util/Formatter.php
index e1a923da..d2270bf5 100644
--- a/src/Util/Formatter.php
+++ b/src/Util/Formatter.php
@@ -16,6 +16,7 @@
use function esc_html;
use function esc_url;
use function get_permalink;
+use function get_term;
use function get_term_link;
use function get_term_meta;
use function get_the_post_thumbnail;
@@ -53,6 +54,7 @@ class Formatter
'%seqNum%' => 'Laufende Nummer',
'%annotations%' => 'Vermerke',
'%vehicles%' => 'Fahrzeuge',
+ '%vehiclesByUnit%' => 'Fahrzeuge, gruppiert nach Einheiten',
'%additionalForces%' => 'Weitere Kräfte',
'%typesOfAlerting%' => 'Alarmierungsarten',
'%content%' => 'Berichtstext',
@@ -95,12 +97,12 @@ public function __construct(Options $options, PermalinkController $permalinkCont
/**
* @param string $pattern
* @param array $allowedTags
- * @param WP_Post $post
+ * @param WP_Post|null $post
* @param string $context
*
* @return mixed
*/
- public function formatIncidentData($pattern, $allowedTags = array(), $post = null, $context = 'post')
+ public function formatIncidentData(string $pattern, $allowedTags = array(), ?WP_Post $post = null, $context = 'post'): string
{
if (empty($allowedTags)) {
$allowedTags = array_keys($this->availableTags);
@@ -119,13 +121,14 @@ public function formatIncidentData($pattern, $allowedTags = array(), $post = nul
}
/**
- * @param WP_Post $post
+ * @param WP_Post|null $post
* @param string $pattern
* @param string $tag
* @param string $context
+ *
* @return mixed|string
*/
- private function format($post, $pattern, $tag, $context = 'post')
+ private function format(?WP_Post $post, string $pattern, string $tag, $context = 'post'): string
{
if ($post == null && !in_array($tag, $this->tagsNotNeedingPost)) {
return $pattern;
@@ -166,7 +169,7 @@ private function format($post, $pattern, $tag, $context = 'post')
$replace = $incidentReport->getIncidentCommander();
break;
case '%incidentType%':
- $replace = $this->getTypeOfIncidentString($incidentReport, $context, false);
+ $replace = $this->getTypeOfIncidentString($incidentReport, $context);
break;
case '%incidentTypeHierarchical%':
$replace = $this->getTypeOfIncidentString($incidentReport, $context, true);
@@ -195,10 +198,13 @@ private function format($post, $pattern, $tag, $context = 'post')
}
break;
case '%annotations%':
- $replace = $this->annotationIconBar->render($incidentReport);
+ $replace = $this->annotationIconBar->render($incidentReport->getPostId());
break;
case '%vehicles%':
- $replace = $this->getVehicles($incidentReport, ($context === 'post'), ($context === 'post'));
+ $replace = $this->getVehicleString($incidentReport->getVehicles(), ($context === 'post'), ($context === 'post'));
+ break;
+ case '%vehiclesByUnit%':
+ $replace = $this->getVehiclesByUnitString($incidentReport->getVehiclesByUnit());
break;
case '%additionalForces%':
$replace = $this->getAdditionalForces($incidentReport, ($context === 'post'), ($context === 'post'));
@@ -237,7 +243,7 @@ private function format($post, $pattern, $tag, $context = 'post')
* @param WP_Term|false $typeOfIncident
* @return string
*/
- public function getColorOfTypeOfIncident($typeOfIncident)
+ public function getColorOfTypeOfIncident($typeOfIncident): string
{
if (empty($typeOfIncident)) {
return 'inherit';
@@ -263,7 +269,7 @@ public function getColorOfTypeOfIncident($typeOfIncident)
*
* @return string
*/
- public function getTypesOfAlerting($report)
+ public function getTypesOfAlerting(IncidentReport $report): string
{
if (empty($report)) {
return '';
@@ -292,7 +298,7 @@ public function getTypesOfAlerting($report)
*
* @return string
*/
- public static function getTypeOfIncident($report, $makeLinks, $showArchiveLinks, $showHierarchy = true)
+ public static function getTypeOfIncident(IncidentReport $report, bool $makeLinks, bool $showArchiveLinks, $showHierarchy = true): string
{
if (empty($report)) {
return '';
@@ -331,7 +337,7 @@ public static function getTypeOfIncident($report, $makeLinks, $showArchiveLinks,
*
* @return string
*/
- private function getTypeOfIncidentString(IncidentReport $incidentReport, $context, $showHierarchy = false)
+ private function getTypeOfIncidentString(IncidentReport $incidentReport, string $context, $showHierarchy = false): string
{
$showTypeArchive = get_option('einsatzvw_show_einsatzart_archive') === '1';
return $this->getTypeOfIncident($incidentReport, ($context === 'post'), $showTypeArchive, $showHierarchy);
@@ -347,49 +353,52 @@ public function getUnits(IncidentReport $report, $addLinks = false): string
{
$units = $report->getUnits();
- if (!$addLinks) {
- // Only return the names
- $unitNames = array_map(function (WP_Term $unit) {
- return esc_html($unit->name);
- }, $units);
- return join(', ', $unitNames);
+ if ($addLinks) {
+ $linkedUnitNames = array_map([$this, 'getUnitNameWithLink'], $units);
+ return join(', ', $linkedUnitNames);
}
- // Return the names, linked to the respective info page if URL has been set
- $linkedUnitNames = array_map(function (WP_Term $unit) {
- $name = $unit->name;
-
- $infoUrl = Unit::getInfoUrl($unit);
- if (empty($infoUrl)) {
- return esc_html($name);
- }
-
- return sprintf(
- '%s',
- esc_url($infoUrl),
- esc_attr($name),
- esc_html($name)
- );
+ // Only return the names
+ $unitNames = array_map(function (WP_Term $unit) {
+ return esc_html($unit->name);
}, $units);
- return join(', ', $linkedUnitNames);
+ return join(', ', $unitNames);
}
/**
- * @param IncidentReport $report
- * @param bool $makeLinks Fahrzeugname als Link zur Fahrzeugseite angeben, wenn diese eingetragen wurde
- * @param bool $showArchiveLinks Generiere zusätzlichen Link zur Archivseite des Fahrzeugs
+ * Returns the name of a Unit, linked to the respective info page if URL has been set.
+ *
+ * @param WP_Term $unit
*
* @return string
*/
- public function getVehicles($report, $makeLinks, $showArchiveLinks)
+ private function getUnitNameWithLink(WP_Term $unit): string
{
- if (empty($report)) {
- return '';
+ $name = $unit->name;
+
+ $infoUrl = Unit::getInfoUrl($unit);
+ if (empty($infoUrl)) {
+ return esc_html($name);
}
- $vehicles = $report->getVehicles();
+ return sprintf(
+ '%s',
+ esc_url($infoUrl),
+ esc_attr($name),
+ esc_html($name)
+ );
+ }
+ /**
+ * @param WP_Term[] $vehicles
+ * @param bool $makeLinks Fahrzeugname als Link zur Fahrzeugseite angeben, wenn diese eingetragen wurde
+ * @param bool $showArchiveLinks Generiere zusätzlichen Link zur Archivseite des Fahrzeugs
+ *
+ * @return string
+ */
+ public function getVehicleString(array $vehicles, bool $makeLinks, bool $showArchiveLinks): string
+ {
if (empty($vehicles)) {
return '';
}
@@ -411,11 +420,38 @@ public function getVehicles($report, $makeLinks, $showArchiveLinks)
return join(", ", $names);
}
+ public function getVehiclesByUnitString(array $vehiclesByUnitId): string
+ {
+ if (empty($vehiclesByUnitId)) {
+ return '';
+ }
+
+ $string = '
';
+ return $string;
+ }
+
/**
* @param WP_Term $vehicle
* @return string A link to the page associated with the vehicle (if any), otherwise the name without a link
*/
- private function addVehicleLink($vehicle)
+ private function addVehicleLink(WP_Term $vehicle): string
{
$url = $this->getUrlForVehicle($vehicle);
if (empty($url)) {
@@ -435,7 +471,7 @@ private function addVehicleLink($vehicle)
*
* @return string
*/
- private function getUrlForVehicle(WP_Term $vehicle)
+ private function getUrlForVehicle(WP_Term $vehicle): string
{
// The external URL takes precedence over an internal page
$extUrl = get_term_meta($vehicle->term_id, 'vehicle_exturl', true);
@@ -465,7 +501,7 @@ private function getUrlForVehicle(WP_Term $vehicle)
*
* @return string
*/
- public function getAdditionalForces($report, $makeLinks, $showArchiveLinks)
+ public function getAdditionalForces(IncidentReport $report, bool $makeLinks, bool $showArchiveLinks): string
{
if (empty($report)) {
return '';
@@ -496,9 +532,10 @@ public function getAdditionalForces($report, $makeLinks, $showArchiveLinks)
/**
* @param WP_Term $additionalForce
+ *
* @return string
*/
- private function getAdditionalForceLink($additionalForce)
+ private function getAdditionalForceLink(WP_Term $additionalForce): string
{
$url = get_term_meta($additionalForce->term_id, 'url', true);
if (empty($url)) {
@@ -517,9 +554,10 @@ private function getAdditionalForceLink($additionalForce)
/**
* @param WP_Term $term
+ *
* @return string
*/
- private function getFilterLink(WP_Term $term)
+ private function getFilterLink(WP_Term $term): string
{
return sprintf(
'',
@@ -536,7 +574,7 @@ private function getFilterLink(WP_Term $term)
*
* @return string
*/
- public static function getDurationString($minutes, $abbreviated = false)
+ public static function getDurationString(int $minutes, $abbreviated = false): string
{
if (!is_numeric($minutes) || $minutes < 0) {
return '';
@@ -560,9 +598,10 @@ public static function getDurationString($minutes, $abbreviated = false)
/**
* @param string $tag
+ *
* @return string
*/
- public function getLabelForTag($tag)
+ public function getLabelForTag(string $tag): string
{
if (!array_key_exists($tag, $this->availableTags)) {
return '';
diff --git a/src/Util/ProgressTracker.php b/src/Util/ProgressTracker.php
index d6865740..265a7cfb 100644
--- a/src/Util/ProgressTracker.php
+++ b/src/Util/ProgressTracker.php
@@ -82,7 +82,7 @@ public function finish($message = '')
/**
* @return int
*/
- public function getPercentage()
+ public function getPercentage(): int
{
if ($this->totalSteps === 0) {
return 0;
diff --git a/src/Utilities.php b/src/Utilities.php
index 48c1f016..1ed5964a 100644
--- a/src/Utilities.php
+++ b/src/Utilities.php
@@ -1,6 +1,16 @@
term_id, 'vehicle_unit', true);
+ if (empty($unitId)) {
+ $unitId = -1;
+ }
+ if (!array_key_exists($unitId, $grouped)) {
+ $grouped[$unitId] = [];
+ }
+ $grouped[$unitId][] = $vehicle;
+ }
+
+ // Sort the units
+ $unitIds = array_keys($grouped);
+ /** @var WP_Term[] $units */
+ $units = array_map('get_term', array_filter($unitIds, function ($unitId) {
+ return $unitId > 0;
+ }));
+ usort($units, array(Unit::class, 'compare'));
+ $groupedAndSorted = [];
+ foreach ($units as $unit) {
+ $groupedAndSorted[$unit->term_id] = $grouped[$unit->term_id];
+ }
+ if (array_key_exists(-1, $grouped)) {
+ $groupedAndSorted[-1] = $grouped[-1];
+ }
+
+ // Sort the vehicles per unit
+ foreach ($unitIds as $unitId) {
+ usort($groupedAndSorted[$unitId], array(Vehicle::class, 'compareVehicles'));
+ }
+
+ return $groupedAndSorted;
+ }
+
/**
* Gibt eine Fehlermeldung aus
*
* @param string $message Meldung, die ausgegeben werden soll
*/
- public function printError($message)
+ public function printError(string $message)
{
echo '
' . $message . '
';
}
@@ -36,7 +90,7 @@ public function printError($message)
*
* @param string $message Meldung, die ausgegeben werden soll
*/
- public function printWarning($message)
+ public function printWarning(string $message)
{
echo '
' . $message . '
';
}
@@ -47,7 +101,7 @@ public function printWarning($message)
*
* @param string $message Meldung, die ausgegeben werden soll
*/
- public function printSuccess($message)
+ public function printSuccess(string $message)
{
echo '
' . $message . '
';
}
@@ -58,7 +112,7 @@ public function printSuccess($message)
*
* @param string $message Meldung, die ausgegeben werden soll
*/
- public function printInfo($message)
+ public function printInfo(string $message)
{
echo '
' . $message . '
';
}
@@ -69,7 +123,7 @@ public function printInfo($message)
* @param int $postId Die ID des Einsatzberichts
* @param int $category Die ID der Kategorie
*/
- public static function removePostFromCategory($postId, $category)
+ public static function removePostFromCategory(int $postId, int $category)
{
$categories = wp_get_post_categories($postId);
$key = array_search($category, $categories);
@@ -86,7 +140,7 @@ public static function removePostFromCategory($postId, $category)
*
* @return int 0 für false, 1 für true
*/
- public static function sanitizeCheckbox($value)
+ public static function sanitizeCheckbox($value): int
{
if (isset($value) && $value == "1") {
return 1;
diff --git a/src/Widgets/AbstractWidget.php b/src/Widgets/AbstractWidget.php
index d83709a9..92a639f9 100644
--- a/src/Widgets/AbstractWidget.php
+++ b/src/Widgets/AbstractWidget.php
@@ -11,6 +11,22 @@
*/
abstract class AbstractWidget extends WP_Widget
{
+ /**
+ * @param array $instance
+ * @param string $fieldName
+ * @param string $label
+ */
+ protected function echoCheckbox(array $instance, string $fieldName, string $label)
+ {
+ printf(
+ ' ',
+ esc_attr($this->get_field_id($fieldName)),
+ esc_attr($this->get_field_name($fieldName)),
+ checked($instance[$fieldName], 'on', false),
+ esc_html($label)
+ );
+ }
+
/**
* @param WP_Taxonomy $taxonomyObject
* @param string $fieldName
diff --git a/src/Widgets/RecentIncidents.php b/src/Widgets/RecentIncidents.php
index c77f472d..67f43044 100644
--- a/src/Widgets/RecentIncidents.php
+++ b/src/Widgets/RecentIncidents.php
@@ -7,8 +7,13 @@
use abrain\Einsatzverwaltung\Types\Unit;
use abrain\Einsatzverwaltung\Util\Formatter;
use abrain\Einsatzverwaltung\Utilities;
+use function array_merge;
+use function checked;
+use function esc_html;
+use function esc_html__;
use function get_queried_object_id;
use function get_taxonomy;
+use function printf;
/**
* WordPress-Widget für die letzten X Einsätze
@@ -22,6 +27,11 @@ class RecentIncidents extends AbstractWidget
*/
private $formatter;
+ /**
+ * @var array
+ */
+ private $defaults;
+
/**
* Register widget with WordPress.
*
@@ -30,25 +40,19 @@ class RecentIncidents extends AbstractWidget
public function __construct(Formatter $formatter)
{
parent::__construct(
- 'einsatzverwaltung_widget', // Base ID
- 'Letzte Einsätze', // Name
- array(
- 'description' => 'Zeigt die neuesten Einsätze an.',
+ 'einsatzverwaltung_widget',
+ __('Recent Incident Reports', 'einsatzverwaltung'),
+ [
+ 'description' => __('The the most recent Incident Reports.', 'einsatzverwaltung'),
'customize_selective_refresh' => true,
- ) // Args
+ ]
);
$this->formatter = $formatter;
- }
- /**
- * @inheritDoc
- */
- public function widget($args, $instance)
- {
- $defaults = array(
- 'title' => 'Letzte Einsätze',
+ $this->defaults = [
+ 'title' => '',
'anzahl' => 3,
- 'units' => array(),
+ 'units' => [],
'zeigeDatum' => false,
'zeigeZeit' => false,
'zeigeFeedlink' => false,
@@ -56,14 +60,20 @@ public function widget($args, $instance)
'zeigeArt' => false,
'zeigeArtHierarchie' => false,
'showAnnotations' => false
- );
- $instance = wp_parse_args($instance, $defaults);
+ ];
+ }
- $title = apply_filters('widget_title', $instance['title']);
+ /**
+ * @inheritDoc
+ */
+ public function widget($args, $instance)
+ {
+ $instance = array_merge($this->defaults, $instance);
+ $title = empty($instance['title']) ? __('Recent incidents', 'einsatzverwaltung') : $instance['title'];
echo $args['before_widget'];
echo $args['before_title'];
- echo esc_html($title);
+ echo esc_html(apply_filters('widget_title', $title));
echo $args['after_title'];
$this->echoReports($instance);
@@ -72,7 +82,7 @@ public function widget($args, $instance)
printf(
'
',
$this->get_field_id('anzahl'),
- 'Anzahl der Einsatzberichte, die angezeigt werden:',
+ esc_html__('Number of reports to show:', 'einsatzverwaltung'),
$this->get_field_name('anzahl'),
- esc_attr($anzahl)
+ esc_attr($instance['anzahl'])
);
$this->echoChecklistBox(
get_taxonomy(Unit::getSlug()),
'units',
__('Only show reports for these units:', 'einsatzverwaltung'),
- $selectedUnits,
+ $instance['units'],
__('Select no unit to show all reports', 'einsatzverwaltung')
);
- printf(
- '