Changeset 3204097
- Timestamp:
- 12/07/2024 02:23:40 PM (16 months ago)
- Location:
- globaliser
- Files:
-
- 82 added
- 8 edited
-
tags/0.9.3 (added)
-
tags/0.9.3/app (added)
-
tags/0.9.3/app/apis (added)
-
tags/0.9.3/app/apis/globaliser-api.php (added)
-
tags/0.9.3/app/apis/language-api.php (added)
-
tags/0.9.3/app/controllers (added)
-
tags/0.9.3/app/controllers/globaliser-controller.php (added)
-
tags/0.9.3/app/controllers/hooks-controller.php (added)
-
tags/0.9.3/app/controllers/language-controller.php (added)
-
tags/0.9.3/app/helpers (added)
-
tags/0.9.3/app/helpers/general-helper.php (added)
-
tags/0.9.3/app/models (added)
-
tags/0.9.3/app/models/general-model.php (added)
-
tags/0.9.3/app/models/hooks-model.php (added)
-
tags/0.9.3/app/routes (added)
-
tags/0.9.3/app/routes/main-routes.php (added)
-
tags/0.9.3/app/services (added)
-
tags/0.9.3/app/services/globaliser-service.php (added)
-
tags/0.9.3/app/services/polylang-service.php (added)
-
tags/0.9.3/app/services/wpml-service.php (added)
-
tags/0.9.3/app/views (added)
-
tags/0.9.3/base (added)
-
tags/0.9.3/base/api-base.php (added)
-
tags/0.9.3/base/controller-base.php (added)
-
tags/0.9.3/base/core-base.php (added)
-
tags/0.9.3/base/model-base.php (added)
-
tags/0.9.3/config (added)
-
tags/0.9.3/config/plugin-config.php (added)
-
tags/0.9.3/constants (added)
-
tags/0.9.3/constants/general.php (added)
-
tags/0.9.3/constants/hooks-settings.php (added)
-
tags/0.9.3/constants/plugins.php (added)
-
tags/0.9.3/globaliser.php (added)
-
tags/0.9.3/inc (added)
-
tags/0.9.3/inc/ata-settings.php (added)
-
tags/0.9.3/inc/constants.php (added)
-
tags/0.9.3/inc/default.php (added)
-
tags/0.9.3/inc/main.php (added)
-
tags/0.9.3/readme.txt (added)
-
tags/0.9.3/vendor (added)
-
tags/0.9.3/vendor/ata (added)
-
tags/0.9.3/vendor/ata/LICENSE (added)
-
tags/0.9.3/vendor/ata/README.md (added)
-
tags/0.9.3/vendor/ata/app (added)
-
tags/0.9.3/vendor/ata/app/base (added)
-
tags/0.9.3/vendor/ata/app/base/api.php (added)
-
tags/0.9.3/vendor/ata/app/base/controller.php (added)
-
tags/0.9.3/vendor/ata/app/base/core.php (added)
-
tags/0.9.3/vendor/ata/app/base/model.php (added)
-
tags/0.9.3/vendor/ata/app/helpers (added)
-
tags/0.9.3/vendor/ata/app/helpers/ata.php (added)
-
tags/0.9.3/vendor/ata/app/main (added)
-
tags/0.9.3/vendor/ata/app/main/adminpage.php (added)
-
tags/0.9.3/vendor/ata/app/main/ata.php (added)
-
tags/0.9.3/vendor/ata/app/main/autoloader.php (added)
-
tags/0.9.3/vendor/ata/app/router (added)
-
tags/0.9.3/vendor/ata/app/router/ajax.php (added)
-
tags/0.9.3/vendor/ata/app/router/api.php (added)
-
tags/0.9.3/vendor/ata/app/router/post.php (added)
-
tags/0.9.3/vendor/ata/app/router/router.php (added)
-
tags/0.9.3/vendor/ata/app/router/url.php (added)
-
tags/0.9.3/vendor/ata/app/views (added)
-
tags/0.9.3/vendor/ata/app/views/adminpage-footer.php (added)
-
tags/0.9.3/vendor/ata/app/views/adminpage-header.php (added)
-
tags/0.9.3/vendor/ata/app/views/adminpage-tabs.php (added)
-
tags/0.9.3/vendor/ata/ata.php (added)
-
tags/0.9.3/vendor/ata/config (added)
-
tags/0.9.3/vendor/ata/config/config.php (added)
-
tags/0.9.3/vendor/ata/config/texts.php (added)
-
tags/0.9.3/vendor/ata/inc (added)
-
tags/0.9.3/vendor/ata/inc/default.php (added)
-
tags/0.9.3/vendor/ata/languages (added)
-
tags/0.9.3/vendor/ata/languages/ata-ja.mo (added)
-
tags/0.9.3/vendor/ata/languages/ata-ja.po (added)
-
tags/0.9.3/vendor/ata/languages/ata-ru_RU.mo (added)
-
tags/0.9.3/vendor/ata/languages/ata-ru_RU.po (added)
-
tags/0.9.3/vendor/ata/languages/ata-tr_TR.mo (added)
-
tags/0.9.3/vendor/ata/languages/ata-tr_TR.po (added)
-
tags/0.9.3/vendor/ata/languages/ata.mo (added)
-
tags/0.9.3/vendor/ata/languages/ata.po (added)
-
trunk/app/controllers/language-controller.php (modified) (2 diffs)
-
trunk/app/models/general-model.php (modified) (1 diff)
-
trunk/app/services/polylang-service.php (modified) (1 diff)
-
trunk/app/services/wpml-service.php (added)
-
trunk/constants/general.php (modified) (1 diff)
-
trunk/constants/hooks-settings.php (modified) (2 diffs)
-
trunk/constants/plugins.php (added)
-
trunk/globaliser.php (modified) (1 diff)
-
trunk/inc/default.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
globaliser/trunk/app/controllers/language-controller.php
r3202469 r3204097 3 3 namespace Globaliser; 4 4 5 use \WP_Query;6 7 5 class LanguageController extends Controller 8 6 { 9 7 private $service = null; 8 private $active_plugins = null; 10 9 11 10 public function __construct() 12 11 { 13 12 parent::__construct(); 13 $this->active_plugins = get_option('active_plugins'); 14 14 $this->main(); 15 15 } … … 17 17 public function main() 18 18 { 19 $active_plugins = get_option('active_plugins'); 19 $this->wpml_set_if_active(); 20 $this->polylang_set_if_active(); 21 } 20 22 21 // Polylang is active 22 if (in_array('polylang/polylang.php', $active_plugins)) { 23 private function polylang_set_if_active() 24 { 25 if (in_array(POLYLANG, $this->active_plugins)) { 23 26 $this->service = new PolylangService(); 24 27 } 25 26 if ($this->service !== null) $this->bind();27 28 } 28 29 29 private function bind()30 private function wpml_set_if_active() 30 31 { 31 $this->filter('rest_post_dispatch', 'restapi_totalpages_fix', 10, 3); 32 } 33 34 public function restapi_totalpages_fix($response, $server, $request) 35 { 36 return $this->service->restapi_totalpages_fix($response, $server, $request); 32 if (in_array(WPML, $this->active_plugins)) { 33 $this->service = new WpmlService(); 34 } 37 35 } 38 36 39 37 public function get_languages() 40 38 { 41 return $this->service ->get_languages();39 return $this->service === null ? null : $this->service->get_languages(); 42 40 } 43 41 } -
globaliser/trunk/app/models/general-model.php
r3202469 r3204097 20 20 function get_authors() 21 21 { 22 return $this->db->get_results("SELECT u.ID, u.user_login, COUNT(p.post_author) AS 'post_count' FROM wp_users as u INNER JOIN wp_posts as p ON u.ID = p.post_author WHERE p.post_type = 'post' AND p.post_status = 'publish' GROUP BY u.ID "); 22 $query = "SELECT u.ID, u.user_login, COUNT(p.post_author) AS 'post_count' FROM " . $this->db->prefix . "users as u " . 23 " INNER JOIN " . $this->db->prefix . "posts as p ON u.ID = p.post_author " . 24 " WHERE p.post_type = 'post' AND p.post_status = 'publish' " . 25 " GROUP BY u.ID "; 26 return $this->db->get_results($query); 23 27 } 24 28 } -
globaliser/trunk/app/services/polylang-service.php
r3202469 r3204097 5 5 use \WP_Query; 6 6 7 class PolylangService 7 class PolylangService extends Controller 8 8 { 9 function __construct() {} 9 private $plugin_info = null; 10 function __construct() 11 { 12 parent::__construct(); 13 $this->main(); 14 } 15 16 public function main() 17 { 18 $this->set_plugin_info(); 19 $this->filter('rest_post_dispatch', 'restapi_totalpages', 10, 3); 20 } 21 private function set_plugin_info() 22 { 23 require_once(ABSPATH . 'wp-admin/includes/plugin.php'); 24 $this->plugin_info = get_plugin_data(WP_PLUGIN_DIR . "/" . POLYLANG, false, false); 25 } 10 26 11 27 public function get_languages() 12 28 { 13 29 $data = []; 14 $languages_list = PLL()->model->get_languages_list();15 30 16 foreach ($languages_list as $lang) { 31 $languages = PLL()->model->get_languages_list(); 32 33 foreach ($languages as $lang) { 17 34 18 35 $lang->link = get_term_link($lang->term_id, 'language'); 19 $lang->plugin = 'polylang';20 $data[] = $lang;21 36 } 37 38 $data['plugin'] = 'polylang'; 39 $data['plugin_version'] = $this->plugin_info['Version']; 40 $data['languages'] = $languages; 22 41 23 42 return $data; 24 43 } 25 44 26 public function restapi_totalpages _fix($response, $server, $request)45 public function restapi_totalpages($response, $server, $request) 27 46 { 28 47 -
globaliser/trunk/constants/general.php
r3202469 r3204097 1 1 <?php 2 2 3 // If this file is called directly, abort. // 4 if (!defined('WPINC')) die; 3 namespace Globaliser; 5 4 6 5 global $wpdb; 7 6 8 define('G LOBALISER_TABLE_HOOKS', $wpdb->prefix . 'globaliser_hooks');7 define('Globaliser\GLOBALISER_TABLE_HOOKS', $wpdb->prefix . 'globaliser_hooks'); -
globaliser/trunk/constants/hooks-settings.php
r3202469 r3204097 1 1 <?php 2 2 3 // If this file is called directly, abort. // 4 if (!defined('WPINC')) die; 3 namespace Globaliser; 5 4 6 define('G LOBALISER_GENERAL_HOOKS', [5 define('Globaliser\GLOBALISER_GENERAL_HOOKS', [ 7 6 ['customize_save_after'], 8 7 ['wp_update_nav_menu'], … … 14 13 15 14 define( 16 'G LOBALISER_SETTINGS_HOOKS',15 'Globaliser\GLOBALISER_SETTINGS_HOOKS', 17 16 array( 18 17 'blogname', -
globaliser/trunk/globaliser.php
r3202469 r3204097 4 4 Plugin URI: https://www.globaliser.com/wordpress-hosting/ 5 5 Description: This plugin enables Globaliser Cloud Speed, Security, and Reliability features for WordPress sites. It is intended for Globaliser clients to ensure optimal performance and compatibility with Globaliser services. 6 Version: 0.9. 26 Version: 0.9.3 7 7 Author: Globaliser, Inc. 8 8 Author URI: https://www.globaliser.com -
globaliser/trunk/inc/default.php
r3202469 r3204097 19 19 require_once PLUGIN_PATH . '/constants/general.php'; 20 20 require_once PLUGIN_PATH . '/constants/hooks-settings.php'; 21 require_once PLUGIN_PATH . '/constants/plugins.php'; 21 22 22 23 // Helpers -
globaliser/trunk/readme.txt
r3202469 r3204097 5 5 License: GPLv2 or later 6 6 Tested up to: 6.7.1 7 Stable tag: 0.9. 27 Stable tag: 0.9.3 8 8 Requires PHP: 8.1 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 28 28 == Changelog == 29 29 30 = 0.9.3 = 31 * WPML support added. 32 30 33 = 0.9.2 = 31 34 * Bugfixes related to caching and polylang integration
Note: See TracChangeset
for help on using the changeset viewer.