← All changes | weforms.php +63 -67 1.6.6 → 1.4.2 View file →

		@@ -1,12 +1,12 @@
1	1	<?php
2	2	/**
3	3	* Plugin Name: weForms
4	4	* Description: The best contact form plugin for WordPress
5		- * Plugin URI: https://weformspro.com/
6		- * Author: weForms
7		- * Author URI: https://weformspro.com/
8		- * Version: 1.6.6
	5	+ * Plugin URI: https://wedevs.com/weforms/
	6	+ * Author: weDevs
	7	+ * Author URI: https://wedevs.com/
	8	+ * Version: 1.4.2
9	9	* License: GPL2 or later
10	10	* License URI: https://www.gnu.org/licenses/gpl-2.0.html
11	11	* Text Domain: weforms
12	12	* Domain Path: /languages
		@@ -12,9 +12,9 @@
12	12	* Domain Path: /languages
13	13	*/
14	14
15	15	/**
16		- * Copyright (c) 2020 weForms LLC (email: support@weformspro.com). All rights reserved.
	16	+ * Copyright (c) 2017 weDevs LLC (email: info@wedevs.com). All rights reserved.
17	17	*
18	18	* Released under the GPL license
19	19	* http://www.opensource.org/licenses/gpl-license.php
20	20	*
		@@ -38,9 +38,9 @@
38	38	* **********************************************************************
39	39	*/
40	40
41	41	// don't call the file directly
42		-if ( !defined( 'ABSPATH' ) ) {
	42	+if ( ! defined( 'ABSPATH' ) ) {
43	43	exit;
44	44	}
45	45
46	46	/**
		@@ -54,9 +54,9 @@
54	54	* Plugin version
55	55	*
56	56	* @var string
57	57	*/
58		- public $version = '1.6.6';
	58	+ public $version = '1.4.2';
59	59
60	60	/**
61	61	* Form field value seperator
62	62	*
		@@ -61,9 +61,9 @@
61	61	* Form field value seperator
62	62	*
63	63	* @var string
64	64	*/
65		- public static $field_separator = '| ';
	65	+ static $field_separator = '| ';
66	66
67	67	/**
68	68	* Holds various class instances
69	69	*
		@@ -68,10 +68,11 @@
68	68	* Holds various class instances
69	69	*
70	70	* @var array
71	71	*/
72		- private $container = [];
	72	+ private $container = array();
73	73
	74	+
74	75	/**
75	76	* Minimum PHP version required
76	77	*
77	78	* @var string
		@@ -77,8 +78,9 @@
77	78	* @var string
78	79	*/
79	80	private $min_php = '5.6.0';
80	81
	82	+
81	83	/**
82	84	* Constructor for the WeForms class
83	85	*
84	86	* Sets up all the appropriate hooks and actions
		@@ -84,24 +86,22 @@
84	86	* Sets up all the appropriate hooks and actions
85	87	* within our plugin.
86	88	*/
87	89	public function __construct() {
	90	+
88	91	$this->define_constants();
89	92
90		- if ( !$this->is_supported_php() ) {
91		- register_activation_hook( __FILE__, [ $this, 'auto_deactivate' ] );
92		- add_action( 'admin_notices', [ $this, 'php_version_notice' ] );
93		-
	93	+ if ( ! $this->is_supported_php() ) {
	94	+ register_activation_hook( __FILE__, array( $this, 'auto_deactivate' ) );
	95	+ add_action( 'admin_notices', array( $this, 'php_version_notice' ) );
94	96	return;
95	97	}
96	98
97		- register_activation_hook( __FILE__, [ $this, 'activate' ] );
98		- register_deactivation_hook( __FILE__, [ $this, 'deactivate' ] );
	99	+ register_activation_hook( __FILE__, array( $this, 'activate' ) );
	100	+ register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
99	101
100		- add_action( 'admin_init', [ $this, 'plugin_upgrades' ] );
101		- add_action( 'plugins_loaded', [ $this, 'init_plugin' ] );
102		-
103		- $this->init_appsero();
	102	+ add_action( 'admin_init', array( $this, 'plugin_upgrades' ) );
	103	+ add_action( 'plugins_loaded', array( $this, 'init_plugin' ) );
104	104	}
105	105
106	106	/**
107	107	* Magic getter to bypass referencing plugin.
		@@ -137,10 +137,9 @@
137	137	*/
138	138	public static function init() {
139	139	static $instance = false;
140	140
141		- if ( !$instance ) {
142		- self::log();
	141	+ if ( ! $instance ) {
143	142	$instance = new WeForms();
144	143	}
145	144
146	145	return $instance;
		@@ -153,9 +152,9 @@
153	152	*/
154	153	private function define_constants() {
155	154	define( 'WEFORMS_VERSION', $this->version );
156	155	define( 'WEFORMS_FILE', __FILE__ );
157		- define( 'WEFORMS_ROOT', __DIR__ );
	156	+ define( 'WEFORMS_ROOT', dirname( __FILE__ ) );
158	157	define( 'WEFORMS_INCLUDES', WEFORMS_ROOT . '/includes' );
159	158	define( 'WEFORMS_ROOT_URI', plugins_url( '', __FILE__ ) );
160	159	define( 'WEFORMS_ASSET_URI', WEFORMS_ROOT_URI . '/assets' );
161	160	}
		@@ -165,8 +164,9 @@
165	164	*
166	165	* @return void
167	166	*/
168	167	public function init_plugin() {
	168	+
169	169	$this->includes();
170	170	$this->init_hooks();
171	171
172	172	do_action( 'weforms_loaded' );
		@@ -183,17 +183,17 @@
183	183	require_once WEFORMS_INCLUDES . '/class-field-manager.php';
184	184	require_once WEFORMS_INCLUDES . '/class-form-manager.php';
185	185	require_once WEFORMS_INCLUDES . '/class-template-manager.php';
186	186
187		- if ( !array_key_exists( 'fields', $this->container ) ) {
	187	+ if ( ! array_key_exists( 'fields', $this->container ) ) {
188	188	$this->container['fields'] = new WeForms_Field_Manager();
189	189	}
190	190
191		- if ( !array_key_exists( 'form', $this->container ) ) {
	191	+ if ( ! array_key_exists( 'form', $this->container ) ) {
192	192	$this->container['form'] = new WeForms_Form_Manager();
193	193	}
194	194
195		- if ( !array_key_exists( 'templates', $this->container ) ) {
	195	+ if ( ! array_key_exists( 'templates', $this->container ) ) {
196	196	$this->container['templates'] = new WeForms_Template_Manager();
197	197	}
198	198
199	199	$installer = new WeForms_Installer();
		@@ -205,8 +205,9 @@
205	205	*
206	206	* Nothing being called here yet.
207	207	*/
208	208	public function deactivate() {
	209	+
209	210	}
210	211
211	212	/**
212	213	* Include the required classes
		@@ -213,8 +214,9 @@
213	214	*
214	215	* @return void
215	216	*/
216	217	public function includes() {
	218	+
217	219	require_once WEFORMS_INCLUDES . '/compat/class-abstract-wpuf-integration.php';
218	220
219	221	if ( $this->is_request( 'admin' ) ) {
220	222	// compatibility
		@@ -227,12 +229,13 @@
227	229	require_once WEFORMS_INCLUDES . '/admin/class-pro-upgrades.php';
228	230	require_once WEFORMS_INCLUDES . '/admin/class-promotion.php';
229	231	require_once WEFORMS_INCLUDES . '/admin/class-shortcode-button.php';
230	232	require_once WEFORMS_INCLUDES . '/admin/class-privacy.php';
	233	+
231	234	} else {
232	235
233	236	// add reCaptcha library if not found
234		- if ( !function_exists( 'recaptcha_get_html' ) ) {
	237	+ if ( ! function_exists( 'recaptcha_get_html' ) ) {
235	238	require_once WEFORMS_INCLUDES . '/library/reCaptcha/recaptchalib.php';
236	239	require_once WEFORMS_INCLUDES . '/library/reCaptcha/recaptchalib_noCaptcha.php';
237	240	}
238	241	}
		@@ -241,8 +244,9 @@
241	244	require_once WEFORMS_INCLUDES . '/class-frontend-form.php';
242	245	}
243	246	require_once WEFORMS_INCLUDES . '/api/class-weforms-api-rest-controller.php';
244	247	require_once WEFORMS_INCLUDES . '/class-weforms-api.php';
	248	+ require_once WEFORMS_INCLUDES . '/admin/class-wedevs-insights.php';
245	249	require_once WEFORMS_INCLUDES . '/class-scripts-styles.php';
246	250	require_once WEFORMS_INCLUDES . '/admin/class-gutenblock.php';
247	251	require_once WEFORMS_INCLUDES . '/class-emailer.php';
248	252	require_once WEFORMS_INCLUDES . '/class-field-manager.php';
		@@ -269,10 +273,11 @@
269	273	* @since 1.1.2
270	274	*
271	275	* @return void
272	276	*/
273		- public function plugin_upgrades() {
274		- if ( !current_user_can( 'manage_options' ) ) {
	277	+ function plugin_upgrades() {
	278	+
	279	+ if ( ! current_user_can( 'manage_options' ) ) {
275	280	return;
276	281	}
277	282
278	283	require_once WEFORMS_INCLUDES . '/class-upgrades.php';
		@@ -291,15 +296,15 @@
291	296	*/
292	297	public function init_hooks() {
293	298
294	299	// Localize our plugin
295		- add_action( 'init', [ $this, 'localization_setup' ] );
	300	+ add_action( 'init', array( $this, 'localization_setup' ) );
296	301
297	302	// initialize the classes
298		- add_action( 'init', [ $this, 'init_classes' ] );
299		- add_action( 'init', [ $this, 'wpdb_table_shortcuts' ], 0 );
	303	+ add_action( 'init', array( $this, 'init_classes' ) );
	304	+ add_action( 'init', array( $this, 'wpdb_table_shortcuts' ), 0 );
300	305
301		- add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), [ $this, 'plugin_action_links' ] );
	306	+ add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
302	307	}
303	308
304	309	/**
305	310	* Set WPDB table shortcut names
		@@ -327,8 +332,9 @@
327	332	*
328	333	* @return void
329	334	*/
330	335	public function init_classes() {
	336	+
331	337	if ( $this->is_request( 'admin' ) ) {
332	338	$this->container['admin'] = new WeForms_Admin();
333	339	// $this->container['welcome'] = new WeForms_Admin_Welcome();
334	340	$this->container['templates'] = new WeForms_Template_Manager();
		@@ -341,8 +347,9 @@
341	347	if ( $this->is_request( 'frontend' ) || $this->is_request( 'ajax' ) ) {
342	348	$this->container['frontend'] = new WeForms_Frontend_Form();
343	349	}
344	350
	351	+ $this->container['insights'] = new WeDevs_Insights( 'weforms', 'weForms', __FILE__ );
345	352	$this->container['emailer'] = new WeForms_Emailer();
346	353	$this->container['form'] = new WeForms_Form_Manager();
347	354	$this->container['fields'] = new WeForms_Field_Manager();
348	355	$this->container['integrations'] = new WeForms_Integration_Manager();
		@@ -363,22 +370,18 @@
363	370	/**
364	371	* The main logging function
365	372	*
366	373	* @uses error_log
367		- *
368	374	* @param string $type type of the error. e.g: debug, error, info
369	375	* @param string $msg
370	376	*/
371	377	public static function log( $type = '', $msg = '' ) {
372	378
373		- if(file_exists(WP_CONTENT_DIR . '/weforms.log')){
374		- unlink(WP_CONTENT_DIR . '/weforms.log');
375		- }
376		- return;
377	379	// default we are turning the debug mood on, but can be turned off
378		- if ( defined( 'WEFORMS_DEBUG_LOG' ) && false === WEFORMS_DEBUG_LOG ) {
379		- return;
	380	+ if ( defined( 'WEFORMS_DEBUG_LOG' ) && false === WEFORMS_DEBUG_LOG ) {
	381	+ return;
380	382	}
	383	+
381	384	$msg = sprintf( "[%s][%s] %s\n", date( 'd.m.Y h:i:s' ), $type, $msg );
382	385	@error_log( $msg, 3, weforms_log_file_path() );
383	386	}
384	387
		@@ -384,14 +387,15 @@
384	387
385	388	/**
386	389	* Plugin action links
387	390	*
388		- * @param array $links
	391	+ * @param array $links
389	392	*
390	393	* @return array
391	394	*/
392		- public function plugin_action_links( $links ) {
393		- $links[] = '<a href="https://weformspro.com/?utm_source=weforms-action-link&utm_medium=textlink&utm_campaign=plugin-docs-link" target="_blank">' . __( 'Docs', 'weforms' ) . '</a>';
	395	+ function plugin_action_links( $links ) {
	396	+
	397	+ $links[] = '<a href="https://wedevs.com/docs/weforms/?utm_source=weforms-action-link&utm_medium=textlink&utm_campaign=plugin-docs-link" target="_blank">' . __( 'Docs', 'weforms' ) . '</a>';
394	398	$links[] = '<a href="' . admin_url( 'admin.php?page=weforms' ) . '">' . __( 'Settings', 'weforms' ) . '</a>';
395	399
396	400	return $links;
397	401	}
		@@ -401,11 +405,12 @@
401	405	*
402	406	* @return bool
403	407	*/
404	408	public function is_supported_php( $min_php = null ) {
	409	+
405	410	$min_php = $min_php ? $min_php : $this->min_php;
406	411
407		- if ( version_compare( PHP_VERSION, $min_php, '<=' ) ) {
	412	+ if ( version_compare( PHP_VERSION, $min_php , '<=' ) ) {
408	413	return false;
409	414	}
410	415
411	416	return true;
		@@ -415,17 +420,19 @@
415	420	* Show notice about PHP version
416	421	*
417	422	* @return void
418	423	*/
419		- public function php_version_notice() {
420		- if ( $this->is_supported_php() || !current_user_can( 'manage_options' ) ) {
	424	+ function php_version_notice() {
	425	+
	426	+ if ( $this->is_supported_php() || ! current_user_can( 'manage_options' ) ) {
421	427	return;
422	428	}
423	429
424	430	$error = __( 'Your installed PHP Version is: ', 'weforms' ) . PHP_VERSION . '. ';
425		- $error .= __( 'The <strong>weForms</strong> plugin requires PHP version <strong>', 'weforms' ) . $this->min_php . __( '</strong> or greater.', 'weforms' ); ?>
	431	+ $error .= __( 'The <strong>weForms</strong> plugin requires PHP version <strong>', 'weforms' ) . $this->min_php . __( '</strong> or greater.', 'weforms' );
	432	+ ?>
426	433	<div class="error">
427		- <p><?php printf( wp_kses_post ( $error ) ); ?></p>
	434	+ <p><?php printf( $error ); ?></p>
428	435	</div>
429	436	<?php
430	437	}
431	438
		@@ -433,9 +440,9 @@
433	440	* Bail out if the php version is lower than
434	441	*
435	442	* @return void
436	443	*/
437		- public function auto_deactivate() {
	444	+ function auto_deactivate() {
438	445	if ( $this->is_supported_php() ) {
439	446	return;
440	447	}
441	448
		@@ -446,9 +453,9 @@
446	453	$error .= __( '<p>The <strong>weforms</strong> plugin requires PHP version <strong>', 'weforms' ) . $this->min_php . __( '</strong> or greater', 'weforms' );
447	454	$error .= __( '<p>The version of your PHP is ', 'weforms' ) . '<a href="http://php.net/supported-versions.php" target="_blank"><strong>' . __( 'unsupported and old', 'weforms' ) . '</strong></a>.';
448	455	$error .= __( 'You should update your PHP software or contact your host regarding this matter.</p>', 'weforms' );
449	456
450		- wp_die( wp_kses_post( $error ), esc_html_e( 'Plugin Activation Error', 'weforms' ), [ 'back_link' => true ] );
	457	+ wp_die( $error, __( 'Plugin Activation Error', 'weforms' ), array( 'back_link' => true ) );
451	458	}
452	459
453	460	/**
454	461	* What type of request is this?
		@@ -454,44 +461,33 @@
454	461	* What type of request is this?
455	462	*
456	463	* @since 1.2.3
457	464	*
458		- * @param string $type admin, ajax, cron, api or frontend
	465	+ * @param string $type admin, ajax, cron, api or frontend.
459	466	*
460	467	* @return bool
461	468	*/
462	469	private function is_request( $type ) {
	470	+
463	471	switch ( $type ) {
464		- case 'admin':
	472	+ case 'admin' :
465	473	return is_admin();
466	474
467		- case 'ajax':
	475	+ case 'ajax' :
468	476	return defined( 'DOING_AJAX' );
469	477
470		- case 'cron':
	478	+ case 'cron' :
471	479	return defined( 'DOING_CRON' );
472	480
473	481	case 'api':
474	482	return defined( 'REST_REQUEST' );
475	483
476		- case 'frontend':
477		- return ( !is_admin() || defined( 'DOING_AJAX' ) ) && !defined( 'DOING_CRON' );
	484	+ case 'frontend' :
	485	+ return ( ! is_admin() || defined( 'DOING_AJAX' ) ) && ! defined( 'DOING_CRON' );
478	486	}
479	487	}
480	488
481		- /**
482		- * Init appsero tracker
483		- */
484		- private function init_appsero() {
485		- if ( ! class_exists( 'Appsero\Client' ) ) {
486		- require_once WEFORMS_INCLUDES . '/library/appsero/Client.php';
487		- }
488	489
489		- $client = new Appsero\Client( '213fd70e-0bf3-4710-a35e-934b5a376e13', 'weForms', __FILE__ );
490		-
491		- // Active insights
492		- $client->insights()->init();
493		- }
494	490	} // WeForms
495	491
496	492	/**
497	493	* Initialize the plugin