diff --git a/CHANGELOG.md b/CHANGELOG.md index 01c713fb9..8d6b683bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,20 @@ -# v3.2.5-alpha2 +# v3.2.5-alpha3 +- Fix Save failed issue in dynamicGet. #1148 +- Move all [TEXT, EDITOR, TEXTAREA] fields from [NOT NULL] to [NULL] +- Add the DateHelper class and improve the date methods. +- Add simple SessionHelper class. + +# v3.2.5-alpha + +- Add [AllowDynamicProperties] in the base view class for J5 +- Move the _prepareDocument above the display call in the base view class - Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run. - Added new import powers for custom import of spreadsheets. - Move the setDocument and _prepareDocument above the display in the site view and custom admin view. - Update the trashhelper layout to work in Joomla 5. - Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues. -# v3.2.5-alpha - -- Add [AllowDynamicProperties] in the base view class for J5 -- Move the _prepareDocument above the display call in the base view class - # v3.2.4 - Add [push] option to Powers area. diff --git a/README.md b/README.md index df404a3b0..243eb7230 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 7th October, 2024 -+ *Version*: 3.2.5-alpha2 ++ *Last Build*: 13th October, 2024 ++ *Version*: 3.2.5-alpha3 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **857064** ++ *Line count*: **859606** + *Field count*: **2098** -+ *File count*: **5808** ++ *File count*: **5826** + *Folder count*: **505** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index df404a3b0..243eb7230 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 7th October, 2024 -+ *Version*: 3.2.5-alpha2 ++ *Last Build*: 13th October, 2024 ++ *Version*: 3.2.5-alpha3 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **857064** ++ *Line count*: **859606** + *Field count*: **2098** -+ *File count*: **5808** ++ *File count*: **5826** + *Folder count*: **505** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 74aa35cd9..4627691ed 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -52,6 +52,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as CompilerFactory; use VDM\Joomla\Utilities\Base64Helper; use VDM\Joomla\FOF\Encrypt\AES; +use VDM\Joomla\Utilities\DateHelper; use VDM\Joomla\Utilities\String\ClassfunctionHelper; use VDM\Joomla\Utilities\String\FieldHelper as StringFieldHelper; use VDM\Joomla\Utilities\String\TypeHelper; @@ -2164,7 +2165,7 @@ public static function loadSession() { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // set the defaults self::setSessionDefaults(); @@ -2177,7 +2178,7 @@ public static function set($key, $value) { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // set to local memory to speed up program self::$localSession[$key] = $value; @@ -2192,7 +2193,7 @@ public static function get($key, $default = null) { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // check if in local memory if (!isset(self::$localSession[$key])) @@ -5228,193 +5229,245 @@ public static function setSubformTable($head, $rows, $idName) /** - * Change to nice fancy date + * Convert a date to a human-readable fancy format (e.g., "1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDate($date, $checkStamp); */ - public static function fancyDate($date, $check_stamp = true) + public static function fancyDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('jS \o\f F Y',$date); + return DateHelper::fancyDate($date, $checkStamp); } /** - * get date based in period past + * Get a formatted date based on the time period (dynamic format based on age of the date). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDynamicDate($date, $checkStamp); */ - public static function fancyDynamicDate($date, $check_stamp = true) + public static function fancyDynamicDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - // older then year - $lastyear = date("Y", strtotime("-1 year")); - $tragetyear = date("Y", $date); - if ($tragetyear <= $lastyear) - { - return date('m/d/y', $date); - } - // same day - $yesterday = strtotime("-1 day"); - if ($date > $yesterday) - { - return date('g:i A', $date); - } - // just month day - return date('M j', $date); + return DateHelper::fancyDynamicDate($date, $checkStamp); } /** - * Change to nice fancy day time and date + * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted day, time, and date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDayTimeDate($date, $checkStamp); */ - public static function fancyDayTimeDate($time, $check_stamp = true) + public static function fancyDayTimeDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('D ga jS \o\f F Y',$time); + return DateHelper::fancyDayTimeDate($date, $checkStamp); } /** - * Change to nice fancy time and date + * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time and date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDateTime($date, $checkStamp); */ - public static function fancyDateTime($time, $check_stamp = true) + public static function fancyDateTime($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('(G:i) jS \o\f F Y',$time); + return DateHelper::fancyDateTime($date, $checkStamp); } /** - * Change to nice hour:minutes time + * Convert a time to a human-readable format (e.g., "12:00"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyTime($date, $checkStamp); */ - public static function fancyTime($time, $check_stamp = true) + public static function fancyTime($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('G:i',$time); + return DateHelper::fancyTime($date, $checkStamp); } /** - * set the date day as Sunday through Saturday + * Convert a date to the day name (e.g., "Sunday"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day name. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDayName($date, $checkStamp); */ - public static function setDayName($date, $check_stamp = true) + public static function setDayName($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('l', $date); + return DateHelper::setDayName($date, $checkStamp); } /** - * set the date month as January through December + * Convert a date to the month name (e.g., "January"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Month name. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setMonthName($date, $checkStamp); */ - public static function setMonthName($date, $check_stamp = true) + public static function setMonthName($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('F', $date); + return DateHelper::setMonthName($date, $checkStamp); } /** - * set the date day as 1st + * Convert a date to the day with suffix (e.g., "1st"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day with suffix. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDay($date, $checkStamp); */ - public static function setDay($date, $check_stamp = true) + public static function setDay($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('jS', $date); + return DateHelper::setDay($date, $checkStamp); } /** - * set the date month as 5 + * Convert a date to the numeric month (e.g., "5"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Numeric month. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setMonth($date, $checkStamp); */ - public static function setMonth($date, $check_stamp = true) + public static function setMonth($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('n', $date); + return DateHelper::setMonth($date, $checkStamp); } /** - * set the date year as 2004 (for charts) + * Convert a date to the full year (e.g., "2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Full year. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYear($date, $checkStamp); */ - public static function setYear($date, $check_stamp = true) + public static function setYear($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y', $date); + return DateHelper::setYear($date, $checkStamp); } /** - * set the date as 2004/05 (for charts) + * Convert a date to a year/month format (e.g., "2024/05"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYearMonth($date, $spacer, $checkStamp); */ - public static function setYearMonth($date, $spacer = '/', $check_stamp = true) + public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y' . $spacer . 'm', $date); + return DateHelper::setYearMonth($date, $spacer, $checkStamp); } /** - * set the date as 2004/05/03 (for charts) + * Convert a date to a year/month/day format (e.g., "2024/05/03"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month/Day format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYearMonthDay($date, $spacer, $checkStamp); */ - public static function setYearMonthDay($date, $spacer = '/', $check_stamp = true) + public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y' . $spacer . 'm' . $spacer . 'd', $date); + return DateHelper::setYearMonthDay($date, $spacer, $checkStamp); } /** - * set the date as 03/05/2004 + * Convert a date to a day/month/year format (e.g., "03/05/2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day/Month/Year format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDayMonthYear($date, $spacer, $checkStamp); */ - public static function setDayMonthYear($date, $spacer = '/', $check_stamp = true) + public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('d' . $spacer . 'm' . $spacer . 'Y', $date); + return DateHelper::setDayMonthYear($date, $spacer, $checkStamp); + } + + /** + * Convert a date string to a valid timestamp. + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return int The valid timestamp. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::getValidTimestamp($date, $checkStamp); + */ + public static function getValidTimestamp($date, bool $checkStamp): int + { + return DateHelper::getValidTimestamp($date, $checkStamp); } /** - * Check if string is a valid time stamp + * Check if the input is a valid Unix timestamp. + * + * @param mixed $timestamp The timestamp to validate. + * + * @return bool True if valid timestamp, false otherwise. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::isValidTimeStamp($timestamp); */ - public static function isValidTimeStamp($timestamp) + public static function isValidTimeStamp($timestamp): bool { - return ((int) $timestamp === $timestamp) - && ($timestamp <= PHP_INT_MAX) - && ($timestamp >= ~PHP_INT_MAX); + return DateHelper::isValidTimeStamp($timestamp); } /** - * Check if string is a valid date - * https://www.php.net/manual/en/function.checkdate.php#113205 + * Check if a string is a valid date according to the specified format. + * + * @param string $date The date string to validate. + * @param string $format The format to check against (default is 'Y-m-d H:i:s'). + * + * @return bool True if valid date, false otherwise. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::isValidateDate($date, $format); */ - public static function isValidateDate($date, $format = 'Y-m-d H:i:s') + public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool { - $d = DateTime::createFromFormat($format, $date); - return $d && $d->format($format) == $date; + return DateHelper::isValidateDate($date, $format); } /** diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index c8b1f3530..5655c0c01 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4126,9 +4126,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION="The end hash target COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT="autogenerated md5 hash" COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL="End Hash Target" COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_MESSAGE="Error! Please add some text here." -COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The start hash target to help insert the code at the correct place, if the line position change. This hash is the md5 of a few lines above the custom code" +COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The end hash target to help insert the code until the correct place, if the line position change. This hash is the md5 of a few lines below the custom code" COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT="autogenerated md5 hash" -COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="Start Hash Target" +COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="End Hash Target" COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE="Error! Please add some text here." COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION="Hash (automation)" COM_COMPONENTBUILDER_CUSTOM_CODE_HTML="HTML" diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php index 690362934..eb22992fe 100644 --- a/admin/models/admin_fields_relations.php +++ b/admin/models/admin_fields_relations.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -114,7 +115,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('admin_fields_relations__'.$id)) + if (($vdm = SessionHelper::get('admin_fields_relations__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -122,17 +123,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id); - ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id); + SessionHelper::set('admin_fields_relations__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -187,7 +188,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('admin_fields_relations__'.$id)) + if (($vdm = SessionHelper::get('admin_fields_relations__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -195,17 +196,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id); - ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id); + SessionHelper::set('admin_fields_relations__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 5003d9b16..3e54c5179 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -263,7 +264,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('admin_view__'.$id)) + if (($vdm = SessionHelper::get('admin_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -271,17 +272,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id); - ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'admin_view__'.$id); + SessionHelper::set('admin_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -612,7 +613,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('admin_view__'.$id)) + if (($vdm = SessionHelper::get('admin_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -620,17 +621,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id); - ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'admin_view__'.$id); + SessionHelper::set('admin_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } // update the fields @@ -1016,7 +1017,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/ajax.php b/admin/models/ajax.php index e683c7cb6..b0b7f1db6 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -28,6 +28,7 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; use VDM\Joomla\Utilities\GetHelper; use VDM\Joomla\Utilities\GuidHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\Base64Helper; use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper; use Joomla\CMS\Uri\Uri; @@ -1595,7 +1596,7 @@ protected function linkedGuid($guid, $setGuid): bool * @var array * @since 3.0.13 */ - protected $viewid = []; + protected array $viewid = []; /** * Get the view details via the session @@ -1615,7 +1616,7 @@ protected function getViewID($call = 'table') if ($vdm) { // set view and id - if ($view = ComponentbuilderHelper::get($vdm)) + if (($view = SessionHelper::get($vdm)) !== null) { $current = (array) explode('__', $view); if (StringHelper::check($current[0]) && isset($current[1]) && is_numeric($current[1])) @@ -1628,7 +1629,7 @@ protected function getViewID($call = 'table') } } // set GUID if found - if (($guid = ComponentbuilderHelper::get($vdm . '__guid')) !== false) + if (($guid = SessionHelper::get($vdm . '__guid')) !== null) { if (GuidHelper::valid($guid)) { @@ -1636,7 +1637,7 @@ protected function getViewID($call = 'table') } } // set return if found - if (($return = ComponentbuilderHelper::get($vdm . '__return')) !== false) + if (($return = SessionHelper::get($vdm . '__return')) !== null) { if (StringHelper::check($return)) { diff --git a/admin/models/class_extends.php b/admin/models/class_extends.php index 5d71980ff..5f3378e8d 100644 --- a/admin/models/class_extends.php +++ b/admin/models/class_extends.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -118,7 +119,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_extends__'.$id)) + if (($vdm = SessionHelper::get('class_extends__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -126,17 +127,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id); - ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_extends__'.$id); + SessionHelper::set('class_extends__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -195,7 +196,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_extends__'.$id)) + if (($vdm = SessionHelper::get('class_extends__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -203,17 +204,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id); - ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_extends__'.$id); + SessionHelper::set('class_extends__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/class_method.php b/admin/models/class_method.php index 94873d00f..aa5b861fa 100644 --- a/admin/models/class_method.php +++ b/admin/models/class_method.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -122,7 +123,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_method__'.$id)) + if (($vdm = SessionHelper::get('class_method__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -130,17 +131,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id); - ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_method__'.$id); + SessionHelper::set('class_method__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -205,7 +206,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_method__'.$id)) + if (($vdm = SessionHelper::get('class_method__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -213,17 +214,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id); - ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_method__'.$id); + SessionHelper::set('class_method__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -554,7 +555,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/class_property.php b/admin/models/class_property.php index adc402f07..2a62da943 100644 --- a/admin/models/class_property.php +++ b/admin/models/class_property.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -119,7 +120,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_property__'.$id)) + if (($vdm = SessionHelper::get('class_property__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -127,17 +128,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id); - ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_property__'.$id); + SessionHelper::set('class_property__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -196,7 +197,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('class_property__'.$id)) + if (($vdm = SessionHelper::get('class_property__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -204,17 +205,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id); - ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'class_property__'.$id); + SessionHelper::set('class_property__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -545,7 +546,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php index d18a12351..009e55938 100644 --- a/admin/models/component_dashboard.php +++ b/admin/models/component_dashboard.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -122,7 +123,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id)) + if (($vdm = SessionHelper::get('component_dashboard__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -130,17 +131,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id); - ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'component_dashboard__'.$id); + SessionHelper::set('component_dashboard__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -201,7 +202,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id)) + if (($vdm = SessionHelper::get('component_dashboard__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -209,17 +210,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id); - ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'component_dashboard__'.$id); + SessionHelper::set('component_dashboard__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } // update the fields diff --git a/admin/models/component_router.php b/admin/models/component_router.php index 873e90b9e..1b26d1ef6 100644 --- a/admin/models/component_router.php +++ b/admin/models/component_router.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -123,7 +124,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('component_router__'.$id)) + if (($vdm = SessionHelper::get('component_router__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -131,17 +132,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'component_router__'.$id); - ComponentbuilderHelper::set('component_router__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'component_router__'.$id); + SessionHelper::set('component_router__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -214,7 +215,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('component_router__'.$id)) + if (($vdm = SessionHelper::get('component_router__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -222,17 +223,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'component_router__'.$id); - ComponentbuilderHelper::set('component_router__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'component_router__'.$id); + SessionHelper::set('component_router__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 026ec2d2c..7cbb3a869 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -180,7 +181,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id)) + if (($vdm = SessionHelper::get('custom_admin_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -188,17 +189,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id); - ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'custom_admin_view__'.$id); + SessionHelper::set('custom_admin_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -349,7 +350,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id)) + if (($vdm = SessionHelper::get('custom_admin_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -357,17 +358,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id); - ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'custom_admin_view__'.$id); + SessionHelper::set('custom_admin_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index 2c166fd10..acd4d599a 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -134,7 +135,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('custom_code__'.$id)) + if (($vdm = SessionHelper::get('custom_code__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -142,17 +143,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id); - ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'custom_code__'.$id); + SessionHelper::set('custom_code__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -205,7 +206,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('custom_code__'.$id)) + if (($vdm = SessionHelper::get('custom_code__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -213,17 +214,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id); - ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'custom_code__'.$id); + SessionHelper::set('custom_code__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -547,7 +548,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 2f98e999d..cf4e52e0f 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -174,7 +175,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id)) + if (($vdm = SessionHelper::get('dynamic_get__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -182,17 +183,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id); - ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'dynamic_get__'.$id); + SessionHelper::set('dynamic_get__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -349,7 +350,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id)) + if (($vdm = SessionHelper::get('dynamic_get__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -357,17 +358,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id); - ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'dynamic_get__'.$id); + SessionHelper::set('dynamic_get__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } @@ -738,7 +739,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/field.php b/admin/models/field.php index 5ca3e1068..80c65f942 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -167,7 +168,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('field__'.$id)) + if (($vdm = SessionHelper::get('field__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -175,17 +176,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id); - ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'field__'.$id); + SessionHelper::set('field__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -286,7 +287,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('field__'.$id)) + if (($vdm = SessionHelper::get('field__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -294,17 +295,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id); - ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'field__'.$id); + SessionHelper::set('field__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -633,7 +634,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 8b59c067b..c22511b08 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -141,7 +142,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('fieldtype__'.$id)) + if (($vdm = SessionHelper::get('fieldtype__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -149,17 +150,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id); - ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'fieldtype__'.$id); + SessionHelper::set('fieldtype__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -214,7 +215,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('fieldtype__'.$id)) + if (($vdm = SessionHelper::get('fieldtype__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -222,17 +223,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id); - ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'fieldtype__'.$id); + SessionHelper::set('fieldtype__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } // check what type of properties array we have here (should be subform... but just incase) @@ -813,7 +814,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml index 6b5918279..23f32a035 100644 --- a/admin/models/forms/component_admin_views.xml +++ b/admin/models/forms/component_admin_views.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_config.xml b/admin/models/forms/component_config.xml index ddff1a830..775b661d4 100644 --- a/admin/models/forms/component_config.xml +++ b/admin/models/forms/component_config.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_custom_admin_menus.xml b/admin/models/forms/component_custom_admin_menus.xml index 99333d5dd..585e94652 100644 --- a/admin/models/forms/component_custom_admin_menus.xml +++ b/admin/models/forms/component_custom_admin_menus.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_custom_admin_views.xml b/admin/models/forms/component_custom_admin_views.xml index 038364a6c..284fbdac5 100644 --- a/admin/models/forms/component_custom_admin_views.xml +++ b/admin/models/forms/component_custom_admin_views.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_dashboard.xml b/admin/models/forms/component_dashboard.xml index ff51c4435..a2d60bd2c 100644 --- a/admin/models/forms/component_dashboard.xml +++ b/admin/models/forms/component_dashboard.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" @@ -171,7 +170,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL" rows="20" cols="30" - default="" class="text_area tab_html" filter="raw" hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT" diff --git a/admin/models/forms/component_files_folders.xml b/admin/models/forms/component_files_folders.xml index e760cc7a4..b2a3facd7 100644 --- a/admin/models/forms/component_files_folders.xml +++ b/admin/models/forms/component_files_folders.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_modules.xml b/admin/models/forms/component_modules.xml index 0f2508281..fa16c1bfc 100644 --- a/admin/models/forms/component_modules.xml +++ b/admin/models/forms/component_modules.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_mysql_tweaks.xml b/admin/models/forms/component_mysql_tweaks.xml index 7c99c3bb8..e2188b867 100644 --- a/admin/models/forms/component_mysql_tweaks.xml +++ b/admin/models/forms/component_mysql_tweaks.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" @@ -184,7 +183,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_LABEL" rows="20" cols="40" - default="" description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_DESCRIPTION" class="text_area ids_selection" filter="raw" diff --git a/admin/models/forms/component_placeholders.xml b/admin/models/forms/component_placeholders.xml index b1bc62968..d49a04a8b 100644 --- a/admin/models/forms/component_placeholders.xml +++ b/admin/models/forms/component_placeholders.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_plugins.xml b/admin/models/forms/component_plugins.xml index 03d3d43bb..91664e40c 100644 --- a/admin/models/forms/component_plugins.xml +++ b/admin/models/forms/component_plugins.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_router.xml b/admin/models/forms/component_router.xml index 7507fa7a6..93acb3790 100644 --- a/admin/models/forms/component_router.xml +++ b/admin/models/forms/component_router.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_site_views.xml b/admin/models/forms/component_site_views.xml index 2737e3b21..7de8832f4 100644 --- a/admin/models/forms/component_site_views.xml +++ b/admin/models/forms/component_site_views.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" diff --git a/admin/models/forms/component_updates.xml b/admin/models/forms/component_updates.xml index c751c0c64..a7099f57c 100644 --- a/admin/models/forms/component_updates.xml +++ b/admin/models/forms/component_updates.xml @@ -101,7 +101,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION" class="list_class" - layout="joomla.form.field.list-fancy-select" multiple="false" required="true" readonly="true" @@ -156,7 +155,6 @@ label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_LABEL" rows="30" cols="15" - default="" description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_DESCRIPTION" class="text_area mysql_update" filter="raw" diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml index 959cdac4c..f377c9201 100644 --- a/admin/models/forms/fieldtype.xml +++ b/admin/models/forms/fieldtype.xml @@ -329,7 +329,6 @@ label="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL" rows="2" cols="15" - default="" description="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_DESCRIPTION" message="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE" class="text_area span12" diff --git a/admin/models/forms/joomla_module_updates.xml b/admin/models/forms/joomla_module_updates.xml index a665d89af..b7bea260f 100644 --- a/admin/models/forms/joomla_module_updates.xml +++ b/admin/models/forms/joomla_module_updates.xml @@ -140,7 +140,6 @@ label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_MYSQL_LABEL" rows="30" cols="15" - default="" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_MYSQL_DESCRIPTION" class="text_area mysql_update" filter="raw" diff --git a/admin/models/forms/joomla_plugin_updates.xml b/admin/models/forms/joomla_plugin_updates.xml index 43a146bea..5d87fc072 100644 --- a/admin/models/forms/joomla_plugin_updates.xml +++ b/admin/models/forms/joomla_plugin_updates.xml @@ -140,7 +140,6 @@ label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_LABEL" rows="30" cols="15" - default="" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_DESCRIPTION" class="text_area mysql_update" filter="raw" diff --git a/admin/models/forms/server.xml b/admin/models/forms/server.xml index 4d742c6a2..cacab4f67 100644 --- a/admin/models/forms/server.xml +++ b/admin/models/forms/server.xml @@ -163,7 +163,6 @@ label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL" rows="15" cols="5" - default="" description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION" class="input-xxlarge span12" hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT" diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 01c88dca9..aca28507f 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -433,7 +433,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index b9686e5f8..1d25ab91f 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -298,7 +299,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_component__'.$id)) + if (($vdm = SessionHelper::get('joomla_component__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -306,17 +307,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id); - ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_component__'.$id); + SessionHelper::set('joomla_component__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -528,7 +529,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_component__'.$id)) + if (($vdm = SessionHelper::get('joomla_component__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -536,17 +537,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id); - ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_component__'.$id); + SessionHelper::set('joomla_component__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } @@ -919,7 +920,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/joomla_module.php b/admin/models/joomla_module.php index 8a92aea54..5f1227ec7 100644 --- a/admin/models/joomla_module.php +++ b/admin/models/joomla_module.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -204,7 +205,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_module__'.$id)) + if (($vdm = SessionHelper::get('joomla_module__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -212,17 +213,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id); - ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_module__'.$id); + SessionHelper::set('joomla_module__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -377,7 +378,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_module__'.$id)) + if (($vdm = SessionHelper::get('joomla_module__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -385,17 +386,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id); - ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_module__'.$id); + SessionHelper::set('joomla_module__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/joomla_plugin.php b/admin/models/joomla_plugin.php index 03cc13dbc..c8f65d0aa 100644 --- a/admin/models/joomla_plugin.php +++ b/admin/models/joomla_plugin.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -181,7 +182,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_plugin__'.$id)) + if (($vdm = SessionHelper::get('joomla_plugin__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -189,17 +190,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id); - ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_plugin__'.$id); + SessionHelper::set('joomla_plugin__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -342,7 +343,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('joomla_plugin__'.$id)) + if (($vdm = SessionHelper::get('joomla_plugin__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -350,17 +351,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id); - ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'joomla_plugin__'.$id); + SessionHelper::set('joomla_plugin__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php index fbe6f3cdd..3fa3b5c67 100644 --- a/admin/models/language_translation.php +++ b/admin/models/language_translation.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -114,7 +115,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('language_translation__'.$id)) + if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -122,17 +123,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id); - ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'language_translation__'.$id); + SessionHelper::set('language_translation__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -193,7 +194,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('language_translation__'.$id)) + if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -201,17 +202,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id); - ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'language_translation__'.$id); + SessionHelper::set('language_translation__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/layout.php b/admin/models/layout.php index f892b7a99..0d927c22c 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -136,7 +137,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('layout__'.$id)) + if (($vdm = SessionHelper::get('layout__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -144,17 +145,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id); - ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'layout__'.$id); + SessionHelper::set('layout__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -221,7 +222,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('layout__'.$id)) + if (($vdm = SessionHelper::get('layout__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -229,17 +230,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id); - ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'layout__'.$id); + SessionHelper::set('layout__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/library.php b/admin/models/library.php index 44b4aa9c0..7e6f93f11 100644 --- a/admin/models/library.php +++ b/admin/models/library.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -152,7 +153,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('library__'.$id)) + if (($vdm = SessionHelper::get('library__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -160,17 +161,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id); - ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'library__'.$id); + SessionHelper::set('library__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -239,7 +240,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('library__'.$id)) + if (($vdm = SessionHelper::get('library__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -247,17 +248,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id); - ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'library__'.$id); + SessionHelper::set('library__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -569,7 +570,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php index 69ea74539..30c0b5e2a 100644 --- a/admin/models/placeholder.php +++ b/admin/models/placeholder.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -116,7 +117,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('placeholder__'.$id)) + if (($vdm = SessionHelper::get('placeholder__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -124,17 +125,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'placeholder__'.$id); - ComponentbuilderHelper::set('placeholder__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'placeholder__'.$id); + SessionHelper::set('placeholder__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -187,7 +188,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('placeholder__'.$id)) + if (($vdm = SessionHelper::get('placeholder__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -195,17 +196,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'placeholder__'.$id); - ComponentbuilderHelper::set('placeholder__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'placeholder__'.$id); + SessionHelper::set('placeholder__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/power.php b/admin/models/power.php index cb8847b30..82b056fca 100644 --- a/admin/models/power.php +++ b/admin/models/power.php @@ -25,6 +25,7 @@ use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; use VDM\Joomla\Componentbuilder\Power\Factory as PowerFactory; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -162,7 +163,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('power__'.$id)) + if (($vdm = SessionHelper::get('power__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -170,17 +171,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'power__'.$id); - ComponentbuilderHelper::set('power__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'power__'.$id); + SessionHelper::set('power__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -307,7 +308,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('power__'.$id)) + if (($vdm = SessionHelper::get('power__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -315,17 +316,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'power__'.$id); - ComponentbuilderHelper::set('power__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'power__'.$id); + SessionHelper::set('power__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/server.php b/admin/models/server.php index af43c4e41..0ef192565 100644 --- a/admin/models/server.php +++ b/admin/models/server.php @@ -490,7 +490,7 @@ public function validate($form, $data, $group = null) // change to false $form->setFieldAttribute($requiredField, 'required', 'false'); // also clear the data set - $data[$requiredField] = ''; + unset($data[$requiredField]); } } } diff --git a/admin/models/site_view.php b/admin/models/site_view.php index d44b22a9d..b8ba9cece 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -183,7 +184,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('site_view__'.$id)) + if (($vdm = SessionHelper::get('site_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -191,17 +192,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id); - ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'site_view__'.$id); + SessionHelper::set('site_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -352,7 +353,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('site_view__'.$id)) + if (($vdm = SessionHelper::get('site_view__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -360,17 +361,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id); - ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'site_view__'.$id); + SessionHelper::set('site_view__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } diff --git a/admin/models/template.php b/admin/models/template.php index 87cb42f15..047babc24 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -136,7 +137,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('template__'.$id)) + if (($vdm = SessionHelper::get('template__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -144,17 +145,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'template__'.$id); - ComponentbuilderHelper::set('template__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'template__'.$id); + SessionHelper::set('template__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -221,7 +222,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('template__'.$id)) + if (($vdm = SessionHelper::get('template__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -229,17 +230,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'template__'.$id); - ComponentbuilderHelper::set('template__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'template__'.$id); + SessionHelper::set('template__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php index b2ab94f0b..8043ec3c0 100644 --- a/admin/models/validation_rule.php +++ b/admin/models/validation_rule.php @@ -24,6 +24,7 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Helper\TagsHelper; +use VDM\Joomla\Utilities\SessionHelper; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GuidHelper; @@ -119,7 +120,7 @@ public function getVDM() $id = $_id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('validation_rule__'.$id)) + if (($vdm = SessionHelper::get('validation_rule__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -127,17 +128,17 @@ public function getVDM() { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'validation_rule__'.$id); - ComponentbuilderHelper::set('validation_rule__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'validation_rule__'.$id); + SessionHelper::set('validation_rule__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } @@ -190,7 +191,7 @@ public function getItem($pk = null) $id = $item->id; } // set the id and view name to session - if ($vdm = ComponentbuilderHelper::get('validation_rule__'.$id)) + if (($vdm = SessionHelper::get('validation_rule__'.$id)) !== null) { $this->vastDevMod = $vdm; } @@ -198,17 +199,17 @@ public function getItem($pk = null) { // set the vast development method key $this->vastDevMod = UtilitiesStringHelper::random(50); - ComponentbuilderHelper::set($this->vastDevMod, 'validation_rule__'.$id); - ComponentbuilderHelper::set('validation_rule__'.$id, $this->vastDevMod); + SessionHelper::set($this->vastDevMod, 'validation_rule__'.$id); + SessionHelper::set('validation_rule__'.$id, $this->vastDevMod); // set a return value if found $jinput = Factory::getApplication()->input; $return = $jinput->get('return', null, 'base64'); - ComponentbuilderHelper::set($this->vastDevMod . '__return', $return); + SessionHelper::set($this->vastDevMod . '__return', $return); // set a GUID value if found if (isset($item) && ObjectHelper::check($item) && isset($item->guid) && GuidHelper::valid($item->guid)) { - ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid); + SessionHelper::set($this->vastDevMod . '__guid', $item->guid); } } } diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 18e5316b9..ea2de56fb 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -27,69 +27,69 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `add_sql` TINYINT(1) NOT NULL DEFAULT 0, `add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0, `add_update_server` TINYINT(1) NOT NULL DEFAULT 0, - `addcontributors` TEXT NOT NULL, + `addcontributors` TEXT NULL, `addfootable` TINYINT(1) NOT NULL DEFAULT 0, `addreadme` TINYINT(1) NOT NULL DEFAULT 0, `adduikit` TINYINT(1) NOT NULL DEFAULT 0, `assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3, - `author` VARCHAR(255) NOT NULL DEFAULT '', - `backup_folder_path` VARCHAR(255) NOT NULL DEFAULT '', + `author` VARCHAR(255) NULL DEFAULT '', + `backup_folder_path` VARCHAR(255) NULL DEFAULT '', `bom` CHAR(64) NOT NULL DEFAULT '', `buildcomp` TINYINT(1) NOT NULL DEFAULT 0, - `buildcompsql` MEDIUMTEXT NOT NULL, - `companyname` CHAR(64) NOT NULL DEFAULT '', - `component_version` CHAR(64) NOT NULL DEFAULT '', - `copyright` VARCHAR(255) NOT NULL DEFAULT '', + `buildcompsql` MEDIUMTEXT NULL, + `companyname` CHAR(64) NULL DEFAULT '', + `component_version` CHAR(64) NULL DEFAULT '', + `copyright` VARCHAR(255) NULL DEFAULT '', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `creatuserhelper` TINYINT(1) NOT NULL DEFAULT 0, - `crowdin_account_api_key` TEXT NOT NULL, - `crowdin_project_api_key` TEXT NOT NULL, - `crowdin_project_identifier` VARCHAR(255) NOT NULL DEFAULT '', - `crowdin_username` TEXT NOT NULL, - `css_admin` TEXT NOT NULL, - `css_site` TEXT NOT NULL, + `crowdin_account_api_key` TEXT NULL, + `crowdin_project_api_key` TEXT NULL, + `crowdin_project_identifier` VARCHAR(255) NULL DEFAULT '', + `crowdin_username` TEXT NULL, + `css_admin` TEXT NULL, + `css_site` TEXT NULL, `dashboard` VARCHAR(64) NOT NULL DEFAULT '', `dashboard_type` TINYINT(1) NOT NULL DEFAULT 1, `debug_linenr` TINYINT(1) NOT NULL DEFAULT 0, `description` TEXT NULL, - `email` VARCHAR(255) NOT NULL DEFAULT '', + `email` VARCHAR(255) NULL DEFAULT '', `emptycontributors` TINYINT(1) NOT NULL DEFAULT 0, `export_buy_link` VARCHAR(255) NOT NULL DEFAULT '', - `export_key` TEXT NOT NULL, - `git_folder_path` VARCHAR(255) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `export_key` TEXT NULL, + `git_folder_path` VARCHAR(255) NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `image` VARCHAR(255) NOT NULL DEFAULT '', - `javascript` TEXT NOT NULL, - `jcb_powers_path` VARCHAR(255) NOT NULL DEFAULT '', + `javascript` TEXT NULL, + `jcb_powers_path` VARCHAR(255) NULL DEFAULT '', `joomla_source_link` VARCHAR(255) NOT NULL DEFAULT '', - `license` VARCHAR(255) NOT NULL DEFAULT '', - `menu_prefix` VARCHAR(100) NOT NULL DEFAULT '', + `license` VARCHAR(255) NULL DEFAULT '', + `menu_prefix` VARCHAR(100) NULL DEFAULT '', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `mvc_versiondate` TINYINT(1) NOT NULL DEFAULT 0, - `name` CHAR(64) NOT NULL DEFAULT '', - `name_code` VARCHAR(255) NOT NULL DEFAULT '', - `namespace_prefix` VARCHAR(255) NOT NULL DEFAULT '', + `name` CHAR(64) NULL DEFAULT '', + `name_code` VARCHAR(255) NULL DEFAULT '', + `namespace_prefix` VARCHAR(255) NULL DEFAULT '', `number` INT(11) NOT NULL DEFAULT 0, - `php_admin_event` MEDIUMTEXT NOT NULL, - `php_helper_admin` MEDIUMTEXT NOT NULL, - `php_helper_both` MEDIUMTEXT NOT NULL, - `php_helper_site` MEDIUMTEXT NOT NULL, - `php_method_install` MEDIUMTEXT NOT NULL, - `php_method_uninstall` MEDIUMTEXT NOT NULL, - `php_postflight_install` MEDIUMTEXT NOT NULL, - `php_postflight_update` MEDIUMTEXT NOT NULL, - `php_preflight_install` MEDIUMTEXT NOT NULL, - `php_preflight_update` MEDIUMTEXT NOT NULL, - `php_site_event` MEDIUMTEXT NOT NULL, + `php_admin_event` MEDIUMTEXT NULL, + `php_helper_admin` MEDIUMTEXT NULL, + `php_helper_both` MEDIUMTEXT NULL, + `php_helper_site` MEDIUMTEXT NULL, + `php_method_install` MEDIUMTEXT NULL, + `php_method_uninstall` MEDIUMTEXT NULL, + `php_postflight_install` MEDIUMTEXT NULL, + `php_postflight_update` MEDIUMTEXT NULL, + `php_preflight_install` MEDIUMTEXT NULL, + `php_preflight_update` MEDIUMTEXT NULL, + `php_site_event` MEDIUMTEXT NULL, `preferred_joomla_version` INT(11) NOT NULL DEFAULT 3, - `readme` TEXT NOT NULL, + `readme` TEXT NULL, `remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 1, `sales_server` INT(11) NOT NULL DEFAULT 0, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', - `sql` MEDIUMTEXT NOT NULL, - `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', - `toignore` TEXT NOT NULL, + `short_description` VARCHAR(255) NULL DEFAULT '', + `sql` MEDIUMTEXT NULL, + `sql_uninstall` MEDIUMTEXT NULL, + `system_name` VARCHAR(255) NULL DEFAULT '', + `toignore` TEXT NULL, `translation_tool` TINYINT(1) NOT NULL DEFAULT 0, `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, @@ -175,30 +175,30 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` ( `add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0, `add_update_server` TINYINT(1) NOT NULL DEFAULT 0, `addreadme` TINYINT(1) NOT NULL DEFAULT 0, - `class_helper_code` MEDIUMTEXT NOT NULL, - `class_helper_header` TEXT NOT NULL, - `custom_get` TEXT NOT NULL, - `default` MEDIUMTEXT NOT NULL, + `class_helper_code` MEDIUMTEXT NULL, + `class_helper_header` TEXT NULL, + `custom_get` TEXT NULL, + `default` MEDIUMTEXT NULL, `description` TEXT NULL, `fields` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `libraries` TEXT NOT NULL, - `mod_code` TEXT NOT NULL, - `module_version` CHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_method_uninstall` MEDIUMTEXT NOT NULL, - `php_postflight_install` MEDIUMTEXT NOT NULL, - `php_postflight_update` MEDIUMTEXT NOT NULL, - `php_preflight_install` MEDIUMTEXT NOT NULL, - `php_preflight_uninstall` MEDIUMTEXT NOT NULL, - `php_preflight_update` MEDIUMTEXT NOT NULL, - `php_script_construct` MEDIUMTEXT NOT NULL, - `readme` TEXT NOT NULL, + `mod_code` TEXT NULL, + `module_version` CHAR(64) NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', + `php_method_uninstall` MEDIUMTEXT NULL, + `php_postflight_install` MEDIUMTEXT NULL, + `php_postflight_update` MEDIUMTEXT NULL, + `php_preflight_install` MEDIUMTEXT NULL, + `php_preflight_uninstall` MEDIUMTEXT NULL, + `php_preflight_update` MEDIUMTEXT NULL, + `php_script_construct` MEDIUMTEXT NULL, + `readme` TEXT NULL, `sales_server` INT(11) NOT NULL DEFAULT 0, `snippet` INT(11) NOT NULL DEFAULT 0, - `sql` MEDIUMTEXT NOT NULL, - `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `sql` MEDIUMTEXT NULL, + `sql_uninstall` MEDIUMTEXT NULL, + `system_name` VARCHAR(255) NULL DEFAULT '', `target` TINYINT(1) NOT NULL DEFAULT 0, `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, @@ -258,26 +258,26 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` ( `class_extends` INT(11) NOT NULL DEFAULT 0, `description` TEXT NULL, `fields` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `head` TEXT NULL, `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, - `main_class_code` MEDIUMTEXT NOT NULL, + `main_class_code` MEDIUMTEXT NULL, `method_selection` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_method_uninstall` MEDIUMTEXT NOT NULL, - `php_postflight_install` MEDIUMTEXT NOT NULL, - `php_postflight_update` MEDIUMTEXT NOT NULL, - `php_preflight_install` MEDIUMTEXT NOT NULL, - `php_preflight_uninstall` MEDIUMTEXT NOT NULL, - `php_preflight_update` MEDIUMTEXT NOT NULL, - `php_script_construct` MEDIUMTEXT NOT NULL, - `plugin_version` CHAR(64) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', + `php_method_uninstall` MEDIUMTEXT NULL, + `php_postflight_install` MEDIUMTEXT NULL, + `php_postflight_update` MEDIUMTEXT NULL, + `php_preflight_install` MEDIUMTEXT NULL, + `php_preflight_uninstall` MEDIUMTEXT NULL, + `php_preflight_update` MEDIUMTEXT NULL, + `php_script_construct` MEDIUMTEXT NULL, + `plugin_version` CHAR(64) NULL DEFAULT '', `property_selection` TEXT NOT NULL, - `readme` TEXT NOT NULL, + `readme` TEXT NULL, `sales_server` INT(11) NOT NULL DEFAULT 0, - `sql` MEDIUMTEXT NOT NULL, - `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `sql` MEDIUMTEXT NULL, + `sql_uninstall` MEDIUMTEXT NULL, + `system_name` VARCHAR(255) NULL DEFAULT '', `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, `update_server_url` VARCHAR(255) NOT NULL DEFAULT '', @@ -323,9 +323,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_power` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `description` TEXT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `settings` TEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -361,19 +361,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_power` ( `extends_custom` VARCHAR(64) NULL DEFAULT '', `extendsinterfaces` TEXT NULL, `extendsinterfaces_custom` TEXT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `head` TEXT NULL, `implements` TEXT NULL, - `implements_custom` VARCHAR(1024) NOT NULL DEFAULT '', + `implements_custom` VARCHAR(1024) NULL DEFAULT '', `licensing_template` TEXT NULL, `load_selection` TEXT NULL, - `main_class_code` MEDIUMTEXT NOT NULL, + `main_class_code` MEDIUMTEXT NULL, `method_selection` TEXT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `namespace` VARCHAR(255) NOT NULL DEFAULT '', - `power_version` CHAR(64) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', + `namespace` VARCHAR(255) NULL DEFAULT '', + `power_version` CHAR(64) NULL DEFAULT '', `property_selection` TEXT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NULL DEFAULT '', `type` VARCHAR(64) NOT NULL DEFAULT '', `use_selection` TEXT NULL, `params` TEXT NULL, @@ -438,66 +438,66 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `add_php_postsavehook` TINYINT(1) NOT NULL DEFAULT 0, `add_php_save` TINYINT(1) NOT NULL DEFAULT 0, `add_sql` TINYINT(1) NOT NULL DEFAULT 0, - `addlinked_views` TEXT NOT NULL, - `addpermissions` TEXT NOT NULL, - `addtables` TEXT NOT NULL, - `addtabs` TEXT NOT NULL, - `ajax_input` TEXT NOT NULL, + `addlinked_views` TEXT NULL, + `addpermissions` TEXT NULL, + `addtables` TEXT NULL, + `addtabs` TEXT NULL, + `ajax_input` TEXT NULL, `alias_builder` VARCHAR(255) NOT NULL DEFAULT '', `alias_builder_type` TINYINT(1) NOT NULL DEFAULT 0, - `css_view` TEXT NOT NULL, - `css_views` TEXT NOT NULL, - `custom_button` TEXT NOT NULL, + `css_view` TEXT NULL, + `css_views` TEXT NULL, + `custom_button` TEXT NULL, `description` TEXT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `html_import_view` MEDIUMTEXT NOT NULL, + `guid` VARCHAR(36) NULL DEFAULT '', + `html_import_view` MEDIUMTEXT NULL, `icon` VARCHAR(255) NOT NULL DEFAULT '', `icon_add` VARCHAR(255) NOT NULL DEFAULT '', `icon_category` VARCHAR(255) NOT NULL DEFAULT '', - `javascript_view_file` TEXT NOT NULL, - `javascript_view_footer` TEXT NOT NULL, - `javascript_views_file` TEXT NOT NULL, - `javascript_views_footer` TEXT NOT NULL, + `javascript_view_file` TEXT NULL, + `javascript_view_footer` TEXT NULL, + `javascript_views_file` TEXT NULL, + `javascript_views_footer` TEXT NULL, `mysql_table_charset` VARCHAR(64) NOT NULL DEFAULT 1, `mysql_table_collate` VARCHAR(64) NOT NULL DEFAULT 1, `mysql_table_engine` VARCHAR(64) NOT NULL DEFAULT 1, `mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0, - `name_list` CHAR(64) NOT NULL DEFAULT '', - `name_single` CHAR(64) NOT NULL DEFAULT '', - `php_after_cancel` MEDIUMTEXT NOT NULL, - `php_after_delete` MEDIUMTEXT NOT NULL, - `php_after_publish` MEDIUMTEXT NOT NULL, - `php_ajaxmethod` MEDIUMTEXT NOT NULL, - `php_allowadd` MEDIUMTEXT NOT NULL, - `php_allowedit` MEDIUMTEXT NOT NULL, - `php_batchcopy` MEDIUMTEXT NOT NULL, - `php_batchmove` MEDIUMTEXT NOT NULL, - `php_before_cancel` MEDIUMTEXT NOT NULL, - `php_before_delete` MEDIUMTEXT NOT NULL, - `php_before_publish` MEDIUMTEXT NOT NULL, - `php_before_save` MEDIUMTEXT NOT NULL, - `php_controller` MEDIUMTEXT NOT NULL, - `php_controller_list` MEDIUMTEXT NOT NULL, - `php_document` MEDIUMTEXT NOT NULL, - `php_getform` MEDIUMTEXT NOT NULL, - `php_getitem` MEDIUMTEXT NOT NULL, - `php_getitems` MEDIUMTEXT NOT NULL, - `php_getitems_after_all` MEDIUMTEXT NOT NULL, - `php_getlistquery` MEDIUMTEXT NOT NULL, - `php_import` MEDIUMTEXT NOT NULL, - `php_import_display` MEDIUMTEXT NOT NULL, - `php_import_ext` MEDIUMTEXT NOT NULL, - `php_import_headers` MEDIUMTEXT NOT NULL, - `php_import_save` MEDIUMTEXT NOT NULL, - `php_import_setdata` MEDIUMTEXT NOT NULL, - `php_model` MEDIUMTEXT NOT NULL, - `php_model_list` MEDIUMTEXT NOT NULL, - `php_postsavehook` MEDIUMTEXT NOT NULL, - `php_save` MEDIUMTEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `name_list` CHAR(64) NULL DEFAULT '', + `name_single` CHAR(64) NULL DEFAULT '', + `php_after_cancel` MEDIUMTEXT NULL, + `php_after_delete` MEDIUMTEXT NULL, + `php_after_publish` MEDIUMTEXT NULL, + `php_ajaxmethod` MEDIUMTEXT NULL, + `php_allowadd` MEDIUMTEXT NULL, + `php_allowedit` MEDIUMTEXT NULL, + `php_batchcopy` MEDIUMTEXT NULL, + `php_batchmove` MEDIUMTEXT NULL, + `php_before_cancel` MEDIUMTEXT NULL, + `php_before_delete` MEDIUMTEXT NULL, + `php_before_publish` MEDIUMTEXT NULL, + `php_before_save` MEDIUMTEXT NULL, + `php_controller` MEDIUMTEXT NULL, + `php_controller_list` MEDIUMTEXT NULL, + `php_document` MEDIUMTEXT NULL, + `php_getform` MEDIUMTEXT NULL, + `php_getitem` MEDIUMTEXT NULL, + `php_getitems` MEDIUMTEXT NULL, + `php_getitems_after_all` MEDIUMTEXT NULL, + `php_getlistquery` MEDIUMTEXT NULL, + `php_import` MEDIUMTEXT NULL, + `php_import_display` MEDIUMTEXT NULL, + `php_import_ext` MEDIUMTEXT NULL, + `php_import_headers` MEDIUMTEXT NULL, + `php_import_save` MEDIUMTEXT NULL, + `php_import_setdata` MEDIUMTEXT NULL, + `php_model` MEDIUMTEXT NULL, + `php_model_list` MEDIUMTEXT NULL, + `php_postsavehook` MEDIUMTEXT NULL, + `php_save` MEDIUMTEXT NULL, + `short_description` VARCHAR(255) NULL DEFAULT '', `source` TINYINT(1) NOT NULL DEFAULT 0, - `sql` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `sql` MEDIUMTEXT NULL, + `system_name` VARCHAR(255) NULL DEFAULT '', `type` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -572,32 +572,32 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `add_php_jview` TINYINT(1) NOT NULL DEFAULT 0, `add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0, `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `ajax_input` TEXT NOT NULL, - `codename` VARCHAR(255) NOT NULL DEFAULT '', - `context` VARCHAR(255) NOT NULL DEFAULT '', - `css` TEXT NOT NULL, - `css_document` TEXT NOT NULL, - `custom_button` TEXT NOT NULL, - `custom_get` TEXT NOT NULL, - `default` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', + `ajax_input` TEXT NULL, + `codename` VARCHAR(255) NULL DEFAULT '', + `context` VARCHAR(255) NULL DEFAULT '', + `css` TEXT NULL, + `css_document` TEXT NULL, + `custom_button` TEXT NULL, + `custom_get` TEXT NULL, + `default` MEDIUMTEXT NULL, + `description` VARCHAR(255) NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `icon` VARCHAR(255) NOT NULL DEFAULT '', - `javascript_file` TEXT NOT NULL, - `js_document` TEXT NOT NULL, + `javascript_file` TEXT NULL, + `js_document` TEXT NULL, `libraries` TEXT NOT NULL, `main_get` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_ajaxmethod` MEDIUMTEXT NOT NULL, - `php_controller` MEDIUMTEXT NOT NULL, - `php_document` MEDIUMTEXT NOT NULL, - `php_jview` MEDIUMTEXT NOT NULL, - `php_jview_display` MEDIUMTEXT NOT NULL, - `php_model` MEDIUMTEXT NOT NULL, - `php_view` MEDIUMTEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `php_ajaxmethod` MEDIUMTEXT NULL, + `php_controller` MEDIUMTEXT NULL, + `php_document` MEDIUMTEXT NULL, + `php_jview` MEDIUMTEXT NULL, + `php_jview_display` MEDIUMTEXT NULL, + `php_model` MEDIUMTEXT NULL, + `php_view` MEDIUMTEXT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -647,32 +647,32 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `add_php_jview` TINYINT(1) NOT NULL DEFAULT 0, `add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0, `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `ajax_input` TEXT NOT NULL, + `ajax_input` TEXT NULL, `button_position` TINYINT(1) NOT NULL DEFAULT 1, - `codename` VARCHAR(255) NOT NULL DEFAULT '', - `context` VARCHAR(255) NOT NULL DEFAULT '', - `css` TEXT NOT NULL, - `css_document` TEXT NOT NULL, - `custom_button` TEXT NOT NULL, - `custom_get` TEXT NOT NULL, - `default` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', + `codename` VARCHAR(255) NULL DEFAULT '', + `context` VARCHAR(255) NULL DEFAULT '', + `css` TEXT NULL, + `css_document` TEXT NULL, + `custom_button` TEXT NULL, + `custom_get` TEXT NULL, + `default` MEDIUMTEXT NULL, + `description` VARCHAR(255) NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `javascript_file` TEXT NOT NULL, - `js_document` TEXT NOT NULL, + `guid` VARCHAR(36) NULL DEFAULT '', + `javascript_file` TEXT NULL, + `js_document` TEXT NULL, `libraries` TEXT NOT NULL, `main_get` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_ajaxmethod` MEDIUMTEXT NOT NULL, - `php_controller` MEDIUMTEXT NOT NULL, - `php_document` MEDIUMTEXT NOT NULL, - `php_jview` MEDIUMTEXT NOT NULL, - `php_jview_display` MEDIUMTEXT NOT NULL, - `php_model` MEDIUMTEXT NOT NULL, - `php_view` MEDIUMTEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `php_ajaxmethod` MEDIUMTEXT NULL, + `php_controller` MEDIUMTEXT NULL, + `php_document` MEDIUMTEXT NULL, + `php_jview` MEDIUMTEXT NULL, + `php_jview_display` MEDIUMTEXT NULL, + `php_model` MEDIUMTEXT NULL, + `php_view` MEDIUMTEXT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -714,14 +714,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `alias` VARCHAR(255) NOT NULL DEFAULT '', - `description` VARCHAR(255) NOT NULL DEFAULT '', + `alias` VARCHAR(255) NULL DEFAULT '', + `description` VARCHAR(255) NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_view` MEDIUMTEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `php_view` MEDIUMTEXT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, - `template` TEXT NOT NULL, + `template` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -750,13 +750,13 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `alias` VARCHAR(255) NOT NULL DEFAULT '', - `description` VARCHAR(255) NOT NULL DEFAULT '', + `alias` VARCHAR(255) NULL DEFAULT '', + `description` VARCHAR(255) NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, - `layout` TEXT NOT NULL, + `layout` TEXT NULL, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_view` MEDIUMTEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `php_view` MEDIUMTEXT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -792,33 +792,33 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( `add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0, `add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0, `addcalculation` TINYINT(1) NOT NULL DEFAULT 0, - `db_selection` TEXT NOT NULL, + `db_selection` TEXT NULL, `db_table_main` VARCHAR(255) NOT NULL DEFAULT '', - `filter` TEXT NOT NULL, - `getcustom` VARCHAR(255) NOT NULL DEFAULT '', + `filter` TEXT NULL, + `getcustom` VARCHAR(255) NULL DEFAULT '', `gettype` TINYINT(1) NOT NULL DEFAULT 0, - `global` TEXT NOT NULL, + `global` TEXT NULL, `group` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `join_db_table` TEXT NOT NULL, - `join_view_table` TEXT NOT NULL, + `guid` VARCHAR(36) NULL DEFAULT '', + `join_db_table` TEXT NULL, + `join_view_table` TEXT NULL, `main_source` TINYINT(1) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `order` TEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `order` TEXT NULL, `pagination` TINYINT(1) NOT NULL DEFAULT 1, - `php_after_getitem` MEDIUMTEXT NOT NULL, - `php_after_getitems` MEDIUMTEXT NOT NULL, - `php_before_getitem` MEDIUMTEXT NOT NULL, - `php_before_getitems` MEDIUMTEXT NOT NULL, - `php_calculation` MEDIUMTEXT NOT NULL, - `php_custom_get` MEDIUMTEXT NOT NULL, - `php_getlistquery` MEDIUMTEXT NOT NULL, - `php_router_parse` MEDIUMTEXT NOT NULL, + `php_after_getitem` MEDIUMTEXT NULL, + `php_after_getitems` MEDIUMTEXT NULL, + `php_before_getitem` MEDIUMTEXT NULL, + `php_before_getitems` MEDIUMTEXT NULL, + `php_calculation` MEDIUMTEXT NULL, + `php_custom_get` MEDIUMTEXT NULL, + `php_getlistquery` MEDIUMTEXT NULL, + `php_router_parse` MEDIUMTEXT NULL, `plugin_events` VARCHAR(255) NOT NULL DEFAULT '', `select_all` TINYINT(1) NOT NULL DEFAULT 0, - `view_selection` TEXT NOT NULL, + `view_selection` TEXT NULL, `view_table_main` INT(11) NOT NULL DEFAULT 0, - `where` TEXT NOT NULL, + `where` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -855,18 +855,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `code` MEDIUMTEXT NOT NULL, + `code` MEDIUMTEXT NULL, `comment_type` TINYINT(1) NOT NULL DEFAULT 1, `component` INT(11) NOT NULL DEFAULT 0, - `from_line` VARCHAR(100) NOT NULL DEFAULT '', - `function_name` VARCHAR(255) NOT NULL DEFAULT '', - `hashendtarget` VARCHAR(64) NOT NULL DEFAULT '', - `hashtarget` VARCHAR(64) NOT NULL DEFAULT '', + `from_line` VARCHAR(100) NULL DEFAULT '', + `function_name` VARCHAR(255) NULL DEFAULT '', + `hashendtarget` VARCHAR(64) NULL DEFAULT '', + `hashtarget` VARCHAR(64) NULL DEFAULT '', `joomla_version` INT(11) NOT NULL DEFAULT 3, - `path` TEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `path` TEXT NULL, + `system_name` VARCHAR(255) NULL DEFAULT '', `target` TINYINT(1) NOT NULL DEFAULT 0, - `to_line` VARCHAR(100) NOT NULL DEFAULT '', + `to_line` VARCHAR(100) NULL DEFAULT '', `type` TINYINT(1) NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -897,12 +897,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `comment` TEXT NOT NULL, - `default` TEXT NOT NULL, + `comment` TEXT NULL, + `default` TEXT NULL, `extension_type` VARCHAR(64) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `visibility` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -931,13 +931,13 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `arguments` TEXT NOT NULL, - `code` MEDIUMTEXT NOT NULL, - `comment` TEXT NOT NULL, + `arguments` TEXT NULL, + `code` MEDIUMTEXT NULL, + `comment` TEXT NULL, `extension_type` VARCHAR(64) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `visibility` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -966,8 +966,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_placeholder` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `target` VARCHAR(255) NOT NULL DEFAULT '', - `value` TEXT NOT NULL, + `target` VARCHAR(255) NULL DEFAULT '', + `value` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -993,12 +993,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `addconditions` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `description` VARCHAR(255) NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `how` TINYINT(1) NOT NULL DEFAULT 1, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php_setdocument` MEDIUMTEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `php_setdocument` MEDIUMTEXT NULL, `target` TINYINT(1) NOT NULL DEFAULT 1, `type` TINYINT(1) NOT NULL DEFAULT 0, `params` TEXT NULL, @@ -1027,19 +1027,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `contributor_company` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_email` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_name` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_website` VARCHAR(255) NOT NULL DEFAULT '', + `contributor_company` VARCHAR(255) NULL DEFAULT '', + `contributor_email` VARCHAR(255) NULL DEFAULT '', + `contributor_name` VARCHAR(255) NULL DEFAULT '', + `contributor_website` VARCHAR(255) NULL DEFAULT '', `description` TEXT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `heading` VARCHAR(255) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', + `heading` VARCHAR(255) NULL DEFAULT '', `library` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `snippet` TEXT NOT NULL, + `name` VARCHAR(255) NULL DEFAULT '', + `snippet` TEXT NULL, `type` INT(11) NOT NULL DEFAULT 0, `url` VARCHAR(255) NOT NULL DEFAULT '', - `usage` TEXT NOT NULL, + `usage` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1068,9 +1068,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_validation_rule` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `inherit` CHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', - `php` MEDIUMTEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', + `php` MEDIUMTEXT NULL, + `short_description` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1100,26 +1100,26 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( `add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0, `add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0, `catid` INT(11) NOT NULL DEFAULT 0, - `css_view` TEXT NOT NULL, - `css_views` TEXT NOT NULL, + `css_view` TEXT NULL, + `css_views` TEXT NULL, `datadefault` CHAR(64) NOT NULL DEFAULT '', - `datadefault_other` CHAR(64) NOT NULL DEFAULT '', + `datadefault_other` CHAR(64) NULL DEFAULT '', `datalenght` CHAR(64) NOT NULL DEFAULT '', - `datalenght_other` CHAR(64) NOT NULL DEFAULT '', + `datalenght_other` CHAR(64) NULL DEFAULT '', `datatype` CHAR(64) NOT NULL DEFAULT '', `fieldtype` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `indexes` CHAR(64) NOT NULL DEFAULT '', - `initiator_on_get_model` TEXT NOT NULL, - `initiator_on_save_model` TEXT NOT NULL, - `javascript_view_footer` TEXT NOT NULL, - `javascript_views_footer` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `initiator_on_get_model` TEXT NULL, + `initiator_on_save_model` TEXT NULL, + `javascript_view_footer` TEXT NULL, + `javascript_views_footer` TEXT NULL, + `name` VARCHAR(255) NULL DEFAULT '', `null_switch` CHAR(64) NOT NULL DEFAULT '', - `on_get_model_field` TEXT NOT NULL, - `on_save_model_field` TEXT NOT NULL, + `on_get_model_field` TEXT NULL, + `on_save_model_field` TEXT NULL, `store` INT(11) NOT NULL DEFAULT 0, - `xml` TEXT NOT NULL, + `xml` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1160,18 +1160,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `catid` INT(11) NOT NULL DEFAULT 0, `datadefault` CHAR(64) NOT NULL DEFAULT '', - `datadefault_other` CHAR(64) NOT NULL DEFAULT '', + `datadefault_other` CHAR(64) NULL DEFAULT '', `datalenght` CHAR(64) NOT NULL DEFAULT '', - `datalenght_other` CHAR(64) NOT NULL DEFAULT '', + `datalenght_other` CHAR(64) NULL DEFAULT '', `datatype` CHAR(64) NOT NULL DEFAULT '', `description` TEXT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', `has_defaults` TINYINT(1) NOT NULL DEFAULT 0, `indexes` CHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `null_switch` CHAR(64) NOT NULL DEFAULT '', - `properties` TEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `properties` TEXT NULL, + `short_description` VARCHAR(255) NULL DEFAULT '', `store` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1210,7 +1210,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( `components` TEXT NULL, `modules` TEXT NULL, `plugins` TEXT NULL, - `source` MEDIUMTEXT NOT NULL, + `source` MEDIUMTEXT NULL, `translation` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1235,8 +1235,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_language` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `langtag` VARCHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `langtag` VARCHAR(64) NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1262,17 +1262,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `authentication` TINYINT(1) NOT NULL DEFAULT 0, - `host` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `host` TEXT NULL, + `name` VARCHAR(255) NULL DEFAULT '', `password` TEXT NOT NULL, - `path` TEXT NOT NULL, - `port` TEXT NOT NULL, - `private` TEXT NOT NULL, - `private_key` TEXT NOT NULL, + `path` TEXT NULL, + `port` TEXT NULL, + `private` TEXT NULL, + `private_key` TEXT NULL, `protocol` TINYINT(1) NOT NULL DEFAULT 0, `secret` TEXT NOT NULL, - `signature` TEXT NOT NULL, - `username` TEXT NOT NULL, + `signature` TEXT NULL, + `username` TEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1301,11 +1301,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_repository` ( `access_repo` TINYINT(1) NULL DEFAULT 0, `addplaceholders` TEXT NULL, `base` VARCHAR(255) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `organisation` VARCHAR(255) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NULL DEFAULT '', + `organisation` VARCHAR(255) NULL DEFAULT '', `read_branch` VARCHAR(255) NULL DEFAULT '', - `repository` VARCHAR(255) NOT NULL DEFAULT '', - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `repository` VARCHAR(255) NULL DEFAULT '', + `system_name` VARCHAR(255) NULL DEFAULT '', `target` TINYINT(7) NOT NULL DEFAULT 1, `token` VARCHAR(255) NULL DEFAULT '', `type` TINYINT(1) NOT NULL DEFAULT 1, @@ -1346,14 +1346,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `admin_view` CHAR(255) NOT NULL DEFAULT '', - `alias` CHAR(64) NOT NULL DEFAULT '', + `alias` CHAR(64) NULL DEFAULT '', `article` TINYINT(1) NOT NULL DEFAULT 0, - `content` TEXT NOT NULL, - `groups` TEXT NOT NULL, + `content` TEXT NULL, + `groups` TEXT NULL, `location` TINYINT(1) NOT NULL DEFAULT 0, `site_view` CHAR(255) NOT NULL DEFAULT '', `target` TINYINT(1) NOT NULL DEFAULT 0, - `title` CHAR(64) NOT NULL DEFAULT '', + `title` CHAR(64) NULL DEFAULT '', `type` TINYINT(1) NOT NULL DEFAULT 0, `url` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NULL, @@ -1487,7 +1487,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_custom_tabs` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addadmin_views` TEXT NOT NULL, + `addadmin_views` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1513,7 +1513,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addsite_views` TEXT NOT NULL, + `addsite_views` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1539,7 +1539,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_views` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addcustom_admin_views` TEXT NOT NULL, + `addcustom_admin_views` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1617,7 +1617,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_mysql_tweaks` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addcustommenus` TEXT NOT NULL, + `addcustommenus` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1643,11 +1643,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_router` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `constructor_after_parent_code` MEDIUMTEXT NOT NULL, - `constructor_before_parent_code` MEDIUMTEXT NOT NULL, + `constructor_after_parent_code` MEDIUMTEXT NULL, + `constructor_before_parent_code` MEDIUMTEXT NULL, `constructor_before_parent_manual` TEXT NOT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, - `methods_code` MEDIUMTEXT NOT NULL, + `methods_code` MEDIUMTEXT NULL, `mode_constructor_after_parent` TINYINT(1) NOT NULL DEFAULT 0, `mode_constructor_before_parent` TINYINT(1) NOT NULL DEFAULT 0, `mode_methods` TINYINT(1) NOT NULL DEFAULT 0, @@ -1675,7 +1675,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_router` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addconfig` TEXT NOT NULL, + `addconfig` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1701,9 +1701,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `dashboard_tab` TEXT NOT NULL, + `dashboard_tab` TEXT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, - `php_dashboard_methods` MEDIUMTEXT NOT NULL, + `php_dashboard_methods` MEDIUMTEXT NULL, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1728,9 +1728,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_files_folders` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addfiles` TEXT NOT NULL, + `addfiles` TEXT NULL, `addfilesfullpath` TEXT NOT NULL, - `addfolders` TEXT NOT NULL, + `addfolders` TEXT NULL, `addfoldersfullpath` TEXT NOT NULL, `joomla_component` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, @@ -1835,8 +1835,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_modules` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `description` VARCHAR(255) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `description` VARCHAR(255) NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1861,7 +1861,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addconfig` TEXT NOT NULL, + `addconfig` TEXT NULL, `library` INT(11) NOT NULL DEFAULT 0, `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, @@ -1887,9 +1887,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addfiles` TEXT NOT NULL, + `addfiles` TEXT NULL, `addfilesfullpath` TEXT NOT NULL, - `addfolders` TEXT NOT NULL, + `addfolders` TEXT NULL, `addfoldersfullpath` TEXT NOT NULL, `addurls` TEXT NOT NULL, `library` INT(11) NOT NULL DEFAULT 0, @@ -1917,10 +1917,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_extends` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `comment` TEXT NOT NULL, + `comment` TEXT NULL, `extension_type` VARCHAR(64) NOT NULL DEFAULT '', `head` TEXT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -1971,9 +1971,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_updates` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_files_folders_urls` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addfiles` TEXT NOT NULL, + `addfiles` TEXT NULL, `addfilesfullpath` TEXT NOT NULL, - `addfolders` TEXT NOT NULL, + `addfolders` TEXT NULL, `addfoldersfullpath` TEXT NOT NULL, `addurls` TEXT NOT NULL, `joomla_module` INT(11) NOT NULL DEFAULT 0, @@ -2002,7 +2002,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `class_extends` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, `published` TINYINT(3) NULL DEFAULT 1, `created_by` INT(10) unsigned NULL DEFAULT 0, @@ -2054,9 +2054,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addfiles` TEXT NOT NULL, + `addfiles` TEXT NULL, `addfilesfullpath` TEXT NOT NULL, - `addfolders` TEXT NOT NULL, + `addfolders` TEXT NULL, `addfoldersfullpath` TEXT NOT NULL, `addurls` TEXT NOT NULL, `joomla_plugin` INT(11) NOT NULL DEFAULT 0, @@ -2142,7 +2142,7 @@ INSERT INTO `#__componentbuilder_dynamic_get` (`id`, `add_php_after_getitem`, `a -- INSERT INTO `#__componentbuilder_custom_code` (`id`, `code`, `component`, `comment_type`, `from_line`, `function_name`, `hashtarget`, `hashendtarget`, `path`, `system_name`, `target`, `to_line`, `type`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES -(5, 'CS8qKg0KCSAqIENoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2pTIFxvXGYgRiBZJywkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogZ2V0IGRhdGUgYmFzZWQgaW4gcGVyaW9kIHBhc3QNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RHluYW1pY0RhdGUoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCS8vIG9sZGVyIHRoZW4geWVhcg0KCQkkbGFzdHllYXIgPSBkYXRlKCJZIiwgc3RydG90aW1lKCItMSB5ZWFyIikpOw0KCQkkdHJhZ2V0eWVhciA9IGRhdGUoIlkiLCAkZGF0ZSk7DQoJCWlmICgkdHJhZ2V0eWVhciA8PSAkbGFzdHllYXIpDQoJCXsNCgkJCXJldHVybiBkYXRlKCdtL2QveScsICRkYXRlKTsNCgkJfQ0KCQkvLyBzYW1lIGRheQ0KCQkkeWVzdGVyZGF5ID0gc3RydG90aW1lKCItMSBkYXkiKTsNCgkJaWYgKCRkYXRlID4gJHllc3RlcmRheSkNCgkJew0KCQkJcmV0dXJuIGRhdGUoJ2c6aSBBJywgJGRhdGUpOw0KCQl9DQoJCS8vIGp1c3QgbW9udGggZGF5DQoJCXJldHVybiBkYXRlKCdNIGonLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgZmFuY3kgZGF5IHRpbWUgYW5kIGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF5VGltZURhdGUoJHRpbWUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdEIGdhIGpTIFxvXGYgRiBZJywkdGltZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgZmFuY3kgdGltZSBhbmQgZGF0ZQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gZmFuY3lEYXRlVGltZSgkdGltZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJyhHOmkpIGpTIFxvXGYgRiBZJywkdGltZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgaG91cjptaW51dGVzIHRpbWUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5VGltZSgkdGltZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBkYXkgYXMgU3VuZGF5IHRocm91Z2ggU2F0dXJkYXkNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheU5hbWUoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdsJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBtb250aCBhcyBKYW51YXJ5IHRocm91Z2ggRGVjZW1iZXINCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldE1vbnRoTmFtZSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0YnLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGRheSBhcyAxc3QNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2pTJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBtb250aCBhcyA1DQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBzZXRNb250aCgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ24nLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIHllYXIgYXMgMjAwNCAoZm9yIGNoYXJ0cykNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldFllYXIoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdZJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBhcyAyMDA0LzA1IChmb3IgY2hhcnRzKQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gc2V0WWVhck1vbnRoKCRkYXRlLCAkc3BhY2VyID0gJy8nLCAkY2hlY2tfc3RhbXAgPSB0cnVlKQ0KCXsNCgkJaWYgKCRjaGVja19zdGFtcCAmJiAhc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnWScgLiAkc3BhY2VyIC4gJ20nLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGFzIDIwMDQvMDUvMDMgKGZvciBjaGFydHMpDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBzZXRZZWFyTW9udGhEYXkoJGRhdGUsICRzcGFjZXIgPSAnLycsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdZJyAuICRzcGFjZXIgLiAnbScgLiAkc3BhY2VyIC4gJ2QnLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGFzIDAzLzA1LzIwMDQNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheU1vbnRoWWVhcigkZGF0ZSwgJHNwYWNlciA9ICcvJywgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2QnIC4gJHNwYWNlciAuICdtJyAuICRzcGFjZXIgLiAnWScsICRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKiBDaGVjayBpZiBzdHJpbmcgaXMgYSB2YWxpZCB0aW1lIHN0YW1wDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBpc1ZhbGlkVGltZVN0YW1wKCR0aW1lc3RhbXApDQoJew0KCQlyZXR1cm4gKChpbnQpICR0aW1lc3RhbXAgPT09ICR0aW1lc3RhbXApDQoJCSYmICgkdGltZXN0YW1wIDw9IFBIUF9JTlRfTUFYKQ0KCQkmJiAoJHRpbWVzdGFtcCA+PSB+UEhQX0lOVF9NQVgpOw0KCX0NCg0KCS8qKg0KCSAqIENoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIGRhdGUNCgkgKiBodHRwczovL3d3dy5waHAubmV0L21hbnVhbC9lbi9mdW5jdGlvbi5jaGVja2RhdGUucGhwIzExMzIwNQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gaXNWYWxpZGF0ZURhdGUoJGRhdGUsICRmb3JtYXQgPSAnWS1tLWQgSDppOnMnKQ0KCXsNCgkJJGQgPSBEYXRlVGltZTo6Y3JlYXRlRnJvbUZvcm1hdCgkZm9ybWF0LCAkZGF0ZSk7DQoJCXJldHVybiAkZCAmJiAkZC0+Zm9ybWF0KCRmb3JtYXQpID09ICRkYXRlOw0KCX0=', '', 1, '', 'niceFancyDate', '', '', '', 'helper::fancyDate($date)', 2, '', '', '', 1, '2017-02-11 02:02:46', '2024-09-16 00:16:48', 18, '', 3), +(5, '	/**
	 * Convert a date to a human-readable fancy format (e.g., "1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDate($date, $checkStamp);
	 */
	public static function fancyDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDate($date, $checkStamp);
	}

	/**
	 * Get a formatted date based on the time period (dynamic format based on age of the date).
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDynamicDate($date, $checkStamp);
	 */
	public static function fancyDynamicDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDynamicDate($date, $checkStamp);
	}

	/**
	 * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted day, time, and date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDayTimeDate($date, $checkStamp);
	 */
	public static function fancyDayTimeDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDayTimeDate($date, $checkStamp);
	}

	/**
	 * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted time and date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDateTime($date, $checkStamp);
	 */
	public static function fancyDateTime($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDateTime($date, $checkStamp);
	}

	/**
	 * Convert a time to a human-readable format (e.g., "12:00").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted time.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyTime($date, $checkStamp);
	 */
	public static function fancyTime($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyTime($date, $checkStamp);
	}

	/**
	 * Convert a date to the day name (e.g., "Sunday").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day name.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayName($date, $checkStamp);
	 */
	public static function setDayName($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayName($date, $checkStamp);
	}

	/**
	 * Convert a date to the month name (e.g., "January").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Month name.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonthName($date, $checkStamp);
	 */
	public static function setMonthName($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonthName($date, $checkStamp);
	}

	/**
	 * Convert a date to the day with suffix (e.g., "1st").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day with suffix.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDay($date, $checkStamp);
	 */
	public static function setDay($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDay($date, $checkStamp);
	}

	/**
	 * Convert a date to the numeric month (e.g., "5").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Numeric month.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonth($date, $checkStamp);
	 */
	public static function setMonth($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonth($date, $checkStamp);
	}

	/**
	 * Convert a date to the full year (e.g., "2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Full year.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYear($date, $checkStamp);
	 */
	public static function setYear($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYear($date, $checkStamp);
	}

	/**
	 * Convert a date to a year/month format (e.g., "2024/05").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Year/Month format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonth($date, $spacer, $checkStamp);
	 */
	public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonth($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date to a year/month/day format (e.g., "2024/05/03").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Year/Month/Day format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonthDay($date, $spacer, $checkStamp);
	 */
	public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonthDay($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date to a day/month/year format (e.g., "03/05/2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day/Month/Year format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayMonthYear($date, $spacer, $checkStamp);
	 */
	public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayMonthYear($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date string to a valid timestamp.
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return int The valid timestamp.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::getValidTimestamp($date, $checkStamp);
	 */
	public static function getValidTimestamp($date, bool $checkStamp): int
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::getValidTimestamp($date, $checkStamp);
	}

	/**
	 * Check if the input is a valid Unix timestamp.
	 *
	 * @param mixed $timestamp The timestamp to validate.
	 *
	 * @return bool True if valid timestamp, false otherwise.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidTimeStamp($timestamp);
	 */
	public static function isValidTimeStamp($timestamp): bool
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidTimeStamp($timestamp);
	}

	/**
	 * Check if a string is a valid date according to the specified format.
	 *
	 * @param string $date The date string to validate.
	 * @param string $format The format to check against (default is 'Y-m-d H:i:s').
	 *
	 * @return bool True if valid date, false otherwise.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidateDate($date, $format);
	 */
	public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidateDate($date, $format);
	}', '', 1, '', 'niceFancyDate', '', '', '', 'helper::fancyDate($date)', 2, '', '', '', 1, '2017-02-11 02:02:46', '2024-10-10 22:21:19', 19, '', 3), (338, 'IyMgQ29udHJpYnV0b3JzDQpUaGlzIHByb2plY3QgZXhpc3RzIHRoYW5rcyB0byBhbGwgdGhlIHBlb3BsZSB3aG8gY29udHJpYnV0ZSB0byB0aGUgW0pvb21sYSBDb21wb25lbnQgQnVpbGRlciBQcm9qZWN0XShodHRwczovL2dpdGh1Yi5jb20vdmRtLWlvL0pvb21sYS1Db21wb25lbnQtQnVpbGRlcikuDQoNClshW0NvbnRyaWJ1dG9yc10oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL2NvbnRyaWJ1dG9ycy5zdmc/d2lkdGg9ODkwJmJ1dHRvbj1mYWxzZSldKGh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL2dyYXBocy9jb250cmlidXRvcnMpDQoNCiMjIyBCYWNrZXJzDQpUaGFuayB5b3UgdG8gYWxsIG91ciBiYWNrZXJzISDwn5mPIFtbQmVjb21lIGEgYmFja2VyXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIjYmFja2VyKV0NCg0KWyFbT3VyIEJhY2tlcnMgb24gb3BlbmNvbGxlY3RpdmVdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9iYWNrZXJzLnN2Zz93aWR0aD04OTApXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIjYmFja2VycykNCg0KIyMjIFNwb25zb3JzDQpTdXBwb3J0IHRoaXMgcHJvamVjdCBieSBiZWNvbWluZyBhIHNwb25zb3IuIFlvdXIgbG9nbyB3aWxsIHNob3cgdXAgaGVyZSB3aXRoIGEgbGluayB0byB5b3VyIHdlYnNpdGUuIFtbQmVjb21lIGEgc3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyI3Nwb25zb3IpXQ0KDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8wL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8wL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8zL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8zL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci80L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci80L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci81L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci81L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci82L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci82L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci83L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci83L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci84L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci84L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci85L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci85L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMC9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTAvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzExL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMS93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTIvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzEyL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMy9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTMvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE0L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNC93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTUvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE1L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNi9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTYvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE3L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNy93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTgvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE4L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xOS9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTkvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzIwL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yMC93ZWJzaXRlKQ==', '', 1, '', 'readMEcontributors', '', '', '', 'README - Contributors 2 JCB', 2, '', '', '', 1, '2020-11-17 17:16:23', '2020-11-17 17:26:34', 3, '', 182), (400, 'CQkJLy8gR2V0IEFwcGxpY2F0aW9uIG9iamVjdA0KCQkJJHRoaXMtPmFwcCA/Pz0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoJCQkkdGhpcy0+YXBwLT5lbnF1ZXVlTWVzc2FnZSgnPGgzPlVubG9jayB0aGUgUG93ZXIgb2YgSm9vbWxhISBEZXZlbG9wbWVudDwvaDM+PHA+Q3VyaW91cyBhYm91dCBob3cgdGhpcyA8Yj5bW1thcmcwXV1dPC9iPiBjb21wb25lbnQgd2FzIGJ1aWx0PyBEaXNjb3ZlciB0aGUgcG93ZXJmdWwgSm9vbWxhISBDb21wb25lbnQgQnVpbGRlciAoPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+KSwgYSB0b29sIHRoYXQgc2ltcGxpZmllcyBhbmQgZW5oYW5jZXMgY29tcG9uZW50IGRldmVsb3BtZW50LiBKb2luIHVzIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0LnZkbS5kZXYvam9vbWxhIiB0YXJnZXQ9Il9ibGFuayIgdGl0bGU9Ikpvb21sYSEgQ29tcG9uZW50IEJ1aWxkZXIiPkdJVkVEPC9hPiB0byBleHBsb3JlIG1vcmUgYW5kIHNlZSBob3cgeW91IGNhbiBjcmVhdGUgeW91ciBvd24gY3VzdG9tIGNvbXBvbmVudHMuIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEgQ29tcG9uZW50IEJ1aWxkZXIiPkpvb21sYSEgRGV2ZWxvcG1lbnQ8L2E+IHN0YXJ0cyBoZXJlITwvcD4nLCAnSW5mbycpOw0K', '', 1, '', 'unlockThePowerOfJoomlaDevelopment', '', '', '', 'Unlock the Power of Joomla! Development', 2, '', '', '', 1, '2024-09-16 00:00:42', '2024-09-16 16:17:20', 5, '', 218); @@ -2520,8 +2520,8 @@ INSERT INTO `#__componentbuilder_validation_rule` (`id`, `inherit`, `name`, `php -- INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`, `add_javascript_view_footer`, `add_javascript_views_footer`, `css_view`, `css_views`, `datadefault`, `datadefault_other`, `datalenght`, `datalenght_other`, `datatype`, `indexes`, `javascript_view_footer`, `javascript_views_footer`, `name`, `null_switch`, `store`, `fieldtype`, `xml`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `guid`, `on_get_model_field`, `on_save_model_field`, `initiator_on_get_model`, `initiator_on_save_model`, `params`) VALUES -(23, '', '', '', '', '', '', '', '', 64, '', 'CHAR', 2, '', '', 'Alias', 'NOT NULL', '', 24, '\"\"', 1, '2015-04-09 13:46:04', '2023-06-27 23:46:54', 3, '', 216, '335866ce-b81b-4329-901d-c20254135c9c', '', '', '', '', ''), -(1989, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Greeting', 'NOT NULL', '', 24, '\"\"', 1, '2017-09-20 01:17:03', '2018-04-11 21:11:46', 1, '', 650, '75e830a6-a3a5-4327-9161-3f774a6f1591', '', '', '', '', ''); +(23, '', '', '', '', '', '', '', '', 64, '', 'CHAR', 2, '', '', 'Alias', 'NULL', '', 24, '\"\"', 1, '2015-04-09 13:46:04', '2024-10-10 22:13:47', 4, '', 216, '335866ce-b81b-4329-901d-c20254135c9c', '', '', '', '', ''), +(1989, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Greeting', 'NULL', '', 24, '\"\"', 1, '2017-09-20 01:17:03', '2024-10-10 22:39:30', 2, '', 650, '75e830a6-a3a5-4327-9161-3f774a6f1591', '', '', '', '', ''); -- -- Dumping data for table `#__componentbuilder_fieldtype` @@ -2535,7 +2535,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `description`, `name`, `prope (5, 'Provides a color picker. Enter the color as #ff00ff or pick it from the palet.', 'Color', '{\"properties0\":{\"name\":\"type\",\"example\":\"color\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be color.\"},\"properties1\":{\"name\":\"name\",\"example\":\"backgroundcolor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"default\",\"example\":\"#FFFFFF\",\"adjustable\":\"1\",\"description\":\"(optional) provides a color when not set.\"},\"properties3\":{\"name\":\"label\",\"example\":\"Background\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties4\":{\"name\":\"description\",\"example\":\"Select the background color here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) tooltip for the form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides a color picker when clicking the input box.', '', 1, 5, '', '', '7f60f198-53e7-4fe9-813f-d1b6c553680e'), (6, 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties12\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties13\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties14\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties15\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties16\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties17\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties18\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties25\":{\"name\":\"entity\",\"example\":\"fieldtype\",\"adjustable\":\"1\",\"description\":\"(optional) The area\\/entity this custom field is loaded. This value can be used in the field custom code.\"},\"properties19\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties20\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties21\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties22\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties23\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties24\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = Factory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = Factory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = [];\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\tif ($this->multiple === false)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', \'\', Text::_(\'Select an option\'));\\r\\n\\t\\t\\t}\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 31, '', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a'), (7, 'The a list of users that can be targeting one or more groups and excluded users that already belongs to an item in a view.', 'CustomUser', '{\"properties0\":{\"name\":\"type\",\"example\":\"staffusers\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type.\"},\"properties1\":{\"name\":\"name\",\"example\":\"staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties5\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties8\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties9\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties10\":{\"name\":\"hint\",\"example\":\"select a user\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties12\":{\"name\":\"extends\",\"example\":\"user\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties13\":{\"name\":\"table\",\"example\":\"#__users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. Must be #__users\"},\"properties14\":{\"name\":\"component\",\"example\":\"com_users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties15\":{\"name\":\"view\",\"example\":\"###view###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties16\":{\"name\":\"views\",\"example\":\"###views###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties17\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to.\"},\"properties18\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key.\"},\"properties19\":{\"name\":\"type_php_1\",\"example\":\"\\t\\t\\/\\/ set the groups array\\r\\n\\t\\treturn ComponentHelper::getParams(\'com_###component###\')->get(\'###type###\');\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties22\":{\"name\":\"type_phpx_1\",\"example\":\"\\t\\t\\/\\/ To ensure that there is only one record per user\\r\\n\\t\\t\\/\\/ Get a db connection.\\r\\n\\t\\t$db = Factory::getDbo();\\r\\n\\t\\t\\/\\/ Create a new query object.\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t\\/\\/ Select all records from the #__###component###_###view### table from ###CODE### column\\\".\\r\\n\\t\\t$query->select($db->quoteName(\'###CODE###\'));\\r\\n\\t\\t$query->from($db->quoteName(\'#__###component###_###view###\'));\\r\\n\\t\\t$db->setQuery($query);\\r\\n\\t\\t$db->execute();\\r\\n\\t\\t$found = $db->getNumRows();\\r\\n\\t\\tif ($found)\\r\\n\\t\\t{\\r\\n\\t\\t\\t\\/\\/ return all users already used\\r\\n\\t\\t\\treturn array_unique($db->loadColumn());\\r\\n\\t\\t}\\r\\n\\t\\treturn null;\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"}}', 'Provides list of users.', '', 1, 6, '', '', 'a4a39f70-070f-459c-be4b-0ac103a29b9a'), -(8, 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides an editor area field.', '', 1, 11, '', '', '51f288d2-6eaa-42bc-a182-a6f69b3032b8'), +(8, 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides an editor area field.', '', 1, 12, '', '', '51f288d2-6eaa-42bc-a182-a6f69b3032b8'), (9, 'The hidden form field type provides a hidden field for saving a field whose value cannot be altered directly by a user in the Administrator (it can be altered in code or by editing the params.ini file). If the parameter has a saved value this is entered i', 'Hidden', '{\"properties0\":{\"name\":\"type\",\"example\":\"hidden\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be hidden.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mysecretvariable\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the data which needs to be collected.\"},\"properties5\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties4\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"}}', 'provides a hidden field for saving a form field whose value cannot be altered directly by a user.', '', 1, 2, '', '', '82f1b5ca-bb9b-44d7-9a7a-9a03fb2a31dd'), (10, 'The integer form field type provides a select box with a range of integer values. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Integer', '{\"properties0\":{\"name\":\"type\",\"example\":\"integer\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be integer.\"},\"properties1\":{\"name\":\"name\",\"example\":\"size\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Size\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties6\":{\"name\":\"class\",\"example\":\"text_area\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties7\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties8\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"},\"properties9\":{\"name\":\"first\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) this value is the lowest on the list.\"},\"properties10\":{\"name\":\"last\",\"example\":\"20\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) this value is the highest on the list.\"},\"properties11\":{\"name\":\"step\",\"example\":\"5\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) each option will be the previous option incremented by this integer, starting with the first value until the last value is reached.\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties13\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'provides a drop down list of integers between a minimum and maximum.', '', 1, 6, '', '', 'fdbb50ea-35d2-45b2-a0bc-076fdf1544b8'), (11, 'The list form field type provides a drop down list or a list box of custom-defined entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'List', '{\"properties0\":{\"name\":\"type\",\"example\":\"list\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be list.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mylist\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an option\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) filter options\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field. This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"option\",\"example\":\"0|Option 1,1|Option 2,2|Option 1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties12\":{\"name\":\"useglobal\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) if set to true, it will show the value that is set in the global configuration if found in the database.\"},\"properties13\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) is the default list item value.\"},\"properties14\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties15\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'provides a drop down list of custom-defined entries.', '', 1, 12, '', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d'), diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index d2e492452..b14bf6042 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -166,8 +166,7 @@ get($_button['view'].'.create')): ?> - - + diff --git a/componentbuilder.xml b/componentbuilder.xml index 60e9990ba..0a9445606 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 7th October, 2024 + 13th October, 2024 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 3.2.5-alpha2 + 3.2.5-alpha3 Component Builder (v.3.2.5-alpha2) +

