| @@ -12,16 +12,13 @@ | ||
| 12 | 12 | |
| 13 | 13 | use Templately\Admin\API\Settings as APISettings; |
| 14 | 14 | use Templately\Admin\Settings; |
| 15 | 15 | use Templately\API\AIContent; |
| 16 | -use Templately\API\LogoGeneration; | |
| 17 | 16 | use Templately\API\Conditions; |
| 18 | 17 | use Templately\API\ThemeBuilderApi; |
| 19 | 18 | use Templately\Builder\ThemeBuilder; |
| 20 | 19 | use Templately\Core\Importer\FullSiteImport; |
| 21 | -use Templately\Utils\AuthErrorCode; | |
| 22 | 20 | use Templately\Utils\Base; |
| 23 | -use Templately\Utils\Database; | |
| 24 | 21 | use Templately\Utils\Enqueue; |
| 25 | 22 | |
| 26 | 23 | use Templately\Core\Admin; |
| 27 | 24 | use Templately\Core\Module; |
| @@ -28,11 +25,9 @@ | ||
| 28 | 25 | |
| 29 | 26 | use Templately\API\Tags; |
| 30 | 27 | use Templately\API\Items; |
| 31 | 28 | use Templately\API\Login; |
| 32 | -use Templately\API\Checkout; | |
| 33 | 29 | use Templately\API\SignUp; |
| 34 | -use Templately\API\AiCredit; | |
| 35 | 30 | use Templately\API\Profile; |
| 36 | 31 | use Templately\API\Import; |
| 37 | 32 | use Templately\API\MyClouds; |
| 38 | 33 | use Templately\API\WorkSpaces; |
| @@ -39,11 +34,8 @@ | ||
| 39 | 34 | use Templately\API\Categories; |
| 40 | 35 | use Templately\API\Dependencies; |
| 41 | 36 | use Templately\API\TemplateTypes; |
| 42 | 37 | use Templately\API\SavedTemplates; |
| 43 | -use Templately\API\Sites; | |
| 44 | -use Templately\API\Tour; | |
| 45 | -use Templately\Core\DeactivationSurvey; | |
| 46 | 38 | use Templately\Core\Maintenance; |
| 47 | 39 | use Templately\Core\Migrator; |
| 48 | 40 | use Templately\Core\Platform\Gutenberg; |
| 49 | 41 | use Templately\Core\Platform\Elementor; |
| @@ -48,9 +40,9 @@ | ||
| 48 | 40 | use Templately\Core\Platform\Gutenberg; |
| 49 | 41 | use Templately\Core\Platform\Elementor; |
| 50 | 42 | |
| 51 | 43 | final class Plugin extends Base { |
| 52 | - public $version = '3.7.3'; | |
| 44 | + public $version = '3.4.6'; | |
| 53 | 45 | |
| 54 | 46 | public $admin; |
| 55 | 47 | public $settings; |
| 56 | 48 | /** |
| @@ -79,9 +71,8 @@ | ||
| 79 | 71 | $this->define_constants(); |
| 80 | 72 | $this->set_locale(); |
| 81 | 73 | |
| 82 | 74 | Maintenance::init(); |
| 83 | - DeactivationSurvey::init(); | |
| 84 | 75 | |
| 85 | 76 | $this->assets = Enqueue::get_instance( TEMPLATELY_URL, TEMPLATELY_PATH, $this->version ); |
| 86 | 77 | $this->admin = Admin::get_instance(); |
| 87 | 78 | $this->settings = Settings::get_instance(); |
| @@ -91,11 +82,8 @@ | ||
| 91 | 82 | $this->init_developer_functionality(); |
| 92 | 83 | |
| 93 | 84 | add_action( 'plugins_loaded', [ $this, 'plugins_loaded' ] ); |
| 94 | 85 | add_action( 'rest_api_init', [ $this, 'register_routes' ] ); |
| 95 | - | |
| 96 | - add_action( 'init', [ $this, 'google_login_handler' ] ); | |
| 97 | - | |
| 98 | 86 | /** |
| 99 | 87 | * Initialize. |
| 100 | 88 | */ |
| 101 | 89 | do_action( 'templately_init' ); |
| @@ -191,22 +179,17 @@ | ||
| 191 | 179 | Tags::get_instance(); |
| 192 | 180 | ThemeBuilderApi::get_instance(); |
| 193 | 181 | |
| 194 | 182 | AIContent::get_instance(); |
| 195 | - LogoGeneration::get_instance(); | |
| 196 | 183 | Items::get_instance(); |
| 197 | 184 | SavedTemplates::get_instance(); |
| 198 | 185 | |
| 199 | 186 | Login::get_instance(); |
| 200 | - Checkout::get_instance(); | |
| 201 | 187 | SignUp::get_instance(); |
| 202 | 188 | Import::get_instance(); |
| 203 | 189 | Profile::get_instance(); |
| 204 | - AiCredit::get_instance(); | |
| 205 | 190 | MyClouds::get_instance(); |
| 206 | 191 | WorkSpaces::get_instance(); |
| 207 | - Sites::get_instance(); | |
| 208 | - Tour::get_instance(); | |
| 209 | 192 | |
| 210 | 193 | APISettings::get_instance(); |
| 211 | 194 | // Note: DeveloperSettings::get_instance() is called in Developer::init_modules() when developer functionality is available and enabled |
| 212 | 195 | } |
| @@ -268,106 +251,6 @@ | ||
| 268 | 251 | * |
| 269 | 252 | */ |
| 270 | 253 | public function load_textdomain() { |
| 271 | 254 | load_plugin_textdomain( 'templately', false, dirname( TEMPLATELY_PLUGIN_BASENAME ) . '/languages' ); |
| 272 | - } | |
| 273 | - | |
| 274 | - public function google_login_handler() { | |
| 275 | - // Stop if not a templately google login request | |
| 276 | - if ( empty( $_GET['templately_google_login'] ) ) { | |
| 277 | - return; | |
| 278 | - } | |
| 279 | - | |
| 280 | - if ( wp_doing_ajax() || wp_doing_cron() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) { | |
| 281 | - return; | |
| 282 | - } | |
| 283 | - | |
| 284 | - // Checked before the token is consumed: the callback can land while the | |
| 285 | - // auth cookie is missing (expired session, cookie not yet set), and WP | |
| 286 | - // will bounce the user through wp-login and back to this same URL. | |
| 287 | - // Burning the token here would fail that legitimate retry. | |
| 288 | - if ( ! is_user_logged_in() ) { | |
| 289 | - return; | |
| 290 | - } | |
| 291 | - | |
| 292 | - $state = ''; | |
| 293 | - if ( ! empty( $_GET['templately_state'] ) ) { | |
| 294 | - $state = sanitize_text_field( wp_unslash( $_GET['templately_state'] ) ); | |
| 295 | - } elseif ( ! empty( $_GET['state'] ) ) { | |
| 296 | - $state = sanitize_text_field( wp_unslash( $_GET['state'] ) ); | |
| 297 | - } | |
| 298 | - | |
| 299 | - $state_user_id = false; | |
| 300 | - if ( ! empty( $state ) ) { | |
| 301 | - $state_user_id = Database::get_transient( 'google_state_' . $state ); | |
| 302 | - Database::delete_transient( 'google_state_' . $state ); | |
| 303 | - } | |
| 304 | - | |
| 305 | - $is_authorized = false !== $state_user_id | |
| 306 | - && intval( $state_user_id ) === get_current_user_id() | |
| 307 | - && current_user_can( 'delete_posts' ); | |
| 308 | - | |
| 309 | - $redirect_url = remove_query_arg( [ 'templately_google_login', 'templately_state', 'api_key', 'error', 'state', 'redirect-to' ] ); | |
| 310 | - | |
| 311 | - if ( ! $is_authorized ) { | |
| 312 | - $error_code = AuthErrorCode::AUTH_STATE_INVALID; | |
| 313 | - } elseif ( ! empty( $_GET['error'] ) ) { | |
| 314 | - // Google's own reason is deliberately dropped rather than forwarded: | |
| 315 | - // everything on this query string is attacker-controlled, and the | |
| 316 | - // screen that displays it must never be handed prose from the URL. | |
| 317 | - $error_code = AuthErrorCode::AUTH_PROVIDER_FAILED; | |
| 318 | - } elseif ( ! empty( $_GET['api_key'] ) ) { | |
| 319 | - $request = new \WP_REST_Request( 'POST', '/templately/v1/login' ); | |
| 320 | - $request->set_param( 'viaAPI', true ); | |
| 321 | - $request->set_param( 'api_key', sanitize_text_field( $_GET['api_key'] ) ); | |
| 322 | - | |
| 323 | - /** | |
| 324 | - * @var Login $login | |
| 325 | - */ | |
| 326 | - $login = Login::get_instance(); | |
| 327 | - $login->permission_check( $request ); | |
| 328 | - | |
| 329 | - // login() pins the write target to the acting user itself — no pin | |
| 330 | - // here, or its finally would release ours mid-request. | |
| 331 | - $response = $login->login(); | |
| 332 | - | |
| 333 | - if ( ! is_wp_error( $response ) && ! empty( $response['user'] ) ) { | |
| 334 | - $redirect_path = ! empty( $_GET['redirect-to'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect-to'] ) ) : ''; | |
| 335 | - if ( ! empty( $redirect_path ) ) { | |
| 336 | - if ( filter_var( $redirect_path, FILTER_VALIDATE_URL ) ) { | |
| 337 | - $redirect_url = $redirect_path; | |
| 338 | - } else { | |
| 339 | - $is_templately = strpos( $redirect_url, 'page=templately' ) !== false; | |
| 340 | - $is_elementor = strpos( $redirect_url, 'action=elementor' ) !== false; | |
| 341 | - // Gutenberg editor usually has action=edit or is a block editor page | |
| 342 | - $is_gutenberg = ( strpos( $redirect_url, 'action=edit' ) !== false || strpos( $redirect_url, 'post_type=' ) !== false ) && ! $is_elementor; | |
| 343 | - | |
| 344 | - if ( $is_templately || $is_elementor || $is_gutenberg ) { | |
| 345 | - $redirect_url = add_query_arg( 'path', ltrim( $redirect_path, '/' ), $redirect_url ); | |
| 346 | - | |
| 347 | - // Always open the modal in editors after google login | |
| 348 | - if ( $is_elementor || $is_gutenberg ) { | |
| 349 | - $redirect_url = add_query_arg( 'templately_open_modal', '1', $redirect_url ); | |
| 350 | - } | |
| 351 | - } | |
| 352 | - } | |
| 353 | - } | |
| 354 | - | |
| 355 | - wp_safe_redirect( $redirect_url ); | |
| 356 | - exit; | |
| 357 | - } else { | |
| 358 | - // The cloud's own wording stays server-side; the screen resolves | |
| 359 | - // its copy from the code. | |
| 360 | - $error_code = AuthErrorCode::INVALID_API_KEY; | |
| 361 | - } | |
| 362 | - } else { | |
| 363 | - $error_code = AuthErrorCode::AUTH_MISSING_API_KEY; | |
| 364 | - } | |
| 365 | - | |
| 366 | - $redirect_url = add_query_arg( [ | |
| 367 | - 'templately_error' => $error_code, | |
| 368 | - ], $redirect_url ); | |
| 369 | - | |
| 370 | - wp_safe_redirect( $redirect_url ); | |
| 371 | - exit; | |
| 372 | 255 | } |
| 373 | 256 | } |