Changeset 2482768
- Timestamp:
- 02/27/2021 06:31:32 PM (5 years ago)
- Location:
- monitor-chat
- Files:
-
- 34 added
- 1 deleted
- 7 edited
- 15 copied
-
tags/1.1.0/LICENSE.txt (added)
-
tags/1.1.0/about.php (added)
-
tags/1.1.0/assets (added)
-
tags/1.1.0/assets/css (added)
-
tags/1.1.0/assets/css/index.php (added)
-
tags/1.1.0/assets/index.php (added)
-
tags/1.1.0/assets/js (added)
-
tags/1.1.0/assets/js/index.php (added)
-
tags/1.1.0/functions (added)
-
tags/1.1.0/functions/index.php (added)
-
tags/1.1.0/functions/monitorchat_akismet.php (added)
-
tags/1.1.0/functions/monitorchat_general.php (added)
-
tags/1.1.0/functions/monitorchat_gwolle_guestbook.php (added)
-
tags/1.1.0/functions/monitorchat_linux.php (added)
-
tags/1.1.0/functions/monitorchat_updraft.php (added)
-
tags/1.1.0/functions/monitorchat_woocommerce.php (added)
-
tags/1.1.0/functions/monitorchat_wordpress.php (added)
-
tags/1.1.0/functions/monitorchat_wp_statistics.php (added)
-
tags/1.1.0/includes (added)
-
tags/1.1.0/includes/class-monitorchat-settings.php (added)
-
tags/1.1.0/includes/class-monitorchat.php (added)
-
tags/1.1.0/includes/index.php (added)
-
tags/1.1.0/includes/lib (added)
-
tags/1.1.0/includes/lib/class-monitorchat-admin-api.php (added)
-
tags/1.1.0/includes/lib/index.php (added)
-
tags/1.1.0/includes/lib/monitorchat_shortcodes_table.php (added)
-
tags/1.1.0/index.php (added)
-
tags/1.1.0/initialize.php (added)
-
tags/1.1.0/lang (added)
-
tags/1.1.0/lang/index.php (added)
-
tags/1.1.0/lang/monitorchat.pot (added)
-
tags/1.1.0/monitor-chat.php (added)
-
tags/1.1.0/readme.txt (added)
-
tags/1.1.0/uninstall.php (added)
-
tags/1.1.1 (copied) (copied from monitor-chat/trunk)
-
tags/1.1.1/LICENSE.txt (copied) (copied from monitor-chat/trunk/LICENSE.txt)
-
tags/1.1.1/about.php (copied) (copied from monitor-chat/trunk/about.php)
-
tags/1.1.1/assets (copied) (copied from monitor-chat/trunk/assets)
-
tags/1.1.1/functions (copied) (copied from monitor-chat/trunk/functions)
-
tags/1.1.1/functions/monitorchat_general.php (copied) (copied from monitor-chat/trunk/functions/monitorchat_general.php) (5 diffs)
-
tags/1.1.1/functions/monitorchat_woocommerce.php (modified) (2 diffs)
-
tags/1.1.1/functions/monitorchat_wordpress.php (modified) (1 diff)
-
tags/1.1.1/includes (copied) (copied from monitor-chat/trunk/includes)
-
tags/1.1.1/includes/class-monitorchat-settings.php (copied) (copied from monitor-chat/trunk/includes/class-monitorchat-settings.php)
-
tags/1.1.1/includes/class-monitorchat.php (copied) (copied from monitor-chat/trunk/includes/class-monitorchat.php)
-
tags/1.1.1/index.php (copied) (copied from monitor-chat/trunk/index.php)
-
tags/1.1.1/initialize.php (copied) (copied from monitor-chat/trunk/initialize.php)
-
tags/1.1.1/lang (copied) (copied from monitor-chat/trunk/lang)
-
tags/1.1.1/monitor-chat.php (copied) (copied from monitor-chat/trunk/monitor-chat.php) (2 diffs)
-
tags/1.1.1/monitorchat.php (deleted)
-
tags/1.1.1/readme.txt (copied) (copied from monitor-chat/trunk/readme.txt) (2 diffs)
-
tags/1.1.1/uninstall.php (copied) (copied from monitor-chat/trunk/uninstall.php)
-
trunk/functions/monitorchat_general.php (modified) (5 diffs)
-
trunk/functions/monitorchat_woocommerce.php (modified) (2 diffs)
-
trunk/functions/monitorchat_wordpress.php (modified) (1 diff)
-
trunk/monitor-chat.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
monitor-chat/tags/1.1.1/functions/monitorchat_general.php
r2482374 r2482768 12 12 // ########## GENERAL FUNCTIONS ########## 13 13 function monitorchat_display_apikey_report(){ 14 if (!current_user_can('activate_plugins')){ return null; } 14 15 $apikey=get_option('monitorchat_global_api_key'); 15 16 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); … … 21 22 } 22 23 function monitorchat_display_apikey_report_link(){ 24 if (!current_user_can('activate_plugins')){ return null; } 23 25 $apikey=get_option('monitorchat_global_api_key'); 24 26 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); 25 27 if($apikey != $last_valid_apikey){return null;} // just leave if not valid api key 26 return '<a href="#TB_inline?&width=500&height=500&inlineId=apikey-report" class="thickbox"> View API Key Report</a>';28 return '<a href="#TB_inline?&width=500&height=500&inlineId=apikey-report" class="thickbox">'.__('View API Key Report').'</a>'; 27 29 } 28 30 29 31 function monitorchat_register_session(){ 30 if( !session_id() )32 if( (!session_id()) && (current_user_can('activate_plugins')) ) 31 33 session_start(); 32 34 } … … 549 551 550 552 function monitorchat_populate_apikey_report(){ 553 if (!current_user_can('activate_plugins')){ return null; } // just leave if not an admin 551 554 $apikey=get_option('monitorchat_global_api_key'); 552 555 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); … … 555 558 if((!is_numeric($last_check))||(empty($last_check))){$last_check=0;} 556 559 $seconds_since_last=(time()-$last_check); 557 if($seconds_since_last < 900){return null;}560 if($seconds_since_last < 3600){return null;} // new report every hour, no more 558 561 559 562 $hostname=monitorchat_gethostname(); … … 604 607 // ########## INITIALIZE ########## 605 608 add_action('admin_head', 'monitorchat_custom_admin_styles'); 606 add_action('init','monitorchat_register_session'); 609 add_action('init','monitorchat_register_session'); // register a session for admins only 607 610 add_filter( 'cron_schedules', 'monitorchat_filter_cron_schedules' ); -
monitor-chat/tags/1.1.1/functions/monitorchat_woocommerce.php
r2475064 r2482768 28 28 global $woocommerce; 29 29 $currency = get_woocommerce_currency_symbol(); 30 if($currency == '$'){return '<DL>';} 31 if($currency == '£'){return '<PN>';} 32 if($currency == '€'){return '<EU>';} 33 if($currency == '¥'){return '<YN>';} 34 if($currency == '฿'){return '<BTC>';} 35 return ''; 30 36 } 31 37 … … 90 96 $order = wc_get_order( $order_id ); 91 97 $order_data = $order->get_data(); 92 $discount_total = $order_data['discount_total'];93 $total = $order_data['total'];98 $discount_total = monitorchat_woocommerce_currency_symbol().$order_data['discount_total']; 99 $total = monitorchat_woocommerce_currency_symbol().$order_data['total']; 94 100 $currency = $order_data['currency']; 95 101 if(!empty($order_data['shipping']['city'])){ -
monitor-chat/tags/1.1.1/functions/monitorchat_wordpress.php
r2476508 r2482768 138 138 139 139 if(!monitorchat_is_enabled('monitorchat_profile_update_enabled')){return;} // enabled or not? 140 140 if(!is_user_logged_in()){return;} // We don't want new registrations to trigger this 141 141 $current_user=wp_get_current_user(); 142 142 $exclude_role=get_option('monitorchat_profile_update_exclude'); -
monitor-chat/tags/1.1.1/monitor-chat.php
r2482374 r2482768 2 2 /** 3 3 * Plugin Name: Monitor.chat 4 * Version: 1.1. 04 * Version: 1.1.1 5 5 * Plugin URI: https://monitor.chat 6 6 * Description: Monitor Your Wordpress Website with XMPP Instant Messages! … … 24 24 } 25 25 26 define( 'MONITORCHAT_VERSION', '1.1. 0' );26 define( 'MONITORCHAT_VERSION', '1.1.1' ); 27 27 define( 'MONITORCHAT__MINIMUM_WP_VERSION', '4.0' ); 28 28 define( 'MONITORCHAT__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); -
monitor-chat/tags/1.1.1/readme.txt
r2482376 r2482768 5 5 Requires at least: 4.0 6 6 Tested up to: 5.6.1 7 Stable tag: 1.1. 07 Stable tag: 1.1.1 8 8 Requires PHP: 7.0 9 9 License: GPLv2 or later … … 58 58 59 59 == Changelog == 60 = 1.1.1 = 61 * Session variables only for administrators (can activate plugins) 62 * Currency symbol added to messages regarding Woocommerce orders 63 * Profile update message is no longer triggered for new accounts 64 60 65 = 1.1.0 = 61 66 * Hostname is now a value stored as a setting and can be edited -
monitor-chat/trunk/functions/monitorchat_general.php
r2482374 r2482768 12 12 // ########## GENERAL FUNCTIONS ########## 13 13 function monitorchat_display_apikey_report(){ 14 if (!current_user_can('activate_plugins')){ return null; } 14 15 $apikey=get_option('monitorchat_global_api_key'); 15 16 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); … … 21 22 } 22 23 function monitorchat_display_apikey_report_link(){ 24 if (!current_user_can('activate_plugins')){ return null; } 23 25 $apikey=get_option('monitorchat_global_api_key'); 24 26 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); 25 27 if($apikey != $last_valid_apikey){return null;} // just leave if not valid api key 26 return '<a href="#TB_inline?&width=500&height=500&inlineId=apikey-report" class="thickbox"> View API Key Report</a>';28 return '<a href="#TB_inline?&width=500&height=500&inlineId=apikey-report" class="thickbox">'.__('View API Key Report').'</a>'; 27 29 } 28 30 29 31 function monitorchat_register_session(){ 30 if( !session_id() )32 if( (!session_id()) && (current_user_can('activate_plugins')) ) 31 33 session_start(); 32 34 } … … 549 551 550 552 function monitorchat_populate_apikey_report(){ 553 if (!current_user_can('activate_plugins')){ return null; } // just leave if not an admin 551 554 $apikey=get_option('monitorchat_global_api_key'); 552 555 $last_valid_apikey=get_option('monitorchat_global_last_valid_apikey'); … … 555 558 if((!is_numeric($last_check))||(empty($last_check))){$last_check=0;} 556 559 $seconds_since_last=(time()-$last_check); 557 if($seconds_since_last < 900){return null;}560 if($seconds_since_last < 3600){return null;} // new report every hour, no more 558 561 559 562 $hostname=monitorchat_gethostname(); … … 604 607 // ########## INITIALIZE ########## 605 608 add_action('admin_head', 'monitorchat_custom_admin_styles'); 606 add_action('init','monitorchat_register_session'); 609 add_action('init','monitorchat_register_session'); // register a session for admins only 607 610 add_filter( 'cron_schedules', 'monitorchat_filter_cron_schedules' ); -
monitor-chat/trunk/functions/monitorchat_woocommerce.php
r2475064 r2482768 28 28 global $woocommerce; 29 29 $currency = get_woocommerce_currency_symbol(); 30 if($currency == '$'){return '<DL>';} 31 if($currency == '£'){return '<PN>';} 32 if($currency == '€'){return '<EU>';} 33 if($currency == '¥'){return '<YN>';} 34 if($currency == '฿'){return '<BTC>';} 35 return ''; 30 36 } 31 37 … … 90 96 $order = wc_get_order( $order_id ); 91 97 $order_data = $order->get_data(); 92 $discount_total = $order_data['discount_total'];93 $total = $order_data['total'];98 $discount_total = monitorchat_woocommerce_currency_symbol().$order_data['discount_total']; 99 $total = monitorchat_woocommerce_currency_symbol().$order_data['total']; 94 100 $currency = $order_data['currency']; 95 101 if(!empty($order_data['shipping']['city'])){ -
monitor-chat/trunk/functions/monitorchat_wordpress.php
r2476508 r2482768 138 138 139 139 if(!monitorchat_is_enabled('monitorchat_profile_update_enabled')){return;} // enabled or not? 140 140 if(!is_user_logged_in()){return;} // We don't want new registrations to trigger this 141 141 $current_user=wp_get_current_user(); 142 142 $exclude_role=get_option('monitorchat_profile_update_exclude'); -
monitor-chat/trunk/monitor-chat.php
r2482374 r2482768 2 2 /** 3 3 * Plugin Name: Monitor.chat 4 * Version: 1.1. 04 * Version: 1.1.1 5 5 * Plugin URI: https://monitor.chat 6 6 * Description: Monitor Your Wordpress Website with XMPP Instant Messages! … … 24 24 } 25 25 26 define( 'MONITORCHAT_VERSION', '1.1. 0' );26 define( 'MONITORCHAT_VERSION', '1.1.1' ); 27 27 define( 'MONITORCHAT__MINIMUM_WP_VERSION', '4.0' ); 28 28 define( 'MONITORCHAT__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); -
monitor-chat/trunk/readme.txt
r2482376 r2482768 5 5 Requires at least: 4.0 6 6 Tested up to: 5.6.1 7 Stable tag: 1.1. 07 Stable tag: 1.1.1 8 8 Requires PHP: 7.0 9 9 License: GPLv2 or later … … 58 58 59 59 == Changelog == 60 = 1.1.1 = 61 * Session variables only for administrators (can activate plugins) 62 * Currency symbol added to messages regarding Woocommerce orders 63 * Profile update message is no longer triggered for new accounts 64 60 65 = 1.1.0 = 61 66 * Hostname is now a value stored as a setting and can be edited
Note: See TracChangeset
for help on using the changeset viewer.