Version 1.0.1, change namespace , Fix vulnerabilities and maintenance issues

Author: MufengNiu

CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+All notable changes to this module will be documented in this file.
+
+## [1.0.1] - 2026-03-20
+
+### Fixed
+- **Coding standards:** Replaced all loose comparisons (`==`, `!=`) with strict equivalents (`===`, `!==`) in `IndexController.php`.
+- **Coding standards:** Added missing parentheses on `new ViewModel` instantiations.
+- **Bug fix:** Fixed potential negative array index in `getAutoColor()` caused by `crc32()` returning negative values on 32-bit systems; added `abs()` wrapper.
+- **Security:** Added validation (regex allowlist) for `popup_props` query parameter in `getFeaturePopupContentAction()` to prevent injection via untrusted property terms.
+- **Error handling:** Narrowed all `catch (\Throwable)` blocks to `catch (\Exception)` to avoid silently catching fatal errors.
+- **Error handling:** Added `$this->logger()->warn()` / `->debug()` calls to all catch blocks — no more silently swallowed exceptions.
+
+### Changed
+- **Namespace:** Renamed root namespace from `Mapping` to `MappingExtensions` across all PHP files to avoid conflicts with the official Mapping module.
+- **Code quality:** Extracted duplicated geography-to-array conversion into new `buildFeatureArray()` helper method.
+- **Code quality:** Extracted duplicated JSON response pattern into new `buildFeaturesJsonResponse()` helper method.
+- **Code quality:** Extracted linked-properties parsing into new `parseLinkedProperties()` helper method.
+- **Code quality:** Merged duplicate `searchOne('properties')` API calls in `addLegendForItem()` into a single call.
+- **Code quality:** Renamed `getFeatureActionforJourneyItems()` to `getFeatureActionForJourneyItems()` for consistent camelCase.
+
+### Added
+- Class-level and method-level docblocks on all public and private methods in `IndexController.php`.
+
+## [1.0.0] - Initial release
+
+- Initial release of the Mapping Extensions module.

Module.php

@@ -1,15 +1,15 @@
 <?php
-namespace Mapping;
+namespace MappingExtensions;
 
 use Composer\Semver\Comparator;
 use Doctrine\ORM\Events;
-use Mapping\Db\Event\Listener\DetachOrphanMappings;
+use MappingExtensions\Db\Event\Listener\DetachOrphanMappings;
 use Omeka\Api\Exception as ApiException;
 use Omeka\Api\Request;
-use Mapping\Api\Representation\MappingRepresentation;
-use Mapping\Entity\MappingFeature;
-use Mapping\Form\Element\CopyCoordinates;
-use Mapping\Form\Element\UpdateFeatures;
+use MappingExtensions\Api\Representation\MappingRepresentation;
+use MappingExtensions\Entity\MappingFeature;
+use MappingExtensions\Form\Element\CopyCoordinates;
+use MappingExtensions\Form\Element\UpdateFeatures;
 use Omeka\Module\AbstractModule;
 use Omeka\Permissions\Acl;
 use Laminas\EventManager\Event;
@@ -79,13 +79,13 @@ public function onBootstrap(MvcEvent $event)
         // Set the corresponding visibility rules on Mapping resources.
         $em = $this->getServiceLocator()->get('Omeka\EntityManager');
         $filter = $em->getFilters()->getFilter('resource_visibility');