Component Builder (v.3.2.5-alpha3)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 4635988b8..4efa25ff8 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -205,7 +205,7 @@ 3.2.5-alpha https://dev.vdm.io - https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha2.zip + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha3.zip alpha @@ -220,10 +220,10 @@ pkg_component_builder package site - 3.2.5-alpha2 + 3.2.5-alpha3 https://dev.vdm.io - https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha2.zip + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha3.zip alpha diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php index e72812387..15b6340c4 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php @@ -17300,7 +17300,7 @@ public function setValidationFix($view, $Component) . "\$form->setFieldAttribute(\$requiredField, 'required', 'false');"; $fix .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__) . " also clear the data set"; - $fix .= PHP_EOL . Indent::_(5) . "\$data[\$requiredField] = '';"; + $fix .= PHP_EOL . Indent::_(5) . "unset(\$data[\$requiredField]);"; $fix .= PHP_EOL . Indent::_(4) . "}"; $fix .= PHP_EOL . Indent::_(3) . "}"; $fix .= PHP_EOL . Indent::_(2) . "}"; diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php index af809dc24..5519d4e4b 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php @@ -42,7 +42,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -59,7 +59,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -76,7 +76,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -93,7 +93,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -127,7 +127,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -144,7 +144,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -161,7 +161,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -178,7 +178,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -195,7 +195,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -263,7 +263,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -280,7 +280,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -331,7 +331,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -348,7 +348,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -365,7 +365,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -416,7 +416,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -484,7 +484,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -501,7 +501,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -518,7 +518,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -535,7 +535,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -552,7 +552,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -569,7 +569,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -586,7 +586,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -620,7 +620,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -654,7 +654,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -671,7 +671,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -756,7 +756,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -773,7 +773,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -807,7 +807,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -892,7 +892,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(100)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -960,7 +960,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1035,7 +1035,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1171,7 +1171,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1256,7 +1256,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1406,7 +1406,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1440,7 +1440,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1491,7 +1491,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1508,7 +1508,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1525,7 +1525,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1576,7 +1576,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1593,7 +1593,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -1644,7 +1644,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -1710,7 +1710,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -1846,7 +1846,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2003,7 +2003,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2044,7 +2044,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2068,7 +2068,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2085,7 +2085,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2102,7 +2102,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2119,7 +2119,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2153,7 +2153,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2187,7 +2187,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2204,7 +2204,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2221,7 +2221,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2238,7 +2238,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2255,7 +2255,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2289,7 +2289,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2340,7 +2340,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2374,7 +2374,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2425,7 +2425,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -2442,7 +2442,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -2475,7 +2475,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -2768,7 +2768,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2826,7 +2826,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2843,7 +2843,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2860,7 +2860,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2894,7 +2894,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2928,7 +2928,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2945,7 +2945,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2962,7 +2962,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -2996,7 +2996,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3013,7 +3013,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3064,7 +3064,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3115,7 +3115,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3132,7 +3132,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3149,7 +3149,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3182,7 +3182,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3216,7 +3216,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3266,7 +3266,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3283,7 +3283,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3317,7 +3317,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3494,7 +3494,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(1024)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3668,7 +3668,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3685,7 +3685,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3702,7 +3702,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3735,7 +3735,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3752,7 +3752,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -3769,7 +3769,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3786,7 +3786,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3803,7 +3803,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3820,7 +3820,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3837,7 +3837,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3854,7 +3854,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3888,7 +3888,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -3973,7 +3973,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4007,7 +4007,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4041,7 +4041,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4075,7 +4075,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4092,7 +4092,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4109,7 +4109,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4126,7 +4126,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4143,7 +4143,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4160,7 +4160,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4177,7 +4177,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4194,7 +4194,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4211,7 +4211,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4228,7 +4228,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4245,7 +4245,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4279,7 +4279,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4296,7 +4296,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4354,7 +4354,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4371,7 +4371,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4405,7 +4405,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4422,7 +4422,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -4490,7 +4490,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4558,7 +4558,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4626,7 +4626,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4694,7 +4694,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4762,7 +4762,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4830,7 +4830,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4898,7 +4898,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4932,7 +4932,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -4966,7 +4966,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5000,7 +5000,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5034,7 +5034,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5085,7 +5085,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5102,7 +5102,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5119,7 +5119,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5170,7 +5170,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5187,7 +5187,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5204,7 +5204,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5238,7 +5238,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5255,7 +5255,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5272,7 +5272,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -5322,7 +5322,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5339,7 +5339,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -5356,7 +5356,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5414,7 +5414,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5431,7 +5431,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5448,7 +5448,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5465,7 +5465,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5482,7 +5482,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -5499,7 +5499,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5574,7 +5574,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -5608,7 +5608,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5649,7 +5649,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5775,7 +5775,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5816,7 +5816,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5833,7 +5833,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5867,7 +5867,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5884,7 +5884,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5901,7 +5901,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5918,7 +5918,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5935,7 +5935,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -5952,7 +5952,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -5985,7 +5985,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6002,7 +6002,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6019,7 +6019,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6111,7 +6111,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6128,7 +6128,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6145,7 +6145,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6162,7 +6162,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6179,7 +6179,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6237,7 +6237,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6261,7 +6261,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6295,7 +6295,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6329,7 +6329,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6445,7 +6445,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6479,7 +6479,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6513,7 +6513,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6530,7 +6530,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6547,7 +6547,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6564,7 +6564,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6581,7 +6581,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6598,7 +6598,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6615,7 +6615,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6648,7 +6648,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6665,7 +6665,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6706,7 +6706,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6740,7 +6740,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6805,7 +6805,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6838,7 +6838,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -6855,7 +6855,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6920,7 +6920,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6954,7 +6954,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -6995,7 +6995,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7028,7 +7028,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7079,7 +7079,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7096,7 +7096,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7147,7 +7147,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7239,7 +7239,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7273,7 +7273,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7331,7 +7331,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7365,7 +7365,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7382,7 +7382,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7399,7 +7399,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7433,7 +7433,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7450,7 +7450,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7467,7 +7467,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7484,7 +7484,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7501,7 +7501,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7518,7 +7518,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7569,7 +7569,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7586,7 +7586,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7603,7 +7603,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7660,7 +7660,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7745,7 +7745,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7762,7 +7762,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7779,7 +7779,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7796,7 +7796,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7813,7 +7813,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(100)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7830,7 +7830,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(100)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7847,7 +7847,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7880,7 +7880,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7931,7 +7931,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -7948,7 +7948,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -7989,7 +7989,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8022,7 +8022,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8073,7 +8073,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8090,7 +8090,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8107,7 +8107,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8148,7 +8148,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8181,7 +8181,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8198,7 +8198,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8231,7 +8231,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8306,7 +8306,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8347,7 +8347,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8381,7 +8381,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8414,7 +8414,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8472,7 +8472,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8513,7 +8513,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8530,7 +8530,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8547,7 +8547,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8564,7 +8564,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8581,7 +8581,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8598,7 +8598,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8615,7 +8615,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8665,7 +8665,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8682,7 +8682,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8723,7 +8723,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8756,7 +8756,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -8882,7 +8882,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8899,7 +8899,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8916,7 +8916,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8933,7 +8933,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8967,7 +8967,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -8984,7 +8984,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9001,7 +9001,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9018,7 +9018,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9052,7 +9052,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9069,7 +9069,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9154,7 +9154,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9171,7 +9171,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9204,7 +9204,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9272,7 +9272,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9306,7 +9306,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9357,7 +9357,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9408,7 +9408,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9425,7 +9425,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9475,7 +9475,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9597,7 +9597,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9614,7 +9614,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9647,7 +9647,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9681,7 +9681,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9698,7 +9698,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9749,7 +9749,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9783,7 +9783,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9800,7 +9800,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9817,7 +9817,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9834,7 +9834,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -9867,7 +9867,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9884,7 +9884,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9901,7 +9901,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -9969,7 +9969,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(36)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -10104,7 +10104,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -10138,7 +10138,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10220,7 +10220,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'CHAR(64)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -10237,7 +10237,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10566,7 +10566,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10623,7 +10623,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10680,7 +10680,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10851,7 +10851,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10959,7 +10959,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -10976,7 +10976,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11010,7 +11010,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11067,7 +11067,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11124,7 +11124,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11141,7 +11141,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'MEDIUMTEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11232,7 +11232,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11249,7 +11249,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11453,7 +11453,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -11470,7 +11470,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11527,7 +11527,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11618,7 +11618,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11635,7 +11635,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11685,7 +11685,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -11736,7 +11736,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11884,7 +11884,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11901,7 +11901,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -11951,7 +11951,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'VARCHAR(255)', 'default' => '', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => true, ], @@ -12123,7 +12123,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], @@ -12140,7 +12140,7 @@ final class Table extends BaseTable implements Tableinterface 'db' => [ 'type' => 'TEXT', 'default' => 'EMPTY', - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', 'unique_key' => false, 'key' => false, ], diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php new file mode 100644 index 000000000..f8dc8f63b --- /dev/null +++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php @@ -0,0 +1,294 @@ + + * @git Joomla Component Builder + * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace VDM\Joomla\Utilities; + + +/** + * Simple Date Helper + * + * @since 5.0.2 + */ +abstract class DateHelper +{ + /** + * Convert a date to a human-readable fancy format (e.g., "1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + */ + public static function fancyDate($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('jS \o\f F Y', $date); + } + + /** + * Get a formatted date based on the time period (dynamic format based on age of the date). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + */ + public static function fancyDynamicDate($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + // If older than a year, use m/d/y format. + if (date('Y', $date) < date('Y', strtotime('-1 year'))) + { + return date('m/d/y', $date); + } + + // If it's the same day, return the time. + if ($date > strtotime('-1 day')) + { + return date('g:i A', $date); + } + + // Otherwise, return the month and day. + return date('M j', $date); + } + + /** + * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted day, time, and date. + * @since 3.0.0 + */ + public static function fancyDayTimeDate($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('D gA jS \o\f F Y', $date); + } + + /** + * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time and date. + * @since 3.0.0 + */ + public static function fancyDateTime($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('(G:i) jS \o\f F Y', $time); + } + + /** + * Convert a time to a human-readable format (e.g., "12:00"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time. + * @since 3.0.0 + */ + public static function fancyTime($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('G:i', $date); + } + + /** + * Convert a date to the day name (e.g., "Sunday"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day name. + * @since 3.0.0 + */ + public static function setDayName($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('l', $date); + } + + /** + * Convert a date to the month name (e.g., "January"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Month name. + * @since 3.0.0 + */ + public static function setMonthName($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('F', $date); + } + + /** + * Convert a date to the day with suffix (e.g., "1st"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day with suffix. + * @since 3.0.0 + */ + public static function setDay($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('jS', $date); + } + + /** + * Convert a date to the numeric month (e.g., "5"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Numeric month. + * @since 3.0.0 + */ + public static function setMonth($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('n', $date); + } + + /** + * Convert a date to the full year (e.g., "2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Full year. + * @since 3.0.0 + */ + public static function setYear($date, bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('Y', $date); + } + + /** + * Convert a date to a year/month format (e.g., "2024/05"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month format. + * @since 3.0.0 + */ + public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('Y' . $spacer . 'm', $date); + } + + /** + * Convert a date to a year/month/day format (e.g., "2024/05/03"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month/Day format. + * @since 3.0.0 + */ + public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('Y' . $spacer . 'm' . $spacer . 'd', $date); + } + + /** + * Convert a date to a day/month/year format (e.g., "03/05/2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day/Month/Year format. + * @since 3.0.0 + */ + public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string + { + $date = static::getValidTimestamp($date, $checkStamp); + + return date('d' . $spacer . 'm' . $spacer . 'Y', $date); + } + + /** + * Convert a date string to a valid timestamp. + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return int The valid timestamp. + * @since 3.0.0 + */ + public static function getValidTimestamp($date, bool $checkStamp): int + { + if ($checkStamp && !static::isValidTimeStamp($date)) + { + $date = strtotime($date ?? 'Now'); + } + + return (int) $date; + } + + /** + * Check if the input is a valid Unix timestamp. + * + * @param mixed $timestamp The timestamp to validate. + * + * @return bool True if valid timestamp, false otherwise. + * @since 3.0.0 + */ + public static function isValidTimeStamp($timestamp): bool + { + return (is_numeric($timestamp) && (int) $timestamp == $timestamp && $timestamp > 0); + } + + /** + * Check if a string is a valid date according to the specified format. + * + * @param string $date The date string to validate. + * @param string $format The format to check against (default is 'Y-m-d H:i:s'). + * + * @return bool True if valid date, false otherwise. + * @since 3.0.0 + */ + public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool + { + $d = \DateTime::createFromFormat($format, $date); + + return $d && $d->format($format) === $date; + } +} + diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php new file mode 100644 index 000000000..5cdf483ee --- /dev/null +++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php @@ -0,0 +1,89 @@ + + * @git Joomla Component Builder + * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace VDM\Joomla\Utilities; + + +use Joomla\CMS\Factory; +use Joomla\CMS\Session\Session; + + +/** + * Simple Session + * + * @since 5.0.2 + */ +abstract class SessionHelper +{ + /** + * The active session + * + * @var Session|null + * @since 5.0.2 + */ + private static ?Session $session = null; + + /** + * Get the active session + * + * @return Session + * @throws \RuntimeException if the session cannot be loaded + * @since 5.0.2 + */ + public static function session(): Session + { + if (static::$session === null) + { + try { + static::$session = Factory::getApplication()->getSession(); + } catch (\Exception $e) { + // Rethrow the exception as a RuntimeException to propagate it downstream + throw new \RuntimeException('Unable to load the session.', 0, $e); + } + } + + return static::$session; + } + + /** + * Get data from the session store + * + * @param string $name Name of a variable + * @param mixed $default Default value of a variable if not set + * + * @return mixed Value of the variable from the session + * @since 5.0.2 + */ + public static function get(string $name, $default = null) + { + $value = static::session()->get($name, $default); + + // Ensure the value is set in the session even if it was default + static::set($name, $value); + + return $value; + } + + /** + * Set data into the session store + * + * @param string $name Name of a variable + * @param mixed $value Value of a variable + * + * @return mixed Old value of the variable + * @since 5.0.2 + */ + public static function set(string $name, $value = null) + { + return static::session()->set($name, $value); + } +} + diff --git a/script.php b/script.php index ac972ba7f..ae2393079 100644 --- a/script.php +++ b/script.php @@ -10001,7 +10001,7 @@ function validGUID ($guid, &$usedGUID) echo '

