Skip to content

Commit 1a885eb

Browse files
committed
Work in progress.
1 parent 51499bd commit 1a885eb

29 files changed

+123
-134
lines changed

core/admin/GetBack.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin;
44

5-
use Dev4Press\v39\Core\Admin\GetBack as BaseGetBack;
5+
use Dev4Press\v42\Core\Admin\GetBack as BaseGetBack;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/admin/Panel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin;
44

5-
use Dev4Press\v39\Core\UI\Admin\Panel as BasePanel;
5+
use Dev4Press\v42\Core\UI\Admin\Panel as BasePanel;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/admin/Plugin.php

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin;
44

5-
use Dev4Press\v39\Core\Admin\Submenu\Plugin as BasePlugin;
5+
use Dev4Press\v42\Core\Admin\Submenu\Plugin as BasePlugin;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;
@@ -14,6 +14,7 @@ class Plugin extends BasePlugin {
1414
public $plugin_menu = 'GD Members Directory';
1515
public $plugin_title = 'GD Members Directory for bbPress';
1616

17+
public $buy_me_a_coffee = true;
1718
public $auto_mod_interface_colors = true;
1819
public $has_widgets = true;
1920

@@ -22,16 +23,6 @@ public function constructor() {
2223
$this->path = GDMED_PATH;
2324
}
2425

25-
public static function instance() : Plugin {
26-
static $instance = false;
27-
28-
if ( ! $instance ) {
29-
$instance = new Plugin();
30-
}
31-
32-
return $instance;
33-
}
34-
3526
public function after_setup_theme() {
3627
$this->setup_items = array(
3728
'install' => array(
@@ -86,6 +77,10 @@ public function settings() {
8677
return gdmed_settings();
8778
}
8879

80+
public function plugin() {
81+
return gdmed();
82+
}
83+
8984
public function settings_definitions() : Settings {
9085
return Settings::instance();
9186
}

core/admin/PostBack.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin;
44

5-
use Dev4Press\v39\Core\Admin\PostBack as BasePostBack;
5+
use Dev4Press\v42\Core\Admin\PostBack as BasePostBack;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;
@@ -16,17 +16,17 @@ protected function process() {
1616
}
1717

1818
protected function remove() {
19-
$data = $_POST['gdmedtools'];
19+
$data = $_POST[ 'gdmedtools' ];
2020

21-
$remove = isset( $data['remove'] ) ? (array) $data['remove'] : array();
21+
$remove = isset( $data[ 'remove' ] ) ? (array) $data[ 'remove' ] : array();
2222
$message = 'nothing-removed';
2323

2424
if ( ! empty( $remove ) ) {
25-
if ( isset( $remove['settings'] ) && $remove['settings'] == 'on' ) {
25+
if ( isset( $remove[ 'settings' ] ) && $remove[ 'settings' ] == 'on' ) {
2626
$this->a()->settings()->remove_plugin_settings_by_group( 'settings' );
2727
}
2828

29-
if ( isset( $remove['disable'] ) && $remove['disable'] == 'on' ) {
29+
if ( isset( $remove[ 'disable' ] ) && $remove[ 'disable' ] == 'on' ) {
3030
gdmed()->deactivate();
3131

3232
wp_redirect( admin_url( 'plugins.php' ) );

core/admin/Settings.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin;
44

5-
use Dev4Press\v39\Core\Options\Element as EL;
6-
use Dev4Press\v39\Core\Options\Settings as BaseSettings;
7-
use Dev4Press\v39\Core\Options\Type;
5+
use Dev4Press\v42\Core\Options\Element as EL;
6+
use Dev4Press\v42\Core\Options\Settings as BaseSettings;
7+
use Dev4Press\v42\Core\Options\Type;
88

99
if ( ! defined( 'ABSPATH' ) ) {
1010
exit;
@@ -112,14 +112,4 @@ protected function init() {
112112
)
113113
);
114114
}
115-
116-
public static function instance() : Settings {
117-
static $instance = false;
118-
119-
if ( ! $instance ) {
120-
$instance = new Settings();
121-
}
122-
123-
return $instance;
124-
}
125115
}

core/admin/panel/About.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin\Panel;
44

5-
use Dev4Press\v39\Core\UI\Admin\PanelAbout;
5+
use Dev4Press\v42\Core\UI\Admin\PanelAbout;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/admin/panel/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin\Panel;
44

5-
use Dev4Press\v39\Core\UI\Admin\PanelDashboard;
5+
use Dev4Press\v42\Core\UI\Admin\PanelDashboard;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/admin/panel/Settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin\Panel;
44

5-
use Dev4Press\v39\Core\UI\Admin\PanelSettings;
5+
use Dev4Press\v42\Core\UI\Admin\PanelSettings;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/admin/panel/Tools.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Admin\Panel;
44

5-
use Dev4Press\v39\Core\UI\Admin\PanelTools;
5+
use Dev4Press\v42\Core\UI\Admin\PanelTools;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;

core/basic/Information.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Dev4Press\Plugin\GDMED\Basic;
44

5-
use Dev4Press\v39\Core\Plugins\Information as BaseInformation;
5+
use Dev4Press\v42\Core\Plugins\Information as BaseInformation;
66

77
if ( ! defined( 'ABSPATH' ) ) {
88
exit;
@@ -11,12 +11,15 @@
1111
class Information extends BaseInformation {
1212
public $code = 'gd-members-directory-for-bbpress';
1313

14-
public $version = '2.4';
15-
public $build = 150;
14+
public $version = '2.5';
15+
public $build = 160;
1616
public $edition = 'free';
1717
public $status = 'stable';
18-
public $updated = '2023.02.14';
18+
public $updated = '2023.07.16';
1919
public $released = '2019.10.14';
2020

2121
public $is_bbpress_plugin = true;
22+
23+
public $github_url = 'https://github.com/dev4press/gd-members-directory-for-bbpress';
24+
public $wp_org_url = 'https://wordpress.org/plugins/gd-members-directory-for-bbpress/';
2225
}

0 commit comments

Comments
 (0)