"
COM_COMPONENTBUILDER_HI="Hi"
-COM_COMPONENTBUILDER_HIDE="Hide"
+COM_COMPONENTBUILDER_HIDE_ONLY="Hide Only"
+COM_COMPONENTBUILDER_HIDE_TOGGLE="Hide Toggle"
COM_COMPONENTBUILDER_HOW_TO_GET_A_S_FREE_KEYSA_FROM_VDM="How to get free keys from VDM."
COM_COMPONENTBUILDER_HTWOCURL_NOT_FOUNDHTWOPPLEASE_SETUP_CURL_ON_YOUR_SYSTEM_OR_BCOMPONENTBUILDERB_WILL_NOT_FUNCTION_CORRECTLYP="
Curl Not Found!
Please setup curl on your system, or componentbuilder will not function correctly!
This could be due to key error, or broken package!"
@@ -5860,8 +5863,9 @@ COM_COMPONENTBUILDER_SHOULD_THIS_FIELD_BE_ESCAPED_IN_THE_LIST_VIEW="Should this
COM_COMPONENTBUILDER_SHOULD_WE_BE_SHOWING_MORE_ELABORATE_INFORMATION_DURING_IMPORT="Should we be showing more elaborate information during import."
COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported."
COM_COMPONENTBUILDER_SHOULD_WE_MERGE_THE_COMPONENTS_WITH_SIMILAR_LOCAL_COMPONENTS_MERGING_THE_COMPONENTS_USE_TO_BE_THE_DEFAULT_BEHAVIOUR_BUT_NOW_YOU_CAN_IMPORT_THE_COMPONENTS_AND_FORCE_IT_NOT_TO_MERGE_THE_FOLLOWING_AREAS_VALIDATION_RULE_FIELDTYPE_SNIPPET_LANGUAGE_LANGUAGE_TRANSLATION_BMUST_AND_WILL_STILLB_MERGE_EVEN_OF_YOUR_SELECTION_IS_BNOB_BECAUSE_OF_THE_SINGULAR_NATURE_OF_THOSE_AREAS="Should we merge the component/s with similar local component/s. Merging the component/s use to be the default behaviour, but now you can import the component/s and force it not to merge. The following areas (validation_rule, fieldtype, snippet, language, language_translation) must and will still merge even of your selection is No, because of the singular nature of those areas."
-COM_COMPONENTBUILDER_SHOW="Show"
COM_COMPONENTBUILDER_SHOW_IN_LIST_VIEW="Show in list view"
+COM_COMPONENTBUILDER_SHOW_ONLY="Show Only"
+COM_COMPONENTBUILDER_SHOW_TOGGLE="Show Toggle"
COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it."
COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it."
COM_COMPONENTBUILDER_SITE_VIEW="Site View"
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index f4deb2a8f..1a8b89733 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -1049,9 +1049,17 @@ class ComponentbuilderModelAjax extends JModelList
{
if (1 == $value)
{
- return JText::_('COM_COMPONENTBUILDER_SHOW');
+ return JText::_('COM_COMPONENTBUILDER_SHOW_TOGGLE');
}
- return JText::_('COM_COMPONENTBUILDER_HIDE');
+ elseif (3 == $value)
+ {
+ return JText::_('COM_COMPONENTBUILDER_SHOW_ONLY');
+ }
+ elseif (4 == $value)
+ {
+ return JText::_('COM_COMPONENTBUILDER_HIDE_ONLY');
+ }
+ return JText::_('COM_COMPONENTBUILDER_HIDE_TOGGLE');
}
protected function setTargetRelation($header, $value)
diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml
index 67c614ad1..44aa77f2d 100644
--- a/admin/models/forms/admin_fields_conditions.xml
+++ b/admin/models/forms/admin_fields_conditions.xml
@@ -131,9 +131,13 @@
default="1">
+ COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_SHOW_TOGGLE
+ COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_HIDE_TOGGLE
+
+
COM_COMPONENTBUILDER
- 1st September, 2018
+ 8th September, 2018Llewellyn van der Merwellewellyn@joomlacomponentbuilder.comhttp://www.joomlacomponentbuilder.com
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index dedbc4d78..6d4fe670a 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -2400,14 +2400,14 @@ abstract class ComponentbuilderHelper
/**
- * Get the file path or url
+ * Get the file path or url
*
- * @param string $type The (url/path) type to return
- * @param string $target The Params Target name (if set)
- * @param string $default The default path if not set in Params (fallback path)
- * @param bool $createIfNotSet The switch to create the folder if not found
+ * @param string $type The (url/path) type to return
+ * @param string $target The Params Target name (if set)
+ * @param string $default The default path if not set in Params (fallback path)
+ * @param bool $createIfNotSet The switch to create the folder if not found
*
- * @return string On success the path or url is returned based on the type requested
+ * @return string On success the path or url is returned based on the type requested
*
*/
public static function getFolderPath($type = 'path', $target = 'folderpath', $default = '', $createIfNotSet = true)
@@ -2448,7 +2448,7 @@ abstract class ComponentbuilderHelper
/**
* get the content of a file
*
- * @param string $path The path to the file
+ * @param string $path The path to the file
* @param string/bool $none The return value if no content was found
*
* @return string On success
@@ -2597,34 +2597,37 @@ abstract class ComponentbuilderHelper
}
/**
- * the locker
+ * the locker
*
- * @var array
+ * @var array
**/
protected static $locker = array();
/**
- * the dynamic replacement salt
+ * the dynamic replacement salt
*
- * @var array
+ * @var array
**/
protected static $globalSalt = array();
/**
- * the timer
+ * the timer
*
- * @var object
+ * @var object
**/
protected static $keytimer;
/**
- * To Lock string
+ * To Lock string
+ *
+ * @param string $string The string/array to lock
+ * @param string $key The custom key to use
+ * @param int $salt The switch to add salt and type of salt
+ * @param int $dynamic The dynamic replacement array of salt build string
+ * @param int $urlencode The switch to control url encoding
+ *
+ * @return string Encrypted String
*
- * @param string $string The string/array to lock
- * @param string $key The custom key to use
- * @param int $salt The switch to add salt and type of salt
- * @param int $dynamic The dynamic replacement array of salt build string
- * @param int $urlencode The switch to control url encoding
**/
public static function lock($string, $key = null, $salt = 2, $dynamic = null, $urlencode = true)
{
@@ -2638,13 +2641,13 @@ abstract class ComponentbuilderHelper
{
$timer = $salt;
}
+ // set the default key
+ $key = self::salt($timer, $dynamic);
+ // try getting the system key
if (method_exists(get_called_class(), "getCryptKey"))
{
- $key = self::getCryptKey('basic', self::salt($timer, $dynamic));
- }
- else
- {
- $key = self::salt($timer, $dynamic);
+ // try getting the medium key first the fall back to basic, and then default
+ $key = self::getCryptKey('medium', self::getCryptKey('basic', $key));
}
}
// check if we have a salt timer
@@ -2663,7 +2666,7 @@ abstract class ComponentbuilderHelper
$string = serialize($string);
}
// prep for url
- if ($urlencode)
+ if ($urlencode && method_exists(get_called_class(), "base64_urlencode"))
{
return self::base64_urlencode(self::$locker[$key]->encryptString($string));
}
@@ -2671,13 +2674,16 @@ abstract class ComponentbuilderHelper
}
/**
- * To un-Lock string
+ * To un-Lock string
+ *
+ * @param string $string The string to unlock
+ * @param string $key The custom key to use
+ * @param int $salt The switch to add salt and type of salt
+ * @param int $dynamic The dynamic replacement array of salt build string
+ * @param int $urlencode The switch to control url decoding
+ *
+ * @return string Decrypted String
*
- * @param string $string The string to unlock
- * @param string $key The custom key to use
- * @param int $salt The switch to add salt and type of salt
- * @param int $dynamic The dynamic replacement array of salt build string
- * @param int $urlencode The switch to control url decoding
**/
public static function unlock($string, $key = null, $salt = 2, $dynamic = null, $urlencode = true)
{
@@ -2691,14 +2697,13 @@ abstract class ComponentbuilderHelper
{
$timer = $salt;
}
- // get secure key
+ // set the default key
+ $key = self::salt($timer, $dynamic);
+ // try getting the system key
if (method_exists(get_called_class(), "getCryptKey"))
{
- $key = self::getCryptKey('basic', self::salt($timer, $dynamic));
- }
- else
- {
- $key = self::salt($timer, $dynamic);
+ // try getting the medium key first the fall back to basic, and then default
+ $key = self::getCryptKey('medium', self::getCryptKey('basic', $key));
}
}
// check if we have a salt timer
@@ -2712,7 +2717,7 @@ abstract class ComponentbuilderHelper
self::$locker[$key] = new FOFEncryptAes($key, 128);
}
// make sure we have real base64
- if ($urlencode)
+ if ($urlencode && method_exists(get_called_class(), "base64_urldecode"))
{
$string = self::base64_urldecode($string);
}
@@ -2730,10 +2735,13 @@ abstract class ComponentbuilderHelper
}
/**
- * The Salt
+ * The Salt
+ *
+ * @param int $type The type of length the salt should be valid
+ * @param int $dynamic The dynamic replacement array of salt build string
+ *
+ * @return string
*
- * @param int $type The type of length the salt should be valid
- * @param int $dynamic The dynamic replacement array of salt build string
**/
public static function salt($type = 1, $dynamic = null)
{
@@ -2778,9 +2786,9 @@ abstract class ComponentbuilderHelper
}
/**
- * The function to insure the salt is valid within the given period (third try)
+ * The function to insure the salt is valid within the given period (third try)
*
- * @param int $main The main number
+ * @param int $main The main number
*/
protected static function periodFix($main)
{
@@ -2788,8 +2796,12 @@ abstract class ComponentbuilderHelper
}
/**
- * Check if a string is serialized
- * @param string $string
+ * Check if a string is serialized
+ *
+ * @param string $string
+ *
+ * @return Boolean
+ *
*/
public static function is_serial($string)
{
@@ -2797,7 +2809,7 @@ abstract class ComponentbuilderHelper
}
/**
- * Get dynamic replacement salt
+ * Get dynamic replacement salt
*/
public static function getDynamicSalt($dynamic = null)
{
@@ -2814,7 +2826,7 @@ abstract class ComponentbuilderHelper
}
/**
- * The random or dynamic secret salt
+ * The random or dynamic secret salt
*/
public static function getSecretSalt($string = null, $size = 9)
{
@@ -2837,7 +2849,7 @@ abstract class ComponentbuilderHelper
}
/**
- * Get global replacement salt
+ * Get global replacement salt
*/
public static function getGlobalSalt()
{
@@ -2877,7 +2889,7 @@ abstract class ComponentbuilderHelper
}
/**
- * Close public protocol
+ * Close public protocol
*/
public static function closePublicProtocol($id, $public)
{
@@ -2904,7 +2916,7 @@ abstract class ComponentbuilderHelper
}
/**
- * Open public protocol
+ * Open public protocol
*/
public static function openPublicProtocol($SECRET, $ID, $PUBLIC)
{