-

Upgrade to Version 3.2.5-alpha2 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 3.2.5-alpha3 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index c5c573208..595c01ee3 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -49,6 +49,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as CompilerFactory; use VDM\Joomla\Utilities\Base64Helper; use VDM\Joomla\FOF\Encrypt\AES; +use VDM\Joomla\Utilities\DateHelper; use VDM\Joomla\Utilities\String\ClassfunctionHelper; use VDM\Joomla\Utilities\String\FieldHelper as StringFieldHelper; use VDM\Joomla\Utilities\String\TypeHelper; @@ -2161,7 +2162,7 @@ public static function loadSession() { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // set the defaults self::setSessionDefaults(); @@ -2174,7 +2175,7 @@ public static function set($key, $value) { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // set to local memory to speed up program self::$localSession[$key] = $value; @@ -2189,7 +2190,7 @@ public static function get($key, $default = null) { if (!isset(self::$session) || !ObjectHelper::check(self::$session)) { - self::$session = Factory::getSession(); + self::$session = Factory::getApplication()->getSession(); } // check if in local memory if (!isset(self::$localSession[$key])) @@ -5225,193 +5226,245 @@ public static function setSubformTable($head, $rows, $idName) /** - * Change to nice fancy date + * Convert a date to a human-readable fancy format (e.g., "1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDate($date, $checkStamp); */ - public static function fancyDate($date, $check_stamp = true) + public static function fancyDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('jS \o\f F Y',$date); + return DateHelper::fancyDate($date, $checkStamp); } /** - * get date based in period past + * Get a formatted date based on the time period (dynamic format based on age of the date). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDynamicDate($date, $checkStamp); */ - public static function fancyDynamicDate($date, $check_stamp = true) + public static function fancyDynamicDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - // older then year - $lastyear = date("Y", strtotime("-1 year")); - $tragetyear = date("Y", $date); - if ($tragetyear <= $lastyear) - { - return date('m/d/y', $date); - } - // same day - $yesterday = strtotime("-1 day"); - if ($date > $yesterday) - { - return date('g:i A', $date); - } - // just month day - return date('M j', $date); + return DateHelper::fancyDynamicDate($date, $checkStamp); } /** - * Change to nice fancy day time and date + * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted day, time, and date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDayTimeDate($date, $checkStamp); */ - public static function fancyDayTimeDate($time, $check_stamp = true) + public static function fancyDayTimeDate($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('D ga jS \o\f F Y',$time); + return DateHelper::fancyDayTimeDate($date, $checkStamp); } /** - * Change to nice fancy time and date + * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time and date. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyDateTime($date, $checkStamp); */ - public static function fancyDateTime($time, $check_stamp = true) + public static function fancyDateTime($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('(G:i) jS \o\f F Y',$time); + return DateHelper::fancyDateTime($date, $checkStamp); } /** - * Change to nice hour:minutes time + * Convert a time to a human-readable format (e.g., "12:00"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Formatted time. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::fancyTime($date, $checkStamp); */ - public static function fancyTime($time, $check_stamp = true) + public static function fancyTime($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($time)) - { - $time = strtotime($time); - } - return date('G:i',$time); + return DateHelper::fancyTime($date, $checkStamp); } /** - * set the date day as Sunday through Saturday + * Convert a date to the day name (e.g., "Sunday"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day name. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDayName($date, $checkStamp); */ - public static function setDayName($date, $check_stamp = true) + public static function setDayName($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('l', $date); + return DateHelper::setDayName($date, $checkStamp); } /** - * set the date month as January through December + * Convert a date to the month name (e.g., "January"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Month name. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setMonthName($date, $checkStamp); */ - public static function setMonthName($date, $check_stamp = true) + public static function setMonthName($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('F', $date); + return DateHelper::setMonthName($date, $checkStamp); } /** - * set the date day as 1st + * Convert a date to the day with suffix (e.g., "1st"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day with suffix. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDay($date, $checkStamp); */ - public static function setDay($date, $check_stamp = true) + public static function setDay($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('jS', $date); + return DateHelper::setDay($date, $checkStamp); } /** - * set the date month as 5 + * Convert a date to the numeric month (e.g., "5"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Numeric month. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setMonth($date, $checkStamp); */ - public static function setMonth($date, $check_stamp = true) + public static function setMonth($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('n', $date); + return DateHelper::setMonth($date, $checkStamp); } /** - * set the date year as 2004 (for charts) + * Convert a date to the full year (e.g., "2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Full year. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYear($date, $checkStamp); */ - public static function setYear($date, $check_stamp = true) + public static function setYear($date, bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y', $date); + return DateHelper::setYear($date, $checkStamp); } /** - * set the date as 2004/05 (for charts) + * Convert a date to a year/month format (e.g., "2024/05"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYearMonth($date, $spacer, $checkStamp); */ - public static function setYearMonth($date, $spacer = '/', $check_stamp = true) + public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y' . $spacer . 'm', $date); + return DateHelper::setYearMonth($date, $spacer, $checkStamp); } /** - * set the date as 2004/05/03 (for charts) + * Convert a date to a year/month/day format (e.g., "2024/05/03"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Year/Month/Day format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setYearMonthDay($date, $spacer, $checkStamp); */ - public static function setYearMonthDay($date, $spacer = '/', $check_stamp = true) + public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('Y' . $spacer . 'm' . $spacer . 'd', $date); + return DateHelper::setYearMonthDay($date, $spacer, $checkStamp); } /** - * set the date as 03/05/2004 + * Convert a date to a day/month/year format (e.g., "03/05/2024"). + * + * @param string|int $date The date as a string or timestamp. + * @param string $spacer The spacer between year and month. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return string Day/Month/Year format. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::setDayMonthYear($date, $spacer, $checkStamp); */ - public static function setDayMonthYear($date, $spacer = '/', $check_stamp = true) + public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string { - if ($check_stamp && !self::isValidTimeStamp($date)) - { - $date = strtotime($date); - } - return date('d' . $spacer . 'm' . $spacer . 'Y', $date); + return DateHelper::setDayMonthYear($date, $spacer, $checkStamp); + } + + /** + * Convert a date string to a valid timestamp. + * + * @param string|int $date The date as a string or timestamp. + * @param bool $checkStamp Whether to check if the input is a timestamp. + * + * @return int The valid timestamp. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::getValidTimestamp($date, $checkStamp); + */ + public static function getValidTimestamp($date, bool $checkStamp): int + { + return DateHelper::getValidTimestamp($date, $checkStamp); } /** - * Check if string is a valid time stamp + * Check if the input is a valid Unix timestamp. + * + * @param mixed $timestamp The timestamp to validate. + * + * @return bool True if valid timestamp, false otherwise. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::isValidTimeStamp($timestamp); */ - public static function isValidTimeStamp($timestamp) + public static function isValidTimeStamp($timestamp): bool { - return ((int) $timestamp === $timestamp) - && ($timestamp <= PHP_INT_MAX) - && ($timestamp >= ~PHP_INT_MAX); + return DateHelper::isValidTimeStamp($timestamp); } /** - * Check if string is a valid date - * https://www.php.net/manual/en/function.checkdate.php#113205 + * Check if a string is a valid date according to the specified format. + * + * @param string $date The date string to validate. + * @param string $format The format to check against (default is 'Y-m-d H:i:s'). + * + * @return bool True if valid date, false otherwise. + * @since 3.0.0 + * @deprecated 4.0.0 Use DateHelper::isValidateDate($date, $format); */ - public static function isValidateDate($date, $format = 'Y-m-d H:i:s') + public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool { - $d = DateTime::createFromFormat($format, $date); - return $d && $d->format($format) == $date; + return DateHelper::isValidateDate($date, $format); } /**