From 5ad69bf0b76ff2e5065551b6a7d154cb26834605 Mon Sep 17 00:00:00 2001
From: Jonas L <jooola@users.noreply.github.com>
Date: Sat, 13 Apr 2024 15:54:47 +0200
Subject: [PATCH] fix(legacy): ensure validation is performed on the track type
 form (#2985)

### Description

Fixes #2939

The zend form validation was not performed, only a custom method to
validate the code was used. This merge both validation, and leverage the
Zend form validation framework.

Also allow updating the track type code from the track type form.
Related to #2955
---
 .../controllers/TracktypeController.php       |  6 ++---
 legacy/application/forms/AddTracktype.php     | 26 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/legacy/application/controllers/TracktypeController.php b/legacy/application/controllers/TracktypeController.php
index b528da642..587e16912 100644
--- a/legacy/application/controllers/TracktypeController.php
+++ b/legacy/application/controllers/TracktypeController.php
@@ -44,11 +44,9 @@ class TracktypeController extends Zend_Controller_Action
                 $formData[$v[0]] = urldecode($v[1]);
             }
 
-            if ($form->validateCode($formData)) {
+            if ($form->isValid($formData)) {
                 $tracktype = new Application_Model_Tracktype($formData['tracktype_id']);
-                if (empty($formData['tracktype_id'])) {
-                    $tracktype->setCode($formData['code']);
-                }
+                $tracktype->setCode($formData['code']);
                 $tracktype->setTypeName($formData['type_name']);
                 $tracktype->setDescription($formData['description']);
                 $tracktype->setVisibility($formData['visibility']);
diff --git a/legacy/application/forms/AddTracktype.php b/legacy/application/forms/AddTracktype.php
index 798794f20..5fcf856a6 100644
--- a/legacy/application/forms/AddTracktype.php
+++ b/legacy/application/forms/AddTracktype.php
@@ -28,6 +28,17 @@ class Application_Form_AddTracktype extends Zend_Form
         $code->setAttrib('style', 'width: 40%');
         $code->setRequired(true);
         $code->addValidator($notEmptyValidator);
+
+        $uniqueTrackTypeCodeValidator = new Zend_Validate_Callback(function ($value, $context) {
+            if (strlen($context['tracktype_id']) === 0) { // Only check uniqueness on create
+                return CcTracktypesQuery::create()->filterByDbCode($value)->count() === 0;
+            }
+
+            return true;
+        });
+        $uniqueTrackTypeCodeValidator->setMessage(_('Code is not unique.'));
+        $code->addValidator($uniqueTrackTypeCodeValidator);
+
         $code->addFilter('StringTrim');
         $this->addElement($code);
 
@@ -64,19 +75,4 @@ class Application_Form_AddTracktype extends Zend_Form
         $saveBtn->setLabel(_('Save'));
         $this->addElement($saveBtn);
     }
-
-    public function validateCode($data)
-    {
-        if (strlen($data['tracktype_id']) == 0) {
-            $count = CcTracktypesQuery::create()->filterByDbCode($data['code'])->count();
-
-            if ($count != 0) {
-                $this->getElement('code')->setErrors([_('Code is not unique.')]);
-
-                return false;
-            }
-        }
-
-        return true;
-    }
 }