| @@ -23,10 +23,12 @@ | ||
| 23 | 23 | * new backup on Joomla. This value should be changed everytime |
| 24 | 24 | * something in the database structure is altered. |
| 25 | 25 | * |
| 26 | 26 | * @var string |
| 27 | + * | |
| 28 | + * @see This should MATCH the E4jConnect constants for the Trial. | |
| 27 | 29 | */ |
| 28 | - const MINIMUM_REQUIRED_VERSION_JOOMLA = '1.16.1'; | |
| 30 | + const MINIMUM_REQUIRED_VERSION_JOOMLA = '1.18.6'; | |
| 29 | 31 | |
| 30 | 32 | /** |
| 31 | 33 | * Indicates the minimum required version while creating a |
| 32 | 34 | * new backup on WordPress. This value should be changed everytime |
| @@ -32,10 +34,12 @@ | ||
| 32 | 34 | * new backup on WordPress. This value should be changed everytime |
| 33 | 35 | * something in the database structure is altered. |
| 34 | 36 | * |
| 35 | 37 | * @var string |
| 38 | + * | |
| 39 | + * @see This should MATCH the E4jConnect constants for the Trial. | |
| 36 | 40 | */ |
| 37 | - const MINIMUM_REQUIRED_VERSION_WORDPRESS = '1.6.1'; | |
| 41 | + const MINIMUM_REQUIRED_VERSION_WORDPRESS = '1.8.6'; | |
| 38 | 42 | |
| 39 | 43 | /** |
| 40 | 44 | * An associative array containing the supported export types, where the |
| 41 | 45 | * key is equals to the type ID and the value is the type instance. |
| @@ -82,9 +86,9 @@ | ||
| 82 | 86 | |
| 83 | 87 | if (empty($options['filename'])) |
| 84 | 88 | { |
| 85 | 89 | // use the current date and time as file name |
| 86 | - $options['filename'] = 'backup_' . $type . '_' . JFactory::getDate()->format('Y-m-d H:i:s'); | |
| 90 | + $options['filename'] = 'backup_' . $type . '_' . JFactory::getDate()->format('Y-m-d H-i-s'); | |
| 87 | 91 | } |
| 88 | 92 | |
| 89 | 93 | if (!empty($options['prefix'])) |
| 90 | 94 | { |
| @@ -197,9 +201,9 @@ | ||
| 197 | 201 | // create backup import director |
| 198 | 202 | $director = new VBOBackupImportDirector($extractdir); |
| 199 | 203 | |
| 200 | 204 | // set the manifest version equals to the minimum required one, according to the CMS in use |
| 201 | - if (defined('ABSPATH')) | |
| 205 | + if (VBOPlatformDetection::isWordPress()) | |
| 202 | 206 | { |
| 203 | 207 | $director->setVersion(static::MINIMUM_REQUIRED_VERSION_WORDPRESS); |
| 204 | 208 | } |
| 205 | 209 | else |
| @@ -254,9 +258,9 @@ | ||
| 254 | 258 | * @return mixed An array of include paths or a string. |
| 255 | 259 | * |
| 256 | 260 | * @since 1.5 |
| 257 | 261 | */ |
| 258 | - $paths = JFactory::getApplication()->triggerEvent('onLoadBackupExportTypesVikBooking'); | |
| 262 | + $paths = VBOFactory::getPlatform()->getDispatcher()->filter('onLoadBackupExportTypesVikBooking'); | |
| 259 | 263 | |
| 260 | 264 | // merge returned paths with the existing ones |
| 261 | 265 | foreach ($paths as $path) |
| 262 | 266 | { |
