Fix register activation hook

#24
redbitcz · Oct 14, 2019 · 93f2abd · 93f2abd
1 parent 2e7631c
commit 93f2abd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/simpleshop-cz.php b/simpleshop-cz.php
@@ -21,8 +21,6 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-define( 'SIMPLESHOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'SIMPLESHOP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'SIMPLESHOP_PLUGIN_VERSION', 'dev-master' );
 define( 'SIMPLESHOP_PREFIX', '_ssc_' );
 

diff --git a/src/Admin.php b/src/Admin.php
@@ -16,10 +16,16 @@ class Admin {
 	 * @var Plugin
 	 */
 	private $loader;
+	/**
+	 * @var string
+	 */
+	private $pluginDirUrl;
 
 	public function __construct(Plugin $loader) {
 		$this->loader = $loader;
 
+		$this->pluginDirUrl = plugin_dir_url(__DIR__ . '/../');
+
 		add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
 		add_filter( 'manage_edit-ssc_group_columns', [ $this, 'ssc_group_columns' ] );
 		add_action( 'manage_ssc_group_posts_custom_column', [ $this, 'ssc_group_column_content' ], 10, 2 );
@@ -122,7 +128,7 @@ public function tiny_mce_new_buttons() {
 	 * @return mixed
 	 */
 	public function tiny_mce_add_buttons( $plugins ) {
-		$plugins['ssctinymceplugin'] = SIMPLESHOP_PLUGIN_URL . 'js/tiny-mce/tiny-mce.js';
+		$plugins['ssctinymceplugin'] = $this->pluginDirUrl . 'js/tiny-mce/tiny-mce.js';
 
 		return $plugins;
 	}
@@ -192,7 +198,7 @@ public function add_settings_page() {
             'manage_options',
             'simple_shop_settings',
 			[ $this, 'render_settings_page' ],
-            SIMPLESHOP_PLUGIN_URL . '/img/white_logo.png',
+			$this->pluginDirUrl . '/img/white_logo.png',
             99
 		);
 	}
@@ -230,7 +236,7 @@ public function ssc_group_column_content( $column, $post_id ) {
 	 * Enqueue admin scripts
 	 */
 	public function enqueue_admin_scripts() {
-		wp_enqueue_style( 'ssc', SIMPLESHOP_PLUGIN_URL . 'css/ssc.css' );
+		wp_enqueue_style( 'ssc', $this->pluginDirUrl . 'css/ssc.css' );
 		wp_register_style( 'jquery-ui', 'https://code.jquery.com/ui/1.11.2/themes/smoothness/jquery-ui.css' );
 		wp_enqueue_style( 'jquery-ui' );
 	}

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -28,15 +28,22 @@ class Plugin {
 	 */
 	private $access;
 
+	/**
+	 * @var string
+	 */
+	private $pluginDirPath;
+
 	public function __construct() {
 		$this->init();
 		$this->init_i18n();
 
+		$this->pluginDirPath = plugin_dir_path( __DIR__ . '/../' );
+
 		$this->secure_key = $this->load_api_key();
 		$this->email      = $this->load_email();
 
 		add_action( 'tgmpa_register', [ $this, 'register_required_plugins' ] );
-		register_activation_hook( __FILE__, [ $this, 'ssc_activation_hook' ] );
+		register_activation_hook( $this->pluginDirPath, [ $this, 'ssc_activation_hook' ] );
 	}
 
 	private function init() {
@@ -150,7 +157,7 @@ public function init_i18n() {
 	}
 
 	public function load_textdomain_i18n() {
-		$plugin_rel_path = str_replace( WP_PLUGIN_DIR . '/', '', SIMPLESHOP_PLUGIN_DIR . 'languages/' );
+		$plugin_rel_path     = str_replace( WP_PLUGIN_DIR . '/', '', $this->pluginDirPath . 'languages/' );
 		load_plugin_textdomain( 'simpleshop-cz', false, $plugin_rel_path );
 	}
 }