Skip to content

Commit df962cf

Browse files
author
Chris Gårdenberg
committed
v1.0.3
1 parent a2a75a1 commit df962cf

4 files changed

Lines changed: 9 additions & 194 deletions

File tree

.official.plugin.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

eduadmin.php

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Plugin URI: http://www.eduadmin.se
88
* Description: EduAdmin plugin to allow visitors to book courses at your website
99
* Tags: booking, participants, courses, events, eduadmin, lega online
10-
* Version: 1.0.1
10+
* Version: 1.0.3
1111
* GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
1212
* GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
1313
* Requires at least: 3.0
@@ -155,10 +155,6 @@ private function includes() {
155155
include_once( 'includes/_textFunctions.php' );
156156
include_once( 'includes/_loginFunctions.php' );
157157

158-
if ( file_exists( EDUADMIN_PLUGIN_PATH . '/.official.plugin.php' ) ) {
159-
include_once( '.official.plugin.php' );
160-
}
161-
162158
$this->bookingHandler = new EduAdminBookingHandler( $this );
163159
$this->loginHandler = new EduAdminLoginHandler( $this );
164160
}
@@ -169,7 +165,6 @@ private function init_hooks() {
169165
add_action( 'after_switch_theme', array( $this, 'new_theme' ) );
170166
add_action( 'init', array( $this, 'init' ) );
171167
add_action( 'plugins_loaded', array( $this, 'load_language' ) );
172-
add_action( 'eduadmin_call_home', array( $this, 'call_home' ) );
173168
add_action( 'wp_footer', 'edu_getTimers' );
174169

175170
register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
@@ -187,22 +182,6 @@ public static function SetupWarning() {
187182
<?php
188183
}
189184

190-
public function get_plugin_version() {
191-
$cachedVersion = wp_cache_get( 'eduadmin-version', 'eduadmin' );
192-
if ( false !== $cachedVersion ) {
193-
return $cachedVersion;
194-
}
195-
196-
if ( ! function_exists( 'get_plugin_data' ) ) {
197-
require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
198-
}
199-
200-
$version = get_plugin_data( __FILE__ )['Version'];
201-
wp_cache_set( 'eduadmin-version', $version, 'eduadmin', 3600 );
202-
203-
return $version;
204-
}
205-
206185
/**
207186
* @return string Returns the users IP adress
208187
*/
@@ -217,29 +196,10 @@ public function get_ip_adress() {
217196
return "UNKNOWN";
218197
}
219198

220-
public function call_home() {
221-
global $wp_version;
222-
$usageData = array(
223-
'siteUrl' => get_site_url(),
224-
'siteName' => get_option( 'blogname' ),
225-
'wpVersion' => $wp_version,
226-
'token' => get_option( 'eduadmin-api-key' ),
227-
'officialVersion' => file_exists( EDUADMIN_PLUGIN_PATH . "/.official.plugin.php" ),
228-
'pluginVersion' => $this->get_plugin_version(),
229-
);
230-
231-
$callHomeUrl = 'https://ws10.multinet.se/edu-plugin/wp_phone_home.php';
232-
wp_remote_post( $callHomeUrl, array( 'body' => $usageData ) );
233-
}
234-
235199
public function load_language() {
236200
$locale = apply_filters( 'plugin_locale', get_locale(), 'eduadmin-booking' );
237201
load_textdomain( 'eduadmin-booking', WP_LANG_DIR . '/eduadmin/' . 'eduadmin-booking' . '-' . $locale . '.mo' );
238202
load_plugin_textdomain( 'eduadmin-booking', false, EDUADMIN_PLUGIN_PATH . '/languages' );
239-
240-
if ( ! wp_next_scheduled( 'eduadmin_call_home' ) ) {
241-
wp_schedule_event( time(), 'hourly', 'eduadmin_call_home' );
242-
}
243203
}
244204

245205
public function new_theme() {
@@ -248,7 +208,6 @@ public function new_theme() {
248208

249209
public function deactivate() {
250210
eduadmin_deactivate_rewrite();
251-
wp_clear_scheduled_hook( 'eduadmin_call_home' );
252211
}
253212
}
254213

includes/auto_update.php

Lines changed: 0 additions & 131 deletions
This file was deleted.

readme.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
=== EduAdmin Booking ===
2+
23
Contributors: mnchga
34
Tags: booking, participants, courses, events, eduadmin, lega online
45
Requires at least: 3.0
56
Tested up to: 4.8.3
6-
Stable tag: 1.0.2
7+
Stable tag: 1.0.3
78
Requires PHP: 5.0.1 (with SoapClient)
89
License: GPL3
910
License-URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -34,6 +35,9 @@ Requires at least PHP 5.0.1 (with [SoapClient](http://php.net/manual/en/book.soa
3435

3536
== Changelog ==
3637

38+
### [1.0.3]
39+
- Removing `.official.plugin` and `auto_update`, since we are running as a normal plugin now.
40+
3741
### [1.0.2]
3842
- Removing internal language files
3943
- Removing `README.md` and `CHANGELOG.md`, these live inside `readme.txt` (this file)
@@ -422,7 +426,9 @@ Requires at least PHP 5.0.1 (with [SoapClient](http://php.net/manual/en/book.soa
422426
#### Added
423427
- Added inquiry support in course
424428

425-
[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v1.0.1...HEAD
429+
[Unreleased]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v1.0.3...HEAD
430+
[1.0.3]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v1.0.2...v1.0.3
431+
[1.0.2]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v1.0.1...v1.0.2
426432
[1.0.1]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v1.0.0...v1.0.1
427433
[1.0.0]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.24...v1.0.0
428434
[0.10.24]: https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v0.10.23...v0.10.24

0 commit comments

Comments
 (0)