← All changes | taboola_widget.php +271 -282 3.0.0 → 2.2.3 View file →

		@@ -1,183 +1,155 @@
1	1	<?php
2	2	/**
3		- * Plugin Name: Taboola
4		- * Plugin URI: https://developers.taboola.com/web-integrations/docs/wordpress-plugin
5		- * Description: Taboola
6		- * Version: 3.0.0
7		- * Author: Taboola
	3	+ * Plugin Name: Taboola
	4	+ * Plugin URI: https://developers.taboola.com/web-integrations/docs/wordpress-plugin
	5	+ * Description: Taboola
	6	+ * Version: 2.2.3
	7	+ * Author: Taboola
8	8	*/
9	9
10		-define( 'TABOOLA_PLUGIN_VERSION', '3.0' ); // track every release
11		-define( 'TABOOLA_MIN_VER', '3.0' ); // bump only when DB changes
12		-define( 'TABOOLA_DEBUG_MODE', false );
	10	+define ("TABOOLA_PLUGIN_VERSION","2.2.3"); // => UPDATE THIS FOR *EVERY* RELEASE (USED FOR TRACKING)
	11	+define ("TABOOLA_MIN_VER","2.2.2"); // => UPDATE THIS *ONLY* IF THIS RELEASE HAS *DB CHANGES*
	12	+define ("TABOOLA_DEBUG_MODE", false); // => SET THIS TO 'FALSE' FOR *EVERY* RELEASE (USED TO SUPRESS DEBUGGING LOGS)
13	13
14		-define( 'TABOOLA_OPTION_NAME', 'taboola_plugin_version' );
	14	+define ("TABOOLA_OPTION_NAME","taboola_plugin_version"); // Note: if this release has DB changes, then the min version will be saved under 'taboola_plugin_version' in 'wp_options'.
15	15
16		-define( 'TABOOLA_XPATH_MARKER', '/' );
17		-define( 'TABOOLA_JS_INDICATOR', '{JS}' );
18		-define( 'TABOOLA_JS_MARKER', '{' );
19		-define( 'TABOOLA_CONTENT_FORMAT_STRING', 'string' );
20		-define( 'TABOOLA_CONTENT_FORMAT_SCRIPT', 'script' );
21		-define( 'TABOOLA_CONTENT_FORMAT_HTML', 'html' );
	16	+define ("TABOOLA_XPATH_MARKER","/");
	17	+define ("TABOOLA_JS_INDICATOR","{JS}");
	18	+define ("TABOOLA_JS_MARKER","{");
	19	+define ("TABOOLA_CONTENT_FORMAT_STRING",'string');
	20	+define ("TABOOLA_CONTENT_FORMAT_SCRIPT",'script');
	21	+define ("TABOOLA_CONTENT_FORMAT_HTML",'html');