-        $filter->addRelatedEntity('Mapping\Entity\Mapping', 'item_id');
-        $filter->addRelatedEntity('Mapping\Entity\MappingFeature', 'item_id');
+        $filter->addRelatedEntity('MappingExtensions\Entity\Mapping', 'item_id');
+        $filter->addRelatedEntity('MappingExtensions\Entity\MappingFeature', 'item_id');
 
         $acl = $this->getServiceLocator()->get('Omeka\Acl');
         $acl->allow(
             null,
-            'Mapping\Controller\Site\Index'
+            'MappingExtensions\Controller\Site\Index'
         );
         $acl->allow(
             [Acl::ROLE_AUTHOR,
@@ -94,19 +94,19 @@ public function onBootstrap(MvcEvent $event)
                 Acl::ROLE_REVIEWER,
                 Acl::ROLE_SITE_ADMIN,
             ],
-            ['Mapping\Api\Adapter\MappingFeatureAdapter',
-                'Mapping\Api\Adapter\MappingAdapter',
-                'Mapping\Entity\MappingFeature',
-                'Mapping\Entity\Mapping',
+            ['MappingExtensions\Api\Adapter\MappingFeatureAdapter',
+                'MappingExtensions\Api\Adapter\MappingAdapter',
+                'MappingExtensions\Entity\MappingFeature',
+                'MappingExtensions\Entity\Mapping',
             ]
         );
 
         $acl->allow(
             null,
-            ['Mapping\Api\Adapter\MappingFeatureAdapter',
-                'Mapping\Api\Adapter\MappingAdapter',
-                'Mapping\Entity\MappingFeature',
-                'Mapping\Entity\Mapping',
+            ['MappingExtensions\Api\Adapter\MappingFeatureAdapter',
+                'MappingExtensions\Api\Adapter\MappingAdapter',
+                'MappingExtensions\Entity\MappingFeature',
+                'MappingExtensions\Entity\Mapping',
             ],
             ['show', 'browse', 'read', 'search']
         );
@@ -280,7 +280,7 @@ public function attachListeners(SharedEventManagerInterface $sharedEventManager)
         );
         // Add the mapping fields to advanced search pages.
         $sharedEventManager->attach(
-            'Mapping\Controller\Site\Index',
+            'MappingExtensions\Controller\Site\Index',
             'view.advanced_search',
             [$this, 'filterMapBrowseAdvancedSearch']
         );
@@ -747,12 +747,12 @@ public function handleApiSearchQuery(Event $event)
             $mappingFeatureAlias = $itemAdapter->createAlias();
             if ($query['has_features']) {
                 $qb->innerJoin(
-                    'Mapping\Entity\MappingFeature', $mappingFeatureAlias,
+                    'MappingExtensions\Entity\MappingFeature', $mappingFeatureAlias,
                     'WITH', "$mappingFeatureAlias.item = omeka_root.id"
                 );
             } else {
                 $qb->leftJoin(
-                    'Mapping\Entity\MappingFeature', $mappingFeatureAlias,
+                    'MappingExtensions\Entity\MappingFeature', $mappingFeatureAlias,
                     'WITH', "$mappingFeatureAlias.item = omeka_root.id"
                 );
                 $qb->andWhere($qb->expr()->isNull($mappingFeatureAlias));
@@ -862,7 +862,7 @@ public function handleMapping(Event $event)
             // Create mapping
             $subRequest = new \Omeka\Api\Request('create', 'mappings');
             $subRequest->setContent($mappingData);
-            $mapping = new \Mapping\Entity\Mapping;
+            $mapping = new \MappingExtensions\Entity\Mapping;
             $mapping->setItem($event->getParam('entity'));
             $mappingsAdapter->hydrateEntity($subRequest, $mapping, new \Omeka\Stdlib\ErrorStore);
             $mappingsAdapter->getEntityManager()->persist($mapping);
@@ -890,7 +890,7 @@ public function handleFeatures(Event $event)
 
         $existingFeatures = [];
         if ($item->getId()) {
-            $dql = 'SELECT mf FROM Mapping\Entity\MappingFeature mf INDEX BY mf.id WHERE mf.item = ?1';
+            $dql = 'SELECT mf FROM MappingExtensions\Entity\MappingFeature mf INDEX BY mf.id WHERE mf.item = ?1';
             $query = $entityManager->createQuery($dql)->setParameter(1, $item->getId());
             $existingFeatures = $query->getResult();
         }
@@ -911,7 +911,7 @@ public function handleFeatures(Event $event)
             } else {
                 $subRequest = new \Omeka\Api\Request('create', 'mapping_features');
                 $subRequest->setContent($featureData);
-                $feature = new \Mapping\Entity\MappingFeature;
+                $feature = new \MappingExtensions\Entity\MappingFeature;
                 $feature->setItem($item);
                 $featuresAdapter->hydrateEntity($subRequest, $feature, new \Omeka\Stdlib\ErrorStore);
                 $entityManager->persist($feature);
@@ -1000,7 +1000,7 @@ public function deleteFeatures(Event $event)
         $services = $this->getServiceLocator();
         $entityManager = $services->get('Omeka\EntityManager');
 
-        $dql = 'DELETE FROM Mapping\Entity\MappingFeature m WHERE m.item = :item_id';
+        $dql = 'DELETE FROM MappingExtensions\Entity\MappingFeature m WHERE m.item = :item_id';
         $entityManager->createQuery($dql)
             ->setParameter('item_id', $item->getId())
             ->execute();
@@ -1042,7 +1042,7 @@ public function copyCoordinates(Event $event)
             FROM Omeka\Entity\Media m
             WHERE m.item = :item_id';
         $dqlFeature = "SELECT f
-            FROM Mapping\Entity\MappingFeature f
+            FROM MappingExtensions\Entity\MappingFeature f
             WHERE f.item = :item_id
             AND ST_GeometryType(f.geography) = 'POINT'
             AND ST_Intersects(ST_Buffer(ST_GeomFromText(:buffer_center_point), 0.00001), f.geography) = 1";
@@ -1199,7 +1199,7 @@ public function updateFeatures(Event $event)
         $entityManager = $services->get('Omeka\EntityManager');
 
         $dql = 'SELECT m
-            FROM Mapping\Entity\MappingFeature m
+            FROM MappingExtensions\Entity\MappingFeature m
             WHERE m.item = :item_id';
         $features = $entityManager->createQuery($dql)
             ->setParameter('item_id', $item->getId())

README.md

@@ -24,6 +24,7 @@ please ignore it. This is a known issue and will be resolved in future releases.
 - Download a ZIP package from one of the 
 [releases](https://github.com/Systemik-Solutions/OmekaS-MappingExtensions/releases).
 - Extract the ZIP into the modules directory of your Omeka S installation.
+- Rename the folder to 'MappingExtensions'.
 - In the Omeka S admin panel, go to Modules and click Install next to “Mapping Extensions”.
 
 For more details, refer to the [Omeka S module installation guide](https://omeka.org/s/docs/user-manual/modules/).

asset/js/MappingModule.js

@@ -43,7 +43,7 @@ const MappingModule = {
 
             let rowsHtml = "";
             clusterMarkers.forEach((marker, idx) => {
-                const title = marker.feature.geometry.properties.title || "No title";
+                const title = marker.feature.geometry.properties ? marker.feature.geometry.properties.title : "No title";
                 rowsHtml += `
                     <tr>
                     <td><a href="#" class="cluster-jump" data-marker-index="${idx}">${title}</a></td>

config/module.config.php

@@ -1,5 +1,5 @@
 <?php
-namespace Mapping;
+namespace MappingExtensions;
 
 use Osii\Service\ResourceMapper\ResourceMapperFactory;
 
@@ -22,7 +22,7 @@
         ],
         'functions' => [
             'numeric' => [
-                'ST_Buffer' => 'Mapping\Spatial\ORM\Query\AST\Functions\StBuffer',
+                'ST_Buffer' => 'MappingExtensions\Spatial\ORM\Query\AST\Functions\StBuffer',
                 'ST_Intersects' => 'LongitudeOne\Spatial\ORM\Query\AST\Functions\Standard\StIntersects',
                 'ST_GeomFromText' => 'LongitudeOne\Spatial\ORM\Query\AST\Functions\Standard\StGeomFromText',
                 'ST_GeometryType' => 'LongitudeOne\Spatial\ORM\Query\AST\Functions\Standard\StGeometryType',
@@ -51,9 +51,9 @@
     ],
     'form_elements' => [
         'factories' => [
-            'Mapping\Form\Fieldset\TimelineFieldset' => Service\Form\Fieldset\TimelineFieldsetFactory::class,
-            'Mapping\Form\Element\CopyCoordinates' => Service\Form\Element\CopyCoordinatesFactory::class,
-            'Mapping\Form\Element\UpdateFeatures' => Service\Form\Element\UpdateFeaturesFactory::class,
+            'MappingExtensions\Form\Fieldset\TimelineFieldset' => Service\Form\Fieldset\TimelineFieldsetFactory::class,
+            'MappingExtensions\Form\Element\CopyCoordinates' => Service\Form\Element\CopyCoordinatesFactory::class,
+            'MappingExtensions\Form\Element\UpdateFeatures' => Service\Form\Element\UpdateFeaturesFactory::class,
         ],
     ],
     'csv_import' => [
@@ -84,8 +84,8 @@
     ],
     'controllers' => [
         'invokables' => [
-            'Mapping\Controller\Admin\Index' => Controller\Admin\IndexController::class,
-            'Mapping\Controller\Site\Index' => Controller\Site\IndexController::class,
+            'MappingExtensions\Controller\Admin\Index' => Controller\Admin\IndexController::class,
+            'MappingExtensions\Controller\Site\Index' => Controller\Site\IndexController::class,
         ],
     ],
     'collecting_media_types' => [
@@ -102,7 +102,7 @@
                         'options' => [
                             'route' => '/mapping/:controller[/:action]',
                             'defaults' => [
-                                '__NAMESPACE__' => 'Mapping\Controller\Admin',
+                                '__NAMESPACE__' => 'MappingExtensions\Controller\Admin',
                                 'controller' => 'index',
                                 'action' => 'index',
                             ],
@@ -121,7 +121,7 @@
                         'options' => [
                             'route' => '/mapping/:controller[/:action]',
                             'defaults' => [
-                                '__NAMESPACE__' => 'Mapping\Controller\Site',
+                                '__NAMESPACE__' => 'MappingExtensions\Controller\Site',
                                 'controller' => 'index',
                                 'action' => 'index',
                             ],
@@ -157,12 +157,12 @@
     ],
     'static_site_export' => [
         'vendor_packages' => [
-            'omeka-mapping' => sprintf('%s/modules/Mapping/src/StaticSiteExport/omeka-mapping', OMEKA_PATH),
-            'leaflet' => sprintf('%s/modules/Mapping/src/StaticSiteExport/leaflet', OMEKA_PATH),
-            'leaflet.markercluster' => sprintf('%s/modules/Mapping/src/StaticSiteExport/leaflet.markercluster', OMEKA_PATH),
+            'omeka-mapping' => sprintf('%s/modules/MappingExtensions/src/StaticSiteExport/omeka-mapping', OMEKA_PATH),
+            'leaflet' => sprintf('%s/modules/MappingExtensions/src/StaticSiteExport/leaflet', OMEKA_PATH),
+            'leaflet.markercluster' => sprintf('%s/modules/MappingExtensions/src/StaticSiteExport/leaflet.markercluster', OMEKA_PATH),
         ],
         'shortcodes' => [
-            'omeka-mapping-features' => sprintf('%s/modules/Mapping/src/StaticSiteExport/omeka-mapping-features.html', OMEKA_PATH),
+            'omeka-mapping-features' => sprintf('%s/modules/MappingExtensions/src/StaticSiteExport/omeka-mapping-features.html', OMEKA_PATH),
         ],
         'block_layouts' => [
             'invokables' => [

config/module.ini

@@ -1,5 +1,5 @@
 [info]
-version = "1.0.0"
+version = "1.0.1"
 omeka_version_constraint = "^4.1.1"
 name = "Mapping Extensions"
 description = "A module that extends the functionality of the official Mapping module."

data/doctrine-proxies/__CG__MappingEntityMapping.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace DoctrineProxies\__CG__\Mapping\Entity;
+namespace DoctrineProxies\__CG__\MappingExtensions\Entity;
 
 
 /**
  * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
  */
-class Mapping extends \Mapping\Entity\Mapping implements \Doctrine\ORM\Proxy\Proxy
+class Mapping extends \MappingExtensions\Entity\Mapping implements \Doctrine\ORM\Proxy\Proxy
 {
     /**
      * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with

data/doctrine-proxies/__CG__MappingEntityMappingFeature.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace DoctrineProxies\__CG__\Mapping\Entity;
+namespace DoctrineProxies\__CG__\MappingExtensions\Entity;
 
 
 /**
  * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
  */
-class MappingFeature extends \Mapping\Entity\MappingFeature implements \Doctrine\ORM\Proxy\Proxy
+class MappingFeature extends \MappingExtensions\Entity\MappingFeature implements \Doctrine\ORM\Proxy\Proxy
 {
     /**
      * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with

data/doctrine-proxies/__CG__MappingEntityMappingMarker.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace DoctrineProxies\__CG__\Mapping\Entity;
+namespace DoctrineProxies\__CG__\MappingExtensions\Entity;
 
 
 /**
  * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
  */
-class MappingMarker extends \Mapping\Entity\MappingMarker implements \Doctrine\ORM\Proxy\Proxy
+class MappingMarker extends \MappingExtensions\Entity\MappingMarker implements \Doctrine\ORM\Proxy\Proxy
 {
     /**
      * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with

src/Api/Adapter/MappingAdapter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Mapping\Api\Adapter;
+namespace MappingExtensions\Api\Adapter;
 
 use Doctrine\ORM\QueryBuilder;
 use Omeka\Api\Adapter\AbstractEntityAdapter;
@@ -16,12 +16,12 @@ public function getResourceName()
 
     public function getRepresentationClass()
     {
-        return 'Mapping\Api\Representation\MappingRepresentation';
+        return 'MappingExtensions\Api\Representation\MappingRepresentation';
     }
 
     public function getEntityClass()
     {
-        return 'Mapping\Entity\Mapping';
+        return 'MappingExtensions\Entity\Mapping';
     }
 
     public function hydrate(Request $request, EntityInterface $entity,