| @@ -87,11 +87,16 @@ | ||
| 87 | 87 | $allPref['direct_queue_statistics'] = 0; |
| 88 | 88 | $allPref['uploadfolder'] = str_replace('\\', '/', ACYM_UPLOAD_FOLDER); |
| 89 | 89 | $allPref['last_import'] = ''; |
| 90 | 90 | $allPref['security_key'] = acym_generateKey(30); |
| 91 | + $allPref['api_key'] = acym_generateKey(30); | |
| 92 | + $allPref['cron_security'] = 1; | |
| 93 | + $allPref['cron_key'] = acym_generateKey(30); | |
| 91 | 94 | $allPref['export_excelsecurity'] = 1; |
| 92 | 95 | $allPref['gdpr_export'] = 0; |
| 93 | 96 | $allPref['gdpr_delete'] = 0; |
| 97 | + $allPref['dont_track_by_default'] = 0; | |
| 98 | + $allPref['user_tracking_control'] = 0; | |
| 94 | 99 | $allPref['trackingsystem'] = 'acymailing'; |
| 95 | 100 | $allPref['trackingsystemexternalwebsite'] = 1; |
| 96 | 101 | $allPref['generate_name'] = 1; |
| 97 | 102 | $allPref['allow_modif'] = 'data'; |
| @@ -121,9 +126,9 @@ | ||
| 121 | 126 | |
| 122 | 127 | $allPref['Starter'] = ACYM_STARTER; |
| 123 | 128 | $allPref['Essential'] = ACYM_ESSENTIAL; |
| 124 | 129 | $allPref['Enterprise'] = ACYM_ENTERPRISE; |
| 125 | - $allPref['previous_version'] = '10.10.2'; | |
| 130 | + $allPref['previous_version'] = '11.1.0'; | |
| 126 | 131 | |
| 127 | 132 | $allPref['display_built_by'] = acym_level(ACYM_ESSENTIAL) ? 0 : 1; |
| 128 | 133 | $allPref['php_overrides'] = 0; |
| 129 | 134 | |
| @@ -144,9 +149,9 @@ | ||
| 144 | 149 | $results = null; |
| 145 | 150 | } |
| 146 | 151 | |
| 147 | 152 | if ($results === null) { |
| 148 | - acym_display(isset($e) ? $e->getMessage() : substr(strip_tags(acym_getDBError()), 0, 200).'...', 'error'); | |
| 153 | + acym_display(isset($e) ? $e->getMessage() : substr(acym_stripTags(acym_getDBError()), 0, 200).'...', 'error'); | |
| 149 | 154 | |
| 150 | 155 | return false; |
| 151 | 156 | } |
| 152 | 157 | |
| @@ -160,8 +165,9 @@ | ||
| 160 | 165 | |
| 161 | 166 | $this->isUpdating = true; |
| 162 | 167 | $this->previousVersion = $results['version']->value; |
| 163 | 168 | |
| 169 | + //We update the version properly as it's a new one which is now used. | |
| 164 | 170 | $query = 'REPLACE INTO `#__acym_configuration` (`name`,`value`) VALUES ("level",'.acym_escapeDB($this->level).')'; |
| 165 | 171 | $query .= ',("version",'.acym_escapeDB($this->version).')'; |
| 166 | 172 | $query .= ',("installcomplete","0")'; |
| 167 | 173 | $query .= ',("previous_version",'.acym_escapeDB($this->previousVersion).')'; |