Changeset 3412641
- Timestamp:
- 12/05/2025 09:26:58 PM (4 months ago)
- Location:
- globaliser
- Files:
-
- 88 added
- 4 edited
-
tags/0.9.13 (added)
-
tags/0.9.13/app (added)
-
tags/0.9.13/app/apis (added)
-
tags/0.9.13/app/apis/authors-api.php (added)
-
tags/0.9.13/app/apis/globaliser-api.php (added)
-
tags/0.9.13/app/apis/language-api.php (added)
-
tags/0.9.13/app/controllers (added)
-
tags/0.9.13/app/controllers/globaliser-controller.php (added)
-
tags/0.9.13/app/controllers/hooks-controller.php (added)
-
tags/0.9.13/app/controllers/language-controller.php (added)
-
tags/0.9.13/app/controllers/security-controller.php (added)
-
tags/0.9.13/app/helpers (added)
-
tags/0.9.13/app/helpers/general-helper.php (added)
-
tags/0.9.13/app/models (added)
-
tags/0.9.13/app/models/authors-model.php (added)
-
tags/0.9.13/app/models/general-model.php (added)
-
tags/0.9.13/app/models/hooks-model.php (added)
-
tags/0.9.13/app/routes (added)
-
tags/0.9.13/app/routes/main-routes.php (added)
-
tags/0.9.13/app/services (added)
-
tags/0.9.13/app/services/authors-service.php (added)
-
tags/0.9.13/app/services/globaliser-service.php (added)
-
tags/0.9.13/app/services/login-service.php (added)
-
tags/0.9.13/app/services/polylang-service.php (added)
-
tags/0.9.13/app/services/wpml-service.php (added)
-
tags/0.9.13/app/views (added)
-
tags/0.9.13/assets (added)
-
tags/0.9.13/assets/js (added)
-
tags/0.9.13/assets/js/globaliser.js (added)
-
tags/0.9.13/base (added)
-
tags/0.9.13/base/api-base.php (added)
-
tags/0.9.13/base/controller-base.php (added)
-
tags/0.9.13/base/core-base.php (added)
-
tags/0.9.13/base/model-base.php (added)
-
tags/0.9.13/config (added)
-
tags/0.9.13/config/plugin-config.php (added)
-
tags/0.9.13/constants (added)
-
tags/0.9.13/constants/general.php (added)
-
tags/0.9.13/constants/hooks-settings.php (added)
-
tags/0.9.13/constants/plugins.php (added)
-
tags/0.9.13/globaliser.php (added)
-
tags/0.9.13/inc (added)
-
tags/0.9.13/inc/ata-settings.php (added)
-
tags/0.9.13/inc/constants.php (added)
-
tags/0.9.13/inc/default.php (added)
-
tags/0.9.13/inc/main.php (added)
-
tags/0.9.13/readme.txt (added)
-
tags/0.9.13/vendor (added)
-
tags/0.9.13/vendor/ata (added)
-
tags/0.9.13/vendor/ata/LICENSE (added)
-
tags/0.9.13/vendor/ata/README.md (added)
-
tags/0.9.13/vendor/ata/app (added)
-
tags/0.9.13/vendor/ata/app/base (added)
-
tags/0.9.13/vendor/ata/app/base/api.php (added)
-
tags/0.9.13/vendor/ata/app/base/controller.php (added)
-
tags/0.9.13/vendor/ata/app/base/core.php (added)
-
tags/0.9.13/vendor/ata/app/base/model.php (added)
-
tags/0.9.13/vendor/ata/app/helpers (added)
-
tags/0.9.13/vendor/ata/app/helpers/ata.php (added)
-
tags/0.9.13/vendor/ata/app/main (added)
-
tags/0.9.13/vendor/ata/app/main/adminpage.php (added)
-
tags/0.9.13/vendor/ata/app/main/ata.php (added)
-
tags/0.9.13/vendor/ata/app/main/autoloader.php (added)
-
tags/0.9.13/vendor/ata/app/router (added)
-
tags/0.9.13/vendor/ata/app/router/ajax.php (added)
-
tags/0.9.13/vendor/ata/app/router/api.php (added)
-
tags/0.9.13/vendor/ata/app/router/post.php (added)
-
tags/0.9.13/vendor/ata/app/router/router.php (added)
-
tags/0.9.13/vendor/ata/app/router/url.php (added)
-
tags/0.9.13/vendor/ata/app/views (added)
-
tags/0.9.13/vendor/ata/app/views/adminpage-footer.php (added)
-
tags/0.9.13/vendor/ata/app/views/adminpage-header.php (added)
-
tags/0.9.13/vendor/ata/app/views/adminpage-tabs.php (added)
-
tags/0.9.13/vendor/ata/ata.php (added)
-
tags/0.9.13/vendor/ata/config (added)
-
tags/0.9.13/vendor/ata/config/config.php (added)
-
tags/0.9.13/vendor/ata/config/texts.php (added)
-
tags/0.9.13/vendor/ata/inc (added)
-
tags/0.9.13/vendor/ata/inc/default.php (added)
-
tags/0.9.13/vendor/ata/languages (added)
-
tags/0.9.13/vendor/ata/languages/ata-ja.mo (added)
-
tags/0.9.13/vendor/ata/languages/ata-ja.po (added)
-
tags/0.9.13/vendor/ata/languages/ata-ru_RU.mo (added)
-
tags/0.9.13/vendor/ata/languages/ata-ru_RU.po (added)
-
tags/0.9.13/vendor/ata/languages/ata-tr_TR.mo (added)
-
tags/0.9.13/vendor/ata/languages/ata-tr_TR.po (added)
-
tags/0.9.13/vendor/ata/languages/ata.mo (added)
-
tags/0.9.13/vendor/ata/languages/ata.po (added)
-
trunk/app/controllers/security-controller.php (modified) (2 diffs)
-
trunk/app/services/login-service.php (modified) (2 diffs)
-
trunk/globaliser.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
globaliser/trunk/app/controllers/security-controller.php
r3393757 r3412641 17 17 public function main() 18 18 { 19 if ( !$this->service->is_custom_login_enabled() ) { 20 return; // Skip if custom login is not enabled 19 20 $this->on('wp_login', 'login', 10, 2); 21 $this->on('wp_logout', 'logout'); 22 23 if ( $this->service->is_custom_login_enabled() ) { 24 25 $this->on('init', 'add_custom_login_rewrite'); 26 $this->on('login_init', 'redirect_wp_login'); 27 $this->on('template_redirect', 'load_custom_login_page'); 28 $this->on('login_footer', 'modify_login_form_action'); 29 $this->on('site_url', 'filter_login_url', 10, 2); 30 21 31 } 22 23 $this->on('init', 'add_custom_login_rewrite');24 $this->on('login_init', 'redirect_wp_login');25 $this->on('template_redirect', 'load_custom_login_page');26 $this->on('login_footer', 'modify_login_form_action');27 $this->on('site_url', 'filter_login_url', 10, 2);28 32 29 33 } … … 54 58 } 55 59 60 public function login($user_login, $user) 61 { 62 $this->service->login($user_login, $user); 63 } 64 65 public function logout() 66 { 67 $this->service->logout(); 68 } 69 56 70 } -
globaliser/trunk/app/services/login-service.php
r3393762 r3412641 32 32 33 33 /** 34 * Redirect direct access to wp-login.php 35 * Allows logout and other special actions to proceed 34 * Block direct access to wp-login.php 36 35 */ 37 36 public function redirect_wp_login() 38 37 { 39 $current = $_SERVER['REQUEST_URI'] ?? ''; 40 if ( strpos($current, 'wp-login.php') !== false ) { 41 // Don't redirect logout and other special action URLs 42 $excluded_actions = ['logout', 'postpass', 'rp', 'resetpass', 'retrievepassword', 'register']; 43 $action = $_REQUEST['action'] ?? ''; 44 45 if ( !empty($action) && in_array($action, $excluded_actions, true) ) { 46 return; // Allow these actions to proceed normally 47 } 48 49 wp_redirect($this->login_url); 50 exit; 38 $current_url = (is_ssl() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 39 $wp_login_url = site_url('wp-login.php'); 40 41 if ( strpos($current_url, $wp_login_url) === 0 ) { 42 wp_die('Not Found', '404 Not Found', ['response' => 404]); 51 43 } 52 44 } … … 119 111 } 120 112 113 /** 114 * Handle actions after user login 115 * 116 * @param string $user_login The username 117 * @param WP_User $user The WP_User object 118 */ 119 public function login($user_login, $user) 120 { 121 122 if (!$user || !is_a($user, 'WP_User')) { 123 return; 124 } 125 126 $user_roles = $user->roles; 127 $primary_role = !empty($user_roles) ? $user_roles[0] : 'subscriber'; 128 $expiry = time() + (30 * DAY_IN_SECONDS); 129 130 setcookie( 131 'X-Globaliser-User-Role', 132 $primary_role, 133 $expiry, 134 COOKIEPATH, 135 COOKIE_DOMAIN, 136 is_ssl(), 137 true 138 ); 139 } 140 141 public function logout() { 142 143 setcookie( 144 'X-Globaliser-User-Role', 145 '', 146 time() - 3600, 147 COOKIEPATH, 148 COOKIE_DOMAIN, 149 is_ssl(), 150 true 151 ); 152 } 153 121 154 122 155 } -
globaliser/trunk/globaliser.php
r3393762 r3412641 2 2 /* 3 3 Plugin Name: Globaliser 4 Plugin URI: https://www.globaliser.com /wordpress-hosting/4 Plugin URI: https://www.globaliser.com 5 5 Description: This plugin enables Globaliser Cloud Speed, Security, and Reliability features for WordPress sites. It is intended for Globaliser clients only. 6 Version: 0.9.1 26 Version: 0.9.13 7 7 Author: Globaliser, Inc. 8 8 Author URI: https://www.globaliser.com -
globaliser/trunk/readme.txt
r3393762 r3412641 5 5 License: GPLv2 or later 6 6 Tested up to: 6.8 7 Stable tag: 0.9.1 27 Stable tag: 0.9.13 8 8 Requires PHP: 8.1 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 27 27 28 28 == Changelog == 29 30 = 0.9.13 = 31 * Removed login redirect for custom url. 29 32 30 33 = 0.9.12 =
Note: See TracChangeset
for help on using the changeset viewer.