Merge pull request #424 from JoomShaper/dev

Fixed: Default value behavior in settings checkbox fields now functioning as expected

Author: siddik-web

gulpfile.js

@@ -14,9 +14,9 @@ const config = {
     srcPath: path.resolve(__dirname),
     buildPath: path.resolve(__dirname, './package/'),
     qsPath: path.resolve(__dirname, './package/helix_ultimate_quickstart/'),
-    qsPackageName: 'helixultimate_quickstart_j4_2.1.1.zip',
-    packageName: 'helixultimate_template_v2.1.1.zip',
-    pluginPackageName: 'plg_system_helixultimate_v2.1.1.zip',
+    qsPackageName: 'helixultimate_quickstart_j5_2.1.2.zip',
+    packageName: 'helixultimate_template_v2.1.2.zip',
+    pluginPackageName: 'plg_system_helixultimate_v2.1.2.zip',
     templateFileExtensions: 'xml, json, php, png, scss, js, ico, svg, jpg, eot, ttf, woff, woff2, otf, css, html',
     pluginFileExtensions: function () {
         return this.templateFileExtensions + ', ini';

plugins/system/helixultimate/composer.lock

@@ -6,11 +6,11 @@
   <name>System - Helix Ultimate Framework</name>
   <author>JoomShaper.com</author>
   <creationDate>Feb 2018</creationDate>
-  <copyright>Copyright (C) 2010 - 2023 JoomShaper. All rights reserved.</copyright>
+  <copyright>Copyright (C) 2010 - 2025 JoomShaper. All rights reserved.</copyright>
   <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
   <authorEmail>[email protected]</authorEmail>
   <authorUrl>www.joomshaper.com</authorUrl>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <description>Helix Ultimate Framework - Joomla Template Framework by JoomShaper</description>
 
   <updateservers>

plugins/system/helixultimate/helixultimate.xml

@@ -11,12 +11,14 @@
 use HelixUltimate\Framework\Platform\Helper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
 extract($displayData);
 
 // Get some system objects.
 $document = Factory::getDocument();
+$lang     = Factory::getApplication()->getLanguage();
 
 $inputvalue = '';
 
@@ -54,6 +56,36 @@
 $localesPath = $localesPath ?? '';
 $helperPath = $helperPath ?? '';
 
+// Add language strings
+$strings = [
+    // Days
+    'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY',
+    // Short days
+    'SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT',
+    // Months
+    'JANUARY', 'FEBRUARY', 'MARCH', 'APRIL', 'MAY', 'JUNE', 'JULY', 'AUGUST', 'SEPTEMBER', 'OCTOBER', 'NOVEMBER', 'DECEMBER',
+    // Short months
+    'JANUARY_SHORT', 'FEBRUARY_SHORT', 'MARCH_SHORT', 'APRIL_SHORT', 'MAY_SHORT', 'JUNE_SHORT',
+    'JULY_SHORT', 'AUGUST_SHORT', 'SEPTEMBER_SHORT', 'OCTOBER_SHORT', 'NOVEMBER_SHORT', 'DECEMBER_SHORT',
+    // Buttons
+    'JCLOSE', 'JCLEAR', 'JLIB_HTML_BEHAVIOR_TODAY',
+    // Miscellaneous
+    'JLIB_HTML_BEHAVIOR_WK',
+];
+
+foreach ($strings as $c) {
+    Text::script($c);
+}
+
+// These are new strings. Make sure they exist. Can be generalised at later time: eg in 4.1 version.
+if ($lang->hasKey('JLIB_HTML_BEHAVIOR_AM')) {
+    Text::script('JLIB_HTML_BEHAVIOR_AM');
+}
+
+if ($lang->hasKey('JLIB_HTML_BEHAVIOR_PM')) {
+    Text::script('JLIB_HTML_BEHAVIOR_PM');
+}
+
 if (JVERSION < 4)
 {
 	// The static assets for the calendar

plugins/system/helixultimate/overrides/layouts/joomla/form/field/calendar.php

@@ -171,6 +171,25 @@ protected function prepareSettingsFormData()
 		 */
 		$formXml = $this->form->getXml();
 
+		// In Joomla 5.2.4, a bug was introduced where checkbox fields with a default value of '0'
+		// behave incorrectly. As a workaround, we set any '0' default values to an empty string.
+		// @since 2.1.2 & joomla 5.2.4
+		if (!empty($formXml))
+		{
+			foreach ($formXml->fieldset as $fieldset)
+			{
+				foreach ($fieldset->field as $field)
+				{
+					$fieldType = (string) $field['type'];
+
+					if ($fieldType === 'checkbox' && strval($field['default'] ?? '') === '0')
+					{
+						$field['default'] = '';
+					}
+				}
+			}
+		}
+
 		if (!empty($formXml))
 		{
 			for ($i = 0; $i < $formXml->count(); ++$i)

plugins/system/helixultimate/src/Platform/Settings.php

@@ -64,6 +64,7 @@ protected function getInput()
 		$webfonts   = json_decode($json ?? "");
 		$items      = $webfonts->items;
 		$value      = json_decode($this->value ?? "");
+		$font 		= null;
 
 		if (isset($value->fontFamily))
 		{

plugins/system/helixultimate/src/fields/helixfont.php

@@ -8,9 +8,9 @@
     <author>JoomShaper.com</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>http://www.joomshaper.com</authorUrl>
-    <copyright>Copyright (C) 2010 - 2023 JoomShaper.com. All rights reserved.</copyright>
+    <copyright>Copyright (C) 2010 - 2025 JoomShaper.com. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <description>Helix Ultimate - Starter Template of Helix Ultimate Framework</description>
 
     <updateservers>