fixed issue that caused some custom code not to export for a JCB packages if found in anther custom code area. Made some corrections to the router helper class. Added return_here value admin views to improve the return values in url redirection. Improved the open valid base64 method to make use of default string. Update many ajax calls to not use jsonp, and infact be more secure.
This commit is contained in:
@ -2356,11 +2356,12 @@ abstract class ComponentbuilderHelper
|
||||
*
|
||||
* @param string $data The base64 string
|
||||
* @param string $key We store the string with that suffix :)
|
||||
* @param string $default The default switch
|
||||
*
|
||||
* @return string The opened string
|
||||
*
|
||||
*/
|
||||
public static function openValidBase64($data, $key = '__.o0=base64=Oo.__')
|
||||
public static function openValidBase64($data, $key = '__.o0=base64=Oo.__', $default = 'string')
|
||||
{
|
||||
// check that we have a string
|
||||
if (self::checkString($data))
|
||||
@ -2379,7 +2380,12 @@ abstract class ComponentbuilderHelper
|
||||
return base64_decode($data);
|
||||
}
|
||||
}
|
||||
return $data;
|
||||
// check if we should just return the string
|
||||
if ('string' === $default)
|
||||
{
|
||||
return $data;
|
||||
}
|
||||
return $default;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user