22	22
23		-include_once 'widget.php';
24		-require_once 'JavaScriptWrapper.php';
25		-require_once plugin_dir_path( __FILE__ ) . 'simple_html_dom.php'; // ← NEW
26	23
27		-if ( ! class_exists( 'TaboolaWP' ) ) {
28		-class TaboolaWP {
	24	+include_once('widget.php');
	25	+require_once('JavaScriptWrapper.php');
29	26
30		- /* ─────────────────────────── properties ─────────────────────────── */
31		- public $data = [];
32		- public $_is_widget_on_page;
33		- public $_is_head_script_loaded = false;
34	27
35		- private $tpl_sw = 'importScripts("https://cdn.taboola.com/webpush/tsw.js");';
36		- private $msg_sw_error = <<<SWE
37		- <p>The file <code>sw.js</code> in the WP root is not writable.
38		- Please change its permissions or paste the code below manually:</p>
	28	+if (!class_exists('TaboolaWP')) {
	29	+ class TaboolaWP
	30	+ {
	31	+ //save internal data
	32	+ public $data = array();
	33	+ public $_is_widget_on_page;
	34	+ public $_is_head_script_loaded = false;
	35	+ private $tpl_sw = 'importScripts("https://cdn.taboola.com/webpush/tsw.js");';
	36	+
	37	+ private $msg_sw_error = <<<SWE
	38	+ <p>
	39	+ The file sw.js in the root directory of Wordpress is not writable.
	40	+ Please change its permissions and try again. Otherwise replace its contents manually:
	41	+ </p>
39	42	<pre><code>{{SW}}</code></pre>
40		- <p>Also make sure it's reachable at <code>{{DOMAIN}}/sw.js</code></p>
41		-SWE;
	43	+ <p>
	44	+ Also make sure that the file is accessible at {{DOMAIN}}/sw.js
	45	+ </p>
	46	+ SWE;
42	47
43		- public $plugin_name;
44		- public $plugin_directory;
45		- public $plugin_url;
46		- public $settings;
47		- public $tbl_taboola_settings;
	48	+ public $plugin_name;
	49	+ public $plugin_directory;
	50	+ public $plugin_url;
	51	+ public $settings;
	52	+ public $tbl_taboola_settings;
48	53
49		- /* ─────────────────────────── constructor ─────────────────────────── */
50		- public function __construct() {
51		- global $wpdb;
	54	+ public function __construct()
	55	+ {
	56	+ global $wpdb;
52	57
53		- define( 'TaboolaWP', true );
	58	+ //initialize plugin constant
	59	+ DEFINE('TaboolaWP', true);
54	60
55		- $this->_is_widget_on_page = false;
56		- $this->_is_head_script_loaded = false;
	61	+ $this->_is_widget_on_page = false;
	62	+ $this->_is_head_script_loaded = false;
57	63
58		- $this->plugin_name = plugin_basename( __FILE__ );
59		- $this->plugin_directory = plugin_dir_path( __FILE__ );
60		- $this->plugin_url = trailingslashit(
61		- WP_PLUGIN_URL . '/' . dirname( plugin_basename( __FILE__ ) )
62		- );
63		- $this->tbl_taboola_settings = $wpdb->prefix . '_taboola_settings';
64		- $this->settings = $wpdb->get_row(
65		- "SELECT * FROM {$this->tbl_taboola_settings} LIMIT 1"
66		- );
	64	+ $this->plugin_name = plugin_basename(__FILE__);
	65	+ $this->plugin_directory = plugin_dir_path(__FILE__);
	66	+ $this->plugin_url = trailingslashit(WP_PLUGIN_URL . '/' . dirname(plugin_basename(__FILE__)));
	67	+ $this->settings = $wpdb->get_row("select * from ".$wpdb->prefix."_taboola_settings limit 1");
67	68
68		- /* activation / upgrade */
69		- register_activation_hook( $this->plugin_name, [ $this, 'update_db' ] );
70		- add_action( 'admin_init', [ $this, 'update_db' ] );
	69	+ $this->tbl_taboola_settings = $wpdb->prefix . '_taboola_settings';
71	70
72		- /* widgets */
73		- if ( $this->settings && ! empty( $this->settings->publisher_id ) ) {
74		- add_action(
75		- 'widgets_init',
76		- static fn() => register_widget( 'WP_Widget_Taboola' )
77		- );
78		- }
	71	+ //activation function
	72	+ register_activation_hook($this->plugin_name, array(&$this, 'update_db'));
	73	+ add_action('admin_init', array(&$this, 'update_db'));
79	74
80		- /* admin vs front-end hooks */
81		- if ( is_admin() ) {
82		- add_action( 'admin_menu', [ $this, 'admin_generate_menu' ] );
83		- add_filter( 'plugin_action_links',
84		- [ $this, 'plugin_action_links' ], 10, 2 );
85		- } elseif ( $this->settings ) {
86		- /* loader & flush */
87		- add_action( 'wp_head', [ $this, 'taboola_header_loader_inject' ] );
88		- add_action( 'wp_footer', [ $this, 'taboola_footer_loader_js' ] );
	75	+ // Enable sidebar widgets
	76	+ if ($this->settings != NULL && !empty($this->settings->publisher_id)){
	77	+ //register Taboola widget
	78	+ add_action('widgets_init',
	79	+ function(){
	80	+ return register_widget("WP_Widget_Taboola");
	81	+ }
	82	+ );
	83	+ }
89	84
90		- /* content widgets */
91		- add_filter( 'the_content', [ $this, 'load_taboola_content' ] );
92		- add_filter( 'the_content', [ $this, 'load_taboola_content_mid' ] );
	85	+ //$this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled;
93	86
94		- /* full-page buffer – home & category */
95		- add_action( 'template_redirect', [ $this, 'tb_home_buffer_start' ], 0 );
96		- add_action( 'shutdown', [ $this, 'tb_home_buffer_flush' ], PHP_INT_MAX );
	87	+ if (is_admin()) {
	88	+ //add menu for plugin
	89	+ add_action( 'admin_menu', array(&$this, 'admin_generate_menu') );
	90	+ add_filter('plugin_action_links', array(&$this, 'plugin_action_links'), 10, 2 );
	91	+ }elseif ($this->settings != NULL){
	92	+ add_action('wp_head', array(&$this, 'taboola_header_loader_inject'));
	93	+ if (!empty($this->settings->publisher_id_push)) {
	94	+ add_action('wp_head', array(&$this, 'taboola_webpush_loader_js'));
97	95
98		- add_action( 'template_redirect', [ $this, 'tb_cat_buffer_start' ], 0 );
99		- add_action( 'shutdown', [ $this, 'tb_cat_buffer_flush' ], PHP_INT_MAX );
100		- }
101		- } // __construct
	96	+ $sw = 'sw.js';
	97	+ $sw_path = ABSPATH . $sw;
	98	+
	99	+ $content = file_exists($sw_path) ? file_get_contents($sw_path) : '';
	100	+
	101	+ if (strpos($content, $this->tpl_sw) === false) {
	102	+ if (!is_writable(ABSPATH) || (file_exists($sw_path) && !is_writable($sw_path))) {
	103	+ return $this->notice($this->msg_sw_error);
	104	+ }
	105	+ $content = $this->tpl_sw . PHP_EOL . $content;
	106	+ if (file_put_contents($sw_path, $content) === false) {
	107	+ return $this->notice($this->msg_sw_error);
	108	+ }
	109	+ }
	110	+ }
	111	+ add_action('wp_footer', array(&$this, 'taboola_footer_loader_js'));
	112	+ add_filter('the_content', array(&$this, 'load_taboola_content'));
	113	+ add_filter('the_content', array(&$this, 'load_taboola_content_mid'));
	114	+ //add_filter('the_content', array(&$this, 'load_taboola_content_home'));
	115	+ // add_filter('the_excerpt', array(&$this, 'load_taboola_content_home'));
	116	+ // Homepage widget – capture the full page, inject once.
	117	+ // Homepage widget – start buffering *before* anything else renders
	118	+ add_action( 'template_redirect', [ $this, 'tb_home_buffer_start' ], 0 );
102	119
	120	+ // Homepage widget – flush the buffer *after* literally everything else
	121	+ add_action( 'shutdown', [ $this, 'tb_home_buffer_flush' ], PHP_INT_MAX );
103	122
104		-/* ======================================================================
105		- CATEGORY ▸ should we show the widget?
106		- ====================================================================== */
107		-private function should_show_content_widget_category(): bool {
108		- return (
109		- trim( $this->settings->publisher_id ) !== '' &&
110		- ( is_category() || is_archive() || is_search() ) &&
111		- $this->settings->category_enabled &&
112		- trim( $this->settings->category_widget_id ) !== ''
113		- );
114		-}
115		-
116		-/* ----------------------------------------------------------------------
117		- HOMEPAGE ▸ full-page buffer
118		- -------------------------------------------------------------------- */
	123	+
	124	+ }
	125	+
	126	+ }
	127	+
	128	+ /* ------------------------------------------------------------------
	129	+ * HOMEPAGE WIDGET – full-page buffer
	130	+ * ----------------------------------------------------------------*/
119	131	public function tb_home_buffer_start() {
	132	+
	133	+ // Use the plug-in’s own logic to decide if the home widget is enabled
120	134	if ( $this->should_show_content_widget_home() ) {
121	135	ob_start( [ $this, 'tb_home_buffer_inject' ] );
122	136	}
123	137	}
	138	+
124	139	public function tb_home_buffer_inject( $html ) {
	140	+ //error_log( '🟢 Taboola buffer inject ran. HTML length = ' . strlen( $html ) ); // LOG #1
	141	+ // error_log( 'TB-DEBUG ① buffer inject, html len='.strlen($html) );
	142	+
	143	+ /*
	144	+ * load_taboola_content_home() already:
	145	+ * – reads your saved widget-ID, placement, selector & occurrence
	146	+ * – builds the HTML + JS
	147	+ * – calls embed_taboola_content_location_home() to place it
	148	+ */
125	149	return $this->load_taboola_content_home( $html );
126	150	}
127	151
128		-/* ----------------------------------------------------------------------
129		- CATEGORY ▸ buffer hooks
130		- -------------------------------------------------------------------- */
131		-public function tb_cat_buffer_start() {
132		- if ( $this->should_show_content_widget_category() ) {
133		- ob_start( [ $this, 'tb_cat_buffer_inject' ] );
134		- }
135		-}
136		-public function tb_cat_buffer_inject( $html ) {
137		- return $this->load_taboola_content_category( $html );
138		-}
139		-public function tb_cat_buffer_flush() {
140		- if ( ob_get_length() ) {
141		- echo ob_get_clean();
142		- }
143		-}
144		-
145		-/* ----------------------------------------------------------------------
146		- CATEGORY ▸ choose where to inject
147		- -------------------------------------------------------------------- */
148		-private function embed_taboola_content_location_category(
149		- string $html,
150		- array $taboola_content,
151		- string $selector ) : string {
152		-
153		- $formatted = $this->format_taboola_content_category( $taboola_content );
154		-
155		- /* A. no selector → bottom of page */
156		- if ( $selector === '' ) {
157		- return str_ireplace( '</body>', $formatted . '</body>', $html );
158		- }
159		-
160		- /* B. selector given → try server-side injection */
161		- $doc = str_get_html( $html );
162		- if ( ! $doc ) {
163		- // parser failed → graceful fallback
164		- return str_ireplace( '</body>', $formatted . '</body>', $html );
165		- }
166		-
167		- $occurrence = max( 0, $this->settings->category_location_string_occurrence - 1 );
168		- $target = $doc->find( $selector, $occurrence );
169		-
170		- if ( $target ) { // selector found
171		- $target->outertext .= $formatted;
172		- return (string) $doc; // done – no duplicate
173		- }
174		-
175		- /* C. selector not found → bottom of page */
176		- return str_ireplace( '</body>', $formatted . '</body>', $html );
177		-}
178		-
179		-/* ------------------------------------------------------------------ */
180	152	public function tb_home_buffer_flush() {
181	153	if ( ob_get_length() ) {
182	154	echo ob_get_clean();
183	155	}
		@@ -182,12 +154,9 @@
182	154	echo ob_get_clean();
183	155	}
184	156	}
185	157
186		-
187		-
188		-
189		-function plugin_action_links($links, $file) {
	158	+ function plugin_action_links($links, $file) {
190	159	static $this_plugin;
191	160
192	161	if (!$this_plugin) {
193	162	$this_plugin = plugin_basename(__FILE__);
		@@ -209,9 +178,9 @@
209	178	private function should_show_content_widget_mid(){
210	179	// PC - only if v2 was installed:
211	180	if (!$this->is_db_updated_for_min_ver("2.0.0"))
212	181	return false;
213		- $retVal1 = ((trim($this->settings->publisher_id) != '') && is_single() && !empty($this->settings->mid_enabled));
	182	+ $retVal1 = ((trim($this->settings->publisher_id) != '') && is_single() && $this->settings->mid_enabled && trim($this->settings->mid_widget_id) != '');
214	183	return $retVal1;
215	184	}
216	185
217	186	private function should_show_content_widget_home(){
		@@ -231,9 +200,9 @@
231	200	}
232	201
233	202	// Determine if a taboola widget should be added somewhere on the current page (content or sidebar)
234	203	function is_widget_on_page(){
235		- return $this->should_show_content_widget() || $this->should_show_content_widget_mid() || $this->should_show_content_widget_home() || $this->should_show_sidebar_widget() || $this->should_show_content_widget_category() ;
	204	+ return $this->should_show_content_widget() || $this->should_show_content_widget_mid() || $this->should_show_content_widget_home() || $this->should_show_sidebar_widget();
236	205	}
237	206
238	207	function get_page_type(){
239	208	$page_type='article';
		@@ -318,37 +287,24 @@
318	287	return $content;
319	288	}
320	289
321	290	// Mid-article-widget
322		- function load_taboola_content_mid($content) {
	291	+ function load_taboola_content_mid($content)
	292	+ {
	293	+ $taboola_content_mid = array();
323	294	if ($this->should_show_content_widget_mid()){
324		- $mid_widgets = json_decode($this->settings->mid_widgets ?? '[]');
325	295
326		- if (is_array($mid_widgets) && !empty($mid_widgets)) {
327		- foreach ($mid_widgets as $index => $widget) {
328		- $container_id = 'taboola-mid-article-thumbnails-' . $index;
329		-
330		- $widgetParams = array(
331		- '{{WIDGET_ID}}' => $widget->widget_id,
332		- '{{CONTAINER}}' => $container_id,
333		- '{{PLACEMENT}}' => $widget->placement
334		- );
	296	+ $secondWidgetParams = array('{{WIDGET_ID}}' => $this->settings->mid_widget_id,
	297	+ '{{CONTAINER}}' => 'taboola-mid-article-thumbnails',
	298	+ '{{PLACEMENT}}' => $this->settings->mid_placement);
	299	+
	300	+ $secondWidgetScript = new JavaScriptWrapper("widgetInjectionScript.js",$secondWidgetParams);
	301	+ $taboola_content_mid[TABOOLA_CONTENT_FORMAT_HTML][] = "<div id='taboola-mid-article-thumbnails'></div>";
	302	+ $taboola_content_mid[TABOOLA_CONTENT_FORMAT_SCRIPT][] = $secondWidgetScript;
335	303
336		- $widgetScript = new JavaScriptWrapper("widgetInjectionScript.js", $widgetParams);
337		- $taboola_content_mid = array(
338		- TABOOLA_CONTENT_FORMAT_HTML => array("<div id='{$container_id}'></div>"),
339		- TABOOLA_CONTENT_FORMAT_SCRIPT => array($widgetScript),
340		- );
	304	+ $content = $this->embed_taboola_content_location_mid($content,$taboola_content_mid,trim($this->settings->mid_location_string));
	305	+ }
341	306
342		- $content = $this->embed_taboola_content_location_mid(
343		- $content,
344		- $taboola_content_mid,
345		- $widget->location_string,
346		- $widget->occurrence
347		- );
348		- }
349		- }
350		- }
351	307	return $content;
352	308	}
353	309
354	310	// Homepage widget
		@@ -370,33 +326,9 @@
370	326	}
371	327	return $content;
372	328
373	329	}
374		- /* ------------------------------------------------------------------
375		- * CATEGORY ▸ build widget & inject
376		- * ------------------------------------------------------------------*/
377		-public function load_taboola_content_category( $content ) {
378	330
379		- // 1) Build the DIV that Taboola will fill
380		- $taboola[TABOOLA_CONTENT_FORMAT_HTML][] =
381		- "<div id='taboola-category-thumbnails'></div>";
382		-
383		- // 2) Build the JS that loads the feed (reuse the wrapper)
384		- $taboola[TABOOLA_CONTENT_FORMAT_SCRIPT][] =
385		- new JavaScriptWrapper( 'widgetInjectionScript.js', [
386		- '{{WIDGET_ID}}' => $this->settings->category_widget_id,
387		- '{{CONTAINER}}' => 'taboola-category-thumbnails',
388		- '{{PLACEMENT}}' => $this->settings->category_placement,
389		- ]);
390		-
391		- // 3) Decide where to insert (selector or end of <body>)
392		- return $this->embed_taboola_content_location_category(
393		- $content,
394		- $taboola,
395		- trim( $this->settings->category_location_string )
396		- );
397		-}
398		-
399	331	// Below-article widget
400	332
401	333	// Extract the taboola content in the required format:
402	334	// String - for injecting on the servr side
		@@ -463,18 +395,8 @@
463	395	return $ret_val;
464	396
465	397	}
466	398
467		-
468		- // ► CATEGORY formatter ◄
469		-private function format_taboola_content_category( $arr ) {
470		- return implode( "\n", [
471		- implode( "\n", $arr[TABOOLA_CONTENT_FORMAT_HTML] ?? [] ),
472		- '<script type="text/javascript">' .
473		- implode( "\n", $arr[TABOOLA_CONTENT_FORMAT_SCRIPT] ?? [] ) .
474		- '</script>',
475		- ]);
476		-}
477	399	// Below-article widget
478	400	// Do the actual logic of choosing where to place the taboola content.
479	401	function embed_taboola_content_location($content, $taboola_content){
480	402	$do_default = true;
		@@ -500,9 +422,9 @@
500	422	}
501	423
502	424	// Mid-article widget
503	425	// Do the actual logic of choosing where to place the taboola content based on the "location" attribute
504		- function embed_taboola_content_location_mid($content, $taboola_content_mid, $location, $occurrence = 1){
	426	+ function embed_taboola_content_location_mid($content, $taboola_content_mid, $location){
505	427	$do_default = true;
506	428
507	429	if (isset($location) && $location != ''){
508	430	$first_char = substr($location,0,1);
		@@ -529,9 +451,9 @@
529	451	} else{
530	452	require_once('simple_html_dom.php');
531	453
532	454	$html_doc = str_get_html($content);
533		- $target_location = $html_doc->find($location, ($occurrence) - 1);
	455	+ $target_location = $html_doc->find($location,($this->settings->mid_location_string_occurrence)-1);
534	456
535	457	// if the location was found within the html content
536	458	if (isset($target_location) && is_object($target_location)){
537	459
		@@ -541,8 +463,12 @@
541	463	$do_default = false;
542	464	}
543	465	}
544	466	}
	467	+ // Default for below-article widget - add to the end of the content
	468	+ // if ($do_default){
	469	+ // $content = $content.$this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_STRING);
	470	+ // }
545	471
546	472	return $content;
547	473	}
548	474
		@@ -643,18 +569,33 @@
643	569	}
644	570	}
645	571
646	572	if(isset($_POST['mid_enabled'])) {
647		- if(isset($_POST['mid_widget_id']) && is_array($_POST['mid_widget_id'])) {
648		- foreach ($_POST['mid_widget_id'] as $index => $widget_id) {
649		- if(trim($widget_id) == '') {
650		- $taboola_errors[] = "Mid-article Widget #".($index + 1)." > Widget ID";
651		- }
652		- if(trim($_POST['mid_placement'][$index]) == '') {
653		- $taboola_errors[] = "Mid-article Widget #".($index + 1)." > Placement Name";
654		- }
	573	+ if (trim(strip_tags($_POST['mid_widget_id'])) == '') {
	574	+ $taboola_errors[] = "Mid-article > Widget ID";
	575	+ }
	576	+ if (trim(strip_tags($_POST['mid_placement'])) == '') {
	577	+ $taboola_errors[] = "Mid-article > Placement Name";
	578	+ }
	579	+ if (trim(strip_tags($_POST['mid_location_string'])) == '') {
	580	+ $taboola_errors[] = "Mid-article > CSS selector";
	581	+ }
	582	+ else {
	583	+ // If the 'location' WAS filled in, then...
	584	+
	585	+ // 1) Check for a valid 'location':
	586	+
	587	+ // Validation method has not been implemented
	588	+ // mid_if (!$this->is_locaton_string_valid1($_POST['mid_location_string'])) {
	589	+ // $taboola_errors[] = "Mid-article > CSS Selector (invalid value)";
	590	+ // }
	591	+
	592	+ // 2) Validate the 'occurrence':
	593	+ if (!$this->is_mid_location_string_occurrence_valid($_POST['mid_location_string_occurrence'])) {
	594	+ $taboola_errors[] = "Mid-article > Occurance (must be >= 1)";
655	595	}
656	596	}
	597	+
657	598	}
658	599
659	600	if(isset($_POST['home_enabled'])) {
660	601	if (trim(strip_tags($_POST['home_widget_id'])) == '') {
		@@ -667,45 +608,25 @@
667	608	if (trim(strip_tags($_POST['home_location_string'])) == '') {
668	609	$taboola_errors[] = "Homepage > CSS selector";
669	610	}
670	611	else {
	612	+ // If the 'location' WAS filled in, then...
	613	+
	614	+ // 1) Check for a valid 'location':
	615	+
	616	+ // Validation method has not been implemented
	617	+ // if (!$this->is_home_location_string_valid($_POST['home_location_string'])) {
	618	+ // $taboola_errors[] = "Homepage > CSS Selector (invalid value)";
	619	+ // }
	620	+
	621	+ // 2) Validate the 'occurrence':
671	622	if (!empty($_POST['home_location_string']) && !$this->is_home_location_string_occurrence_valid($_POST['home_location_string_occurrence'])) {
672	623	$taboola_errors[] = "Homepage > Occurance (must be >= 1)";
673	624	}
674	625	}
675		- }
676		- if ( isset($_POST['category_enabled']) ) {
677		- if ( trim(strip_tags($_POST['category_widget_id'])) == '' )
678		- $taboola_errors[] = "Category > Widget ID";
679		- if ( trim(strip_tags($_POST['category_placement'])) == '' )
680		- $taboola_errors[] = "Category > Placement Name";
681		- }
	626	+ }
682	627
683	628	if(count($taboola_errors) == 0){
684		-
685		- $mid_widgets_data = array();
686		- if (isset($_POST['mid_widget_id']) && is_array($_POST['mid_widget_id'])) {
687		- foreach ($_POST['mid_widget_id'] as $index => $widget_id) {
688		- if (!empty(trim($widget_id))) {
689		-
690		- $location_string = 'p';
691		- if (isset($_POST['mid_paragraph_ui_mode'][$index]) && $_POST['mid_paragraph_ui_mode'][$index] === 'Other') {
692		- if (isset($_POST['mid_location_string'][$index])) {
693		- $location_string = sanitize_text_field($_POST['mid_location_string'][$index]);
694		- }
695		- }
696		-
697		- $mid_widgets_data[] = array(
698		- 'widget_id' => sanitize_text_field($widget_id),
699		- 'placement' => sanitize_text_field($_POST['mid_placement'][$index]),
700		- 'location_string' => $location_string,
701		- 'occurrence' => intval($_POST['mid_location_string_occurrence'][$index]),
702		- );
703		- }
704		- }
705		- }
706		- $mid_widgets_json = json_encode($mid_widgets_data);
707		-
708	629	$data = array(
709	630	"publisher_id" => trim($_POST['publisher_id']),
710	631
711	632	"web_push_enabled" => isset($_POST['web_push_enabled']) ? true : false,
		@@ -717,23 +638,24 @@
717	638
718	639	"out_of_content_enabled" => isset($_POST['out_of_content_enabled']) ? true : false,
719	640
720	641	"mid_enabled" => isset($_POST['mid_enabled']) ? true : false,
721		- "mid_widgets" => $mid_widgets_json,
722		-
	642	+ "mid_widget_id" => !empty($_POST['mid_widget_id']) ? trim($_POST['mid_widget_id']) : '',
	643	+ "mid_placement" => !empty($_POST['mid_placement']) ? trim($_POST['mid_placement']) : '',
	644	+ "mid_paragraph_ui_mode" => !empty($_POST['mid_paragraph_ui_mode']) ? trim($_POST['mid_paragraph_ui_mode']) : '',
	645	+
	646	+ "mid_location_string_occurrence" => !empty($_POST['mid_location_string_occurrence']) ? $_POST['mid_location_string_occurrence'] : '',
	647	+ "mid_location_string" => !empty($_POST['mid_location_string']) ? trim($_POST['mid_location_string']) : '',
	648	+
723	649	"home_enabled" => isset($_POST['home_enabled']) ? true : false,
724	650	"home_widget_id" => !empty($_POST['home_widget_id']) ? trim($_POST['home_widget_id']) : '',
725	651	"home_placement" => !empty($_POST['home_placement']) ? trim($_POST['home_placement']) : '',
726	652
727	653	"home_location_string_occurrence" => !empty($_POST['home_location_string_occurrence']) ? $_POST['home_location_string_occurrence'] : '',
728		- "home_location_string" => !empty($_POST['home_location_string']) ? trim($_POST['home_location_string']) : '',
729		- "category_enabled" => isset($_POST['category_enabled']) ? true : false,
730		- "category_widget_id" => !empty($_POST['category_widget_id']) ? trim($_POST['category_widget_id']) : '',
731		- "category_placement" => !empty($_POST['category_placement']) ? trim($_POST['category_placement']) : '',
732		- "category_location_string_occurrence" => !empty($_POST['category_location_string_occurrence']) ? $_POST['category_location_string_occurrence'] : '',
733		- "category_location_string" => !empty($_POST['category_location_string']) ? trim($_POST['category_location_string']) : '',
	654	+ "home_location_string" => !empty($_POST['home_location_string']) ? trim($_POST['home_location_string']) : ''
	655	+ );
734	656
735		- );
	657	+ //var_dump($settings);
736	658
737	659	$is_valid_nonce = false;
738	660
739	661	if (isset( $_POST['my_plugin_nonce']) && wp_verify_nonce( $_POST['my_plugin_nonce'], 'my_plugin_update_field_action' ) ) {
		@@ -741,9 +663,9 @@
741	663	}
742	664
743	665	if ($is_valid_nonce) {
744	666	if($settings == NULL){
745		- $wpdb->insert($this->tbl_taboola_settings, $data);
	667	+ $wpdb->insert($this->tbl_taboola_settings, $data, null, null);
746	668	} else {
747	669	$wpdb->update($this->tbl_taboola_settings, $data, array('id' => $settings->id));
748	670	}
749	671	}
		@@ -808,9 +730,21 @@
808	730	}
809	731	}
810	732
811	733	function is_db_updated_for_min_ver($min_ver) {
	734	+ /**
	735	+ * Checks if the DB was *previously* updated for the minimum version specified.
	736	+ * $min_ver should be passed in a format like this: "2.1.0"
	737	+ */
	738	+
812	739	global $wpdb;
	740	+
	741	+ // PC - Temporary patch for v2.1.0
	742	+
	743	+ // START patch ===============================================
	744	+ // Check if the `_taboola` table exists.
	745	+ // If not, then return false.
	746	+
813	747	$table_name = $wpdb->prefix . "_taboola_settings";
814	748
815	749	if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
816	750	tb_write_log("Table NOT FOUND");
		@@ -818,31 +752,55 @@
818	752	}
819	753	else {
820	754	tb_write_log("Table EXISTS");
821	755	}
	756	+ // END patch =================================================
	757	+
	758	+ // Check the saved version in wp_options. Default to '1.0.0' if the option is not found.
822	759	$saved_version = get_option(TABOOLA_OPTION_NAME, '1.0.0');
823	760
824	761	$db_is_up_to_date = version_compare($saved_version, $min_ver, '>=');
	762	+ //tb_write_log($db_is_up_to_date);
825	763	return $db_is_up_to_date;
826	764
827	765	}
828	766
829	767	function is_db_updated_for_current_ver() {
	768	+ /**
	769	+ * DEPRECATED
	770	+ * Checks if the DB was *previously* updated for the version currently loaded.
	771	+ */
830	772	global $wpdb;
	773	+
	774	+ // Check the saved version in wp_options. Default to '1.0.0' if the option is not found.
831	775	$saved_version = get_option(TABOOLA_OPTION_NAME, '1.0.0');
	776	+
	777	+ // Get the currently loaded plugin version.
832	778	$plugin_version = $this->get_loaded_plugin_version();
	779	+
833	780	$db_is_up_to_date = version_compare($saved_version, $plugin_version, '>=');
	781	+ //tb_write_log($db_is_up_to_date);
834	782	return $db_is_up_to_date;
	783	+
835	784	}
836	785
837	786	function get_loaded_plugin_version() {
838		- $plugin_data = get_plugin_data( __FILE__ );
	787	+
	788	+ $plugin_data = get_plugin_data( __FILE__ ); // Can be invoked from Admin page only
839	789	$loaded_plugin_version = $plugin_data['Version'];
840	790	return $loaded_plugin_version;
	791	+
841	792	}
842	793
843	794	function save_taboola_version($min_ver) {
	795	+ /**
	796	+ * Checks for the saved version in wp_options.
	797	+ * If not found - adds it. Else - updates it.
	798	+ */
	799	+
	800	+
844	801	tb_write_log("SAVING NEW MIN VERSION: " . $min_ver); // PC
	802	+
845	803	$saved_version = get_option(TABOOLA_OPTION_NAME, '');
846	804	if ($saved_version == '') {
847	805	add_option(TABOOLA_OPTION_NAME, $min_ver);
848	806	}
		@@ -851,9 +809,12 @@
851	809	}
852	810	}
853	811
854	812	function update_db(){
	813	+
	814	+ // If we are up to date, then skip this method...
855	815	if ($this->is_db_updated_for_min_ver(TABOOLA_MIN_VER)) {
	816	+ //tb_write_log("All up to date!");
856	817	return;
857	818	}
858	819
859	820	$this->save_taboola_version(TABOOLA_MIN_VER);
		@@ -860,17 +821,24 @@
860	821
861	822	global $wpdb;
862	823	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
863	824
864		- $charset_collate = '';
865		- if ( ! empty( $wpdb->charset ) ) {
866		- $charset_collate = "DEFAULT CHARACTER SET {$wpdb->charset}";
	825	+
	826	+ // Handling for older MySQL versions
	827	+ if (function_exists('mysql_get_server_info') && version_compare(mysql_get_server_info(), '4.1.0', '>=')) {
	828	+ if (!empty($wpdb->charset))
	829	+ $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
	830	+ if (!empty($wpdb->collate))
	831	+ $charset_collate .= " COLLATE $wpdb->collate";
867	832	}
868		- if ( ! empty( $wpdb->collate ) ) {
869		- $charset_collate .= " COLLATE {$wpdb->collate}";
870		- }
871	833
	834	+ // Check if this is an upgrade from v1
872	835	$is_upgrade_from_v1 = $this->is_upgrade_from_v1();
	836	+
	837	+ // tb_write_log("Is upgrade from v1: " . ($is_upgrade_from_v1 ? 'true' : 'false'));
	838	+
	839	+
	840	+ //settings table structure
873	841	$sql_table_settings = "
874	842	CREATE TABLE `" . $wpdb->prefix . "_taboola_settings` (
875	843	`id` INT NOT NULL AUTO_INCREMENT ,
876	844	`publisher_id` VARCHAR(255) DEFAULT NULL,
		@@ -878,23 +846,31 @@
878	846	`publisher_id_push` INT(15) DEFAULT NULL,
879	847	`first_bc_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
880	848	`first_bc_widget_id` VARCHAR(255) DEFAULT NULL,
881	849	`first_bc_placement` VARCHAR(255) DEFAULT " . ($is_upgrade_from_v1 ? "'below-article'" : "NULL") .",
	850	+ `first_bc_custom_css` TEXT DEFAULT NULL,
	851	+ `second_bc_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
	852	+ `second_bc_widget_id` VARCHAR(255) DEFAULT NULL,
	853	+ `second_bc_custom_css` TEXT DEFAULT NULL,
	854	+ `location_string` TEXT DEFAULT NULL,
	855	+ `mid_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
	856	+ `mid_widget_id` VARCHAR(255) DEFAULT NULL,
	857	+ `mid_placement` VARCHAR(255) DEFAULT NULL,
882	858	`out_of_content_enabled` TINYINT(1) NOT NULL DEFAULT TRUE,
883		- `mid_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
884		- `mid_widgets` TEXT DEFAULT NULL,
	859	+ `mid_location_string` TEXT DEFAULT NULL,
	860	+ `mid_location_string_occurrence` SMALLINT DEFAULT NULL,
	861	+ `mid_paragraph_ui_mode` VARCHAR(255) DEFAULT NULL,
885	862	`home_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
886	863	`home_widget_id` VARCHAR(255) DEFAULT NULL,
887	864	`home_placement` VARCHAR(255) DEFAULT NULL,
888	865	`home_location_string` TEXT DEFAULT NULL,
889	866	`home_location_string_occurrence` SMALLINT DEFAULT NULL,
890		- `category_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
891		- `category_widget_id` VARCHAR(255) DEFAULT NULL,
892		- `category_placement` VARCHAR(255) DEFAULT NULL,
893		- `category_location_string` TEXT DEFAULT NULL,
894		- `category_location_string_occurrence` SMALLINT DEFAULT NULL,
895	867	PRIMARY KEY (`id`)
896		- ) $charset_collate;";
	868	+ )" . $charset_collate . ";";
	869	+
	870	+ // tb_write_log($sql_table_settings);
	871	+
	872	+ // create/update the table
897	873	dbDelta($sql_table_settings);
898	874	}
899	875	}
900	876	}
		@@ -901,11 +877,19 @@
901	877
902	878	global $taboolaWP;
903	879	$taboolaWP = new TaboolaWP();
904	880
	881	+/*
	882	+A few utility methods for logging
	883	+*/
	884	+
	885	+// Writes debugging messages to 'logs/debug.log'.
	886	+// The exact file location depends on *where* you trigger the function.
	887	+// In this script, we trigger the function from the admin dashboard.
	888	+// So the log file is located under 'wp-admin/logs'.
905	889	function tb_write_log($log_msg)
906	890	{
907		- if (!TABOOLA_DEBUG_MODE)
	891	+ if (!TABOOLA_DEBUG_MODE) // If not debug mode, do nothing
908	892	return;
909	893
910	894	$log_filename = "logs";
911	895	if (!file_exists($log_filename))
		@@ -913,8 +897,9 @@
913	897	mkdir($log_filename, 0777, true);
914	898	}
915	899	$log_file_data = $log_filename.'/debug.log';
916	900
	901	+ // Add date/time
917	902	$date = date('Y-m-d H:i:s');
918	903	$log_msg_with_date = $date." : ".$log_msg;
919	904
920	905	file_put_contents($log_file_data, $log_msg_with_date . "\n", FILE_APPEND);
		@@ -919,8 +904,9 @@
919	904
920	905	file_put_contents($log_file_data, $log_msg_with_date . "\n", FILE_APPEND);
921	906	}
922	907
	908	+// Write to console
923	909	function tb_console_log( $data ){
924	910
925	911	If(wp_get_environment_type() === 'development') {
926	912
		@@ -930,8 +916,9 @@
930	916
931	917	}
932	918	}
933	919
	920	+// Write to webpage and stop
934	921	function tb_print_to_page($data) {
935	922	If(wp_get_environment_type() === 'development') {
936	923	print_r($data);
937	924	die;
		@@ -936,17 +923,19 @@
936	923	print_r($data);
937	924	die;
938	925	}
939	926	}
	927	+//
940	928
	929	+// Enqueue js_inject.min.js script for XPath injection
941	930	function enqueue_taboola_scripts() {
942	931	wp_register_script(
943	932	'taboola-injector',
944	933	plugins_url('js/js_inject.min.js', __FILE__),
945		- array(),
946		- null,
947		- true
	934	+ array(), // No dependencies
	935	+ null, // No version specified
	936	+ true // Load in footer
948	937	);
949	938
950	939	wp_enqueue_script('taboola-injector');
951	940	}
952		-add_action('wp_enqueue_scripts', 'enqueue_taboola_scripts');
	941	+add_action('wp_enqueue_scripts', 'enqueue_taboola_scripts');