Types fixes

galette · May 9, 2024 · a6dd292 · a6dd292
1 parent 2086e31
commit a6dd292
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/galette/includes/functions.inc.php b/galette/includes/functions.inc.php
@@ -37,5 +37,5 @@ function isValidWebUrl(string $url): bool
     return (preg_match(
         '#^http[s]?\\:\\/\\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i',
         $url
-    ));
+    ) === 1);
 }
diff --git a/galette/lib/Galette/Core/Db.php b/galette/lib/Galette/Core/Db.php
@@ -195,7 +195,7 @@ public function getDbVersion(bool $check_table = false): string
                 $results = $this->execute($select);
                 $result = $results->current();
                 return number_format(
-                    $result->version,
+                    (float)$result->version,
                     3,
                     '.',
                     ''

diff --git a/galette/lib/Galette/Core/Preferences.php b/galette/lib/Galette/Core/Preferences.php
@@ -508,7 +508,11 @@ public function check(array $values, Login $login): bool
         // obtain fields
         foreach ($this->getFieldsNames() as $fieldname) {
             if (isset($values[$fieldname])) {
-                $value = trim($values[$fieldname]);
+                if (is_string($values[$fieldname]))  {
+                    $value = trim($values[$fieldname]);
+                } else {
+                    $value = $values[$fieldname];
+                }
             } else {
                 $value = "";
             }
@@ -592,7 +596,7 @@ public function check(array $values, Login $login): bool
 
         // missing required fields?
         foreach ($this->required as $val) {
-            if (!isset($values[$val]) || isset($values[$val]) && trim($values[$val]) == '') {
+            if (!isset($values[$val]) || empty($values[$val])) {
                 $this->errors[] = str_replace(
                     '%field',
                     $val,
@@ -986,6 +990,9 @@ public function __get(string $name): mixed
     {
         $forbidden = array('defaults');
         $virtuals = array('vpref_email', 'vpref_email_newadh');
+        $types = [
+            'int' => ['pref_numrows']
+        ];
 
         if (!in_array($name, $forbidden) && isset($this->prefs[$name])) {
             if (
@@ -1000,7 +1007,7 @@ public function __get(string $name): mixed
                     $this->prefs[$name] = self::$defaults['pref_adhesion_form'];
                 }
                 $value = $this->prefs[$name];
-                if (TYPE_DB === \Galette\Core\Db::PGSQL) {
+                if (TYPE_DB === Db::PGSQL) {
                     if ($value === 'f') {
                         $value = false;
                     }
@@ -1011,6 +1018,10 @@ public function __get(string $name): mixed
                     $value = $values[0]; //take first as default
                 }
 
+                if (in_array($name, $types['int'])) {
+                    $value = (int)$value;
+                }
+
                 return $value;
             }
         } elseif (in_array($name, $virtuals)) {