← All changes | weforms.php +64 -66 1.6.17 → 1.4.1 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.17
	5	+ * Plugin URI: https://wedevs.com/weforms/
	6	+ * Author: weDevs
	7	+ * Author URI: https://wedevs.com/
	8	+ * Version: 1.4.1
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.17';
	58	+ public $version = '1.4.1';
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,17 +68,19 @@
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
78	79	*/
79		- private $min_php = '5.6.0';
	80	+ private $min_php = '5.4.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,22 +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	+ add_action( 'admin_init', array( $this, 'plugin_upgrades' ) );
	103	+ add_action( 'plugins_loaded', array( $this, 'init_plugin' ) );
102	104	}
103	105
104	106	/**
105	107	* Magic getter to bypass referencing plugin.
		@@ -135,10 +137,9 @@
135	137	*/
136	138	public static function init() {
137	139	static $instance = false;
138	140
139		- if ( !$instance ) {
140		- self::log();
	141	+ if ( ! $instance ) {
141	142	$instance = new WeForms();
142	143	}
143	144
144	145	return $instance;
		@@ -151,9 +152,9 @@
151	152	*/
152	153	private function define_constants() {
153	154	define( 'WEFORMS_VERSION', $this->version );
154	155	define( 'WEFORMS_FILE', __FILE__ );
155		- define( 'WEFORMS_ROOT', __DIR__ );
	156	+ define( 'WEFORMS_ROOT', dirname( __FILE__ ) );
156	157	define( 'WEFORMS_INCLUDES', WEFORMS_ROOT . '/includes' );
157	158	define( 'WEFORMS_ROOT_URI', plugins_url( '', __FILE__ ) );
158	159	define( 'WEFORMS_ASSET_URI', WEFORMS_ROOT_URI . '/assets' );
159	160	}
		@@ -163,8 +164,9 @@
163	164	*
164	165	* @return void
165	166	*/
166	167	public function init_plugin() {
	168	+
167	169	$this->includes();
168	170	$this->init_hooks();
169	171
170	172	do_action( 'weforms_loaded' );
		@@ -181,17 +183,17 @@
181	183	require_once WEFORMS_INCLUDES . '/class-field-manager.php';
182	184	require_once WEFORMS_INCLUDES . '/class-form-manager.php';
183	185	require_once WEFORMS_INCLUDES . '/class-template-manager.php';
184	186
185		- if ( !array_key_exists( 'fields', $this->container ) ) {
	187	+ if ( ! array_key_exists( 'fields', $this->container ) ) {
186	188	$this->container['fields'] = new WeForms_Field_Manager();
187	189	}
188	190
189		- if ( !array_key_exists( 'form', $this->container ) ) {
	191	+ if ( ! array_key_exists( 'form', $this->container ) ) {
190	192	$this->container['form'] = new WeForms_Form_Manager();
191	193	}
192	194
193		- if ( !array_key_exists( 'templates', $this->container ) ) {
	195	+ if ( ! array_key_exists( 'templates', $this->container ) ) {
194	196	$this->container['templates'] = new WeForms_Template_Manager();
195	197	}
196	198
197	199	$installer = new WeForms_Installer();
		@@ -203,8 +205,9 @@
203	205	*
204	206	* Nothing being called here yet.
205	207	*/
206	208	public function deactivate() {
	209	+
207	210	}
208	211
209	212	/**
210	213	* Include the required classes
		@@ -211,8 +214,9 @@
211	214	*
212	215	* @return void
213	216	*/
214	217	public function includes() {
	218	+
215	219	require_once WEFORMS_INCLUDES . '/compat/class-abstract-wpuf-integration.php';
216	220
217	221	if ( $this->is_request( 'admin' ) ) {
218	222	// compatibility
		@@ -225,12 +229,13 @@
225	229	require_once WEFORMS_INCLUDES . '/admin/class-pro-upgrades.php';
226	230	require_once WEFORMS_INCLUDES . '/admin/class-promotion.php';
227	231	require_once WEFORMS_INCLUDES . '/admin/class-shortcode-button.php';
228	232	require_once WEFORMS_INCLUDES . '/admin/class-privacy.php';
	233	+
229	234	} else {
230	235
231	236	// add reCaptcha library if not found
232		- if ( !function_exists( 'recaptcha_get_html' ) ) {
	237	+ if ( ! function_exists( 'recaptcha_get_html' ) ) {
233	238	require_once WEFORMS_INCLUDES . '/library/reCaptcha/recaptchalib.php';
234	239	require_once WEFORMS_INCLUDES . '/library/reCaptcha/recaptchalib_noCaptcha.php';
235	240	}
236	241	}
		@@ -239,8 +244,9 @@
239	244	require_once WEFORMS_INCLUDES . '/class-frontend-form.php';
240	245	}
241	246	require_once WEFORMS_INCLUDES . '/api/class-weforms-api-rest-controller.php';
242	247	require_once WEFORMS_INCLUDES . '/class-weforms-api.php';
	248	+ require_once WEFORMS_INCLUDES . '/admin/class-wedevs-insights.php';
243	249	require_once WEFORMS_INCLUDES . '/class-scripts-styles.php';
244	250	require_once WEFORMS_INCLUDES . '/admin/class-gutenblock.php';
245	251	require_once WEFORMS_INCLUDES . '/class-emailer.php';
246	252	require_once WEFORMS_INCLUDES . '/class-field-manager.php';
		@@ -267,10 +273,11 @@
267	273	* @since 1.1.2
268	274	*
269	275	* @return void
270	276	*/
271		- public function plugin_upgrades() {
272		- if ( !current_user_can( 'manage_options' ) ) {
	277	+ function plugin_upgrades() {
	278	+
	279	+ if ( ! current_user_can( 'manage_options' ) ) {
273	280	return;
274	281	}
275	282
276	283	require_once WEFORMS_INCLUDES . '/class-upgrades.php';
		@@ -289,15 +296,15 @@
289	296	*/
290	297	public function init_hooks() {
291	298
292	299	// Localize our plugin
293		- add_action( 'init', [ $this, 'localization_setup' ] );
	300	+ add_action( 'init', array( $this, 'localization_setup' ) );
294	301
295	302	// initialize the classes
296		- add_action( 'init', [ $this, 'init_classes' ] );
297		- 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 );
298	305
299		- 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' ) );
300	307	}
301	308
302	309	/**
303	310	* Set WPDB table shortcut names
		@@ -325,8 +332,9 @@
325	332	*
326	333	* @return void
327	334	*/
328	335	public function init_classes() {
	336	+
329	337	if ( $this->is_request( 'admin' ) ) {
330	338	$this->container['admin'] = new WeForms_Admin();
331	339	// $this->container['welcome'] = new WeForms_Admin_Welcome();
332	340	$this->container['templates'] = new WeForms_Template_Manager();
		@@ -339,8 +347,9 @@
339	347	if ( $this->is_request( 'frontend' ) || $this->is_request( 'ajax' ) ) {
340	348	$this->container['frontend'] = new WeForms_Frontend_Form();
341	349	}
342	350
	351	+ $this->container['insights'] = new WeDevs_Insights( 'weforms', 'weForms', __FILE__ );
343	352	$this->container['emailer'] = new WeForms_Emailer();
344	353	$this->container['form'] = new WeForms_Form_Manager();
345	354	$this->container['fields'] = new WeForms_Field_Manager();
346	355	$this->container['integrations'] = new WeForms_Integration_Manager();
		@@ -361,22 +370,18 @@
361	370	/**
362	371	* The main logging function
363	372	*
364	373	* @uses error_log
365		- *
366	374	* @param string $type type of the error. e.g: debug, error, info
367	375	* @param string $msg
368	376	*/
369	377	public static function log( $type = '', $msg = '' ) {
370	378
371		- if(file_exists(WP_CONTENT_DIR . '/weforms.log')){
372		- unlink(WP_CONTENT_DIR . '/weforms.log');
373		- }
374		- return;
375	379	// default we are turning the debug mood on, but can be turned off
376		- if ( defined( 'WEFORMS_DEBUG_LOG' ) && false === WEFORMS_DEBUG_LOG ) {
377		- return;
	380	+ if ( defined( 'WEFORMS_DEBUG_LOG' ) && false === WEFORMS_DEBUG_LOG ) {
	381	+ return;
378	382	}
	383	+
379	384	$msg = sprintf( "[%s][%s] %s\n", date( 'd.m.Y h:i:s' ), $type, $msg );
380	385	@error_log( $msg, 3, weforms_log_file_path() );
381	386	}
382	387
		@@ -382,14 +387,15 @@
382	387
383	388	/**
384	389	* Plugin action links
385	390	*
386		- * @param array $links
	391	+ * @param array $links
387	392	*
388	393	* @return array
389	394	*/
390		- public function plugin_action_links( $links ) {
391		- $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>';
392	398	$links[] = '<a href="' . admin_url( 'admin.php?page=weforms' ) . '">' . __( 'Settings', 'weforms' ) . '</a>';
393	399
394	400	return $links;
395	401	}
		@@ -399,11 +405,12 @@
399	405	*
400	406	* @return bool
401	407	*/
402	408	public function is_supported_php( $min_php = null ) {
	409	+
403	410	$min_php = $min_php ? $min_php : $this->min_php;
404	411
405		- if ( version_compare( PHP_VERSION, $min_php, '<=' ) ) {
	412	+ if ( version_compare( PHP_VERSION, $min_php , '<=' ) ) {
406	413	return false;
407	414	}
408	415
409	416	return true;
		@@ -413,17 +420,19 @@
413	420	* Show notice about PHP version
414	421	*
415	422	* @return void
416	423	*/
417		- public function php_version_notice() {
418		- 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' ) ) {
419	427	return;
420	428	}
421	429
422	430	$error = __( 'Your installed PHP Version is: ', 'weforms' ) . PHP_VERSION . '. ';
423		- $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	+ ?>
424	433	<div class="error">
425		- <p><?php printf( wp_kses_post ( $error ) ); ?></p>
	434	+ <p><?php printf( $error ); ?></p>
426	435	</div>
427	436	<?php
428	437	}
429	438
		@@ -431,9 +440,9 @@
431	440	* Bail out if the php version is lower than
432	441	*
433	442	* @return void
434	443	*/
435		- public function auto_deactivate() {
	444	+ function auto_deactivate() {
436	445	if ( $this->is_supported_php() ) {
437	446	return;
438	447	}
439	448
		@@ -444,9 +453,9 @@
444	453	$error .= __( '<p>The <strong>weforms</strong> plugin requires PHP version <strong>', 'weforms' ) . $this->min_php . __( '</strong> or greater', 'weforms' );
445	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>.';
446	455	$error .= __( 'You should update your PHP software or contact your host regarding this matter.</p>', 'weforms' );
447	456
448		- 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 ) );
449	458	}
450	459
451	460	/**
452	461	* What type of request is this?
		@@ -452,44 +461,33 @@
452	461	* What type of request is this?
453	462	*
454	463	* @since 1.2.3
455	464	*
456		- * @param string $type admin, ajax, cron, api or frontend
	465	+ * @param string $type admin, ajax, cron, api or frontend.
457	466	*
458	467	* @return bool
459	468	*/
460	469	private function is_request( $type ) {
	470	+
461	471	switch ( $type ) {
462		- case 'admin':
	472	+ case 'admin' :
463	473	return is_admin();
464	474
465		- case 'ajax':
	475	+ case 'ajax' :
466	476	return defined( 'DOING_AJAX' );
467	477
468		- case 'cron':
	478	+ case 'cron' :
469	479	return defined( 'DOING_CRON' );
470	480
471	481	case 'api':
472	482	return defined( 'REST_REQUEST' );
473	483
474		- case 'frontend':
475		- return ( !is_admin() || defined( 'DOING_AJAX' ) ) && !defined( 'DOING_CRON' );
	484	+ case 'frontend' :
	485	+ return ( ! is_admin() || defined( 'DOING_AJAX' ) ) && ! defined( 'DOING_CRON' );
476	486	}
477	487	}
478	488
479		- /**
480		- * Init appsero tracker
481		- */
482		- private function init_appsero() {
483		- if ( ! class_exists( 'Appsero\Client' ) ) {
484		- require_once WEFORMS_INCLUDES . '/library/appsero/Client.php';
485		- }
486	489
487		- $client = new Appsero\Client( '213fd70e-0bf3-4710-a35e-934b5a376e13', 'weForms', __FILE__ );
488		-
489		- // Active insights
490		- $client->insights()->init();
491		- }
492	490	} // WeForms
493	491
494	492	/**
495	493	* Initialize the plugin