← All changes | import-users.php +43 -25 1.2.1 → trunk View file →

		@@ -1,20 +1,39 @@
1	1	<?php
2		-/********************************************************************************************
	2	+
	3	+/**
	4	+ * Import Users.
	5	+ *
	6	+ * Import Users plugin file.
	7	+ *
	8	+ * @package Smackcoders\SMUSERS
	9	+ * @copyright Copyright (C) 2010-2020, Smackcoders Inc - info@smackcoders.com
	10	+ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License, version 3 or higher
	11	+ *
	12	+ * @wordpress-plugin
3	13	* Plugin Name: Import Users
4		- * Description: Seamlessly create users and import from your CSV data with ease.
5		- * Version: 1.2.1
	14	+ * Description: Seamlessly create users and import from your CSV data with ease.
	15	+ * Version: 2.0
6	16	* Text Domain: Import-Users
7	17	* Domain Path: /languages
8	18	* Author: Smackcoders
9		- * Plugin URI: https://goo.gl/kKWPui
10		- * Author URI: https://goo.gl/kKWPui
	19	+ * Plugin URI: https://www.smackcoders.com/wp-ultimate-csv-importer-pro.html
	20	+ * Author URI: https://www.smackcoders.com/wordpress.html
	21	+ * License: GPL v3
11	22	*
12		- * Copyright (C) Smackcoders. - All Rights Reserved under Smackcoders Proprietary License
13		- * Unauthorized copying of this file, via any medium is strictly prohibited
14		- * Proprietary and confidential
15		- * You can contact Smackcoders at email address info@smackcoders.com.
16		- *******************************************************************************************/
	23	+ * This program is free software: you can redistribute it and/or modify
	24	+ * it under the terms of the GNU General Public License as published by
	25	+ * the Free Software Foundation, either version 3 of the License, or
	26	+ * (at your option) any later version.
	27	+ *
	28	+ * This program is distributed in the hope that it will be useful,
	29	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	30	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	31	+ * GNU General Public License for more details.
	32	+ *
	33	+ * You should have received a copy of the GNU General Public License
	34	+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
	35	+ */
17	36
18	37	namespace Smackcoders\SMUSERS;
19	38
20	39	if ( ! defined( 'ABSPATH' ) )
		@@ -19,21 +38,24 @@
19	38
20	39	if ( ! defined( 'ABSPATH' ) )
21	40	exit; // Exit if accessed directly
22	41
23		-require_once('SmackImportUserPlugin.php');
24		-require_once('SmackImportUserInstall.php');
25		-require_once('importExtensions/UsersImport.php');
26		-require_once('importExtensions/MediaHandling.php');
27		-require_once('importExtensions/BSIImport.php');
28		-require_once('importExtensions/ImportHelpers.php');
29		-require_once('importExtensions/WPMembersImport.php');
30		-require_once('controllers/SendPassword.php');
	42	+require_once __DIR__ . '/SmackImportUserPlugin.php';
	43	+require_once __DIR__ . '/SmackImportUserInstall.php';
	44	+require_once __DIR__ . '/importExtensions/UsersImport.php';
	45	+require_once __DIR__ . '/importExtensions/MediaHandling.php';
	46	+require_once __DIR__ . '/importExtensions/BSIImport.php';
	47	+require_once __DIR__ . '/importExtensions/ImportHelpers.php';
	48	+require_once __DIR__ . '/importExtensions/BuddyImport.php';
	49	+require_once __DIR__ . '/importExtensions/WPMembersImport.php';
	50	+require_once __DIR__ . '/importExtensions/MultiroleImport.php';
31	51
	52	+require_once __DIR__ . '/controllers/SendPassword.php';
	53	+
32	54	class UserCSVHandler extends UsersImport{
33	55
34	56	private static $instance = null,$install;
35		- public $version = '1.2.1';
	57	+ public $version = '2.0';
36	58
37	59	public function __construct(){
38	60	$this->plugin = Plugin::getInstance();
39	61	}
		@@ -55,12 +77,12 @@
55	77	return UserCSVHandler::$instance;
56	78	}
57	79
58	80	public static function init_hooks() {
59		- add_action( 'admin_notices', self::admin_notice_importuser() );
	81	+ add_action( 'admin_notices', array(UserCSVHandler::$instance,'admin_notice_importuser'));
60	82	}
61	83
62		- public function admin_notice_importuser() {
	84	+ public static function admin_notice_importuser() {
63	85	global $pagenow;
64	86	$active_plugins = get_option( "active_plugins" );
65	87	if ( $pagenow == 'plugins.php' && !in_array('wp-ultimate-csv-importer/wp-ultimate-csv-importer.php', $active_plugins) ) {
66	88	?>
		@@ -76,14 +98,10 @@
76	98	* Init UserSmCSVHandlerPro when WordPress Initialises.
77	99	*/
78	100	public function init() {
79	101	if(is_admin()) :
80		- // Init action.
81	102	do_action( 'uci_init' );
82	103	if(is_admin()) {
83		-#$this->includes();
84		- //SmUCIUserAdminAjax::smuci_ajax_events();
85		-# Removed: De-Register the media sizes
86	104	}
87	105	endif;
88	106	}
89	107	}