PluginProbe
Taboola / 2.0.2
Taboola v2.0.2
1.0.4 1.0.5 1.0.6 1.0.8 2.0.1 2.0.2 2.1.0 2.1.1 2.2.2 2.2.3 3.0.0 3.0.1 3.0.2 3.1.0 trunk 1.0 1.0.1 1.0.10 1.0.11 1.0.12 1.0.13 1.0.14 1.0.15 1.0.2 1.0.3
← All changes | taboola_widget.php +244 -477 trunk2.0.2 View file →
@@ -1,218 +1,86 @@
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.1.0
7 - * Author: Taboola
3 + * Plugin Name: Taboola
4 + * Plugin URI: https://developers.taboola.com/web-integrations/discuss
5 + * Description: Taboola
6 + * Version: 2.0.2
7 + * Author: Taboola
8 8 */
9 9
10 -define( 'TABOOLA_PLUGIN_VERSION', '3.1.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.0.2"); // => UPDATE FOR *EVERY* RELEASE (USED FOR TRACKING)
11 +define ("TABOOLA_MIN_VER","2.0.1"); // => UPDATE *ONLY* IF THIS RELEASE HAS *DB CHANGES*
12 +define ("TABOOLA_DEBUG_MODE", false); // => SET 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"); // *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 -if ( ! class_exists( 'simple_html_dom' ) ) {
26 - require_once plugin_dir_path( __FILE__ ) . 'simple_html_dom.php'; // ← NEW
27 -}
28 23
29 -if ( ! class_exists( 'TaboolaWP' ) ) {
30 -class TaboolaWP {
24 +include_once('widget.php');
25 +require_once('JavaScriptWrapper.php');
31 26
32 - /* ─────────────────────────── properties ─────────────────────────── */
33 - public $data = [];
34 - public $_is_widget_on_page;
35 - public $_is_head_script_loaded = false;
36 27
37 - private $tpl_sw = 'importScripts("https://cdn.taboola.com/webpush/tsw.js");';
38 - private $msg_sw_error = <<<SWE
39 - <p>The file <code>sw.js</code> in the WP root is not writable.
40 - Please change its permissions or paste the code below manually:</p>
41 - <pre><code>{{SW}}</code></pre>
42 - <p>Also make sure it's reachable at <code>{{DOMAIN}}/sw.js</code></p>
43 -SWE;
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;
44 35
45 - public $plugin_name;
46 - public $plugin_directory;
47 - public $plugin_url;
48 - public $settings;
49 - public $tbl_taboola_settings;
36 + function __construct()
37 + {
38 + global $wpdb;
50 39
51 - /* ─────────────────────────── constructor ─────────────────────────── */
52 - public function __construct() {
53 - global $wpdb;
54 - //initialize plugin constant
55 - define( 'TaboolaWP', true );
40 + //initialize plugin constant
41 + DEFINE('TaboolaWP', true);
56 42
57 - $this->_is_widget_on_page = false;
58 - $this->_is_head_script_loaded = false;
43 + $this->_is_widget_on_page = false;
44 + $this->_is_head_script_loaded = false;
59 45
60 - $this->plugin_name = plugin_basename( __FILE__ );
61 - $this->plugin_directory = plugin_dir_path( __FILE__ );
62 - $this->plugin_url = trailingslashit(
63 - WP_PLUGIN_URL . '/' . dirname( plugin_basename( __FILE__ ) )
64 - );
65 - $this->tbl_taboola_settings = $wpdb->prefix . '_taboola_settings';
66 - $this->settings = $wpdb->get_row(
67 - "SELECT * FROM {$this->tbl_taboola_settings} LIMIT 1"
68 - );
46 + $this->plugin_name = plugin_basename(__FILE__);
47 + $this->plugin_directory = plugin_dir_path(__FILE__);
48 + $this->plugin_url = trailingslashit(WP_PLUGIN_URL . '/' . dirname(plugin_basename(__FILE__)));
49 + $this->settings = $wpdb->get_row("select * from ".$wpdb->prefix."_taboola_settings limit 1");
69 50
70 - /* activation / upgrade */
71 - register_activation_hook( $this->plugin_name, [ $this, 'update_db' ] );
72 - add_action( 'admin_init', [ $this, 'update_db' ] );
51 + $this->tbl_taboola_settings = $wpdb->prefix . '_taboola_settings';
73 52
74 - /* widgets */
75 - if ( $this->settings && ! empty( $this->settings->publisher_id ) ) {
76 - add_action(
77 - 'widgets_init',
78 - static fn() => register_widget( 'WP_Widget_Taboola' )
79 - );
80 - }
53 + //activation function
54 + register_activation_hook($this->plugin_name, array(&$this, 'update_db'));
55 + add_action('admin_init', array(&$this, 'update_db'));
81 56
82 - /* admin vs front-end hooks */
83 - if ( is_admin() ) {
84 - add_action( 'admin_menu', [ $this, 'admin_generate_menu' ] );
85 - add_filter( 'plugin_action_links',
86 - [ $this, 'plugin_action_links' ], 10, 2 );
87 - }
88 -
89 -
90 -
91 -
92 - elseif ( $this->settings ) {
93 - /* loader & flush */
94 - add_action( 'wp_head', [ $this, 'taboola_header_loader_inject' ] );
95 - if ( ! empty( $this->settings->publisher_id_push ) ) {
96 - add_action( 'wp_head', [ $this, 'taboola_webpush_loader_js' ] );
97 -
98 - $sw = 'sw.js';
99 - $sw_path = ABSPATH . $sw;
100 -
101 - $content = file_exists( $sw_path ) ? file_get_contents( $sw_path ) : '';
102 -
103 - if ( strpos( $content, $this->tpl_sw ) === false ) {
104 - if ( ! is_writable( ABSPATH ) || ( file_exists( $sw_path ) && ! is_writable( $sw_path ) ) ) {
105 - return $this->notice( $this->msg_sw_error );
106 - }
107 - $content = $this->tpl_sw . PHP_EOL . $content;
108 - if ( file_put_contents( $sw_path, $content ) === false ) {
109 - return $this->notice( $this->msg_sw_error );
110 - }
111 - }
57 + // Enable sidebar widgets
58 + if ($this->settings != NULL && !empty($this->settings->publisher_id)){
59 + //register Taboola widget
60 + add_action('widgets_init',
61 + function(){
62 + return register_widget("WP_Widget_Taboola");
112 63 }
113 - add_action( 'wp_footer', [ $this, 'taboola_footer_loader_js' ] );
64 + );
65 + }
114 66
115 - /* content widgets */
116 - add_filter( 'the_content', [ $this, 'load_taboola_content' ] );
117 - add_filter( 'the_content', [ $this, 'load_taboola_content_mid' ] );
67 + //$this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled;
118 68
119 - /* full-page buffer – home & category */
120 - add_action( 'template_redirect', [ $this, 'tb_home_buffer_start' ], 0 );
121 - add_action( 'shutdown', [ $this, 'tb_home_buffer_flush' ], PHP_INT_MAX );
122 -
123 - add_action( 'template_redirect', [ $this, 'tb_cat_buffer_start' ], 0 );
124 - add_action( 'shutdown', [ $this, 'tb_cat_buffer_flush' ], PHP_INT_MAX );
125 - }
126 - } // __construct
127 -
128 -
129 -/* ======================================================================
130 - CATEGORY ▸ should we show the widget?
131 - ====================================================================== */
132 -private function should_show_content_widget_category(): bool {
133 - return (
134 - trim( $this->settings->publisher_id ) !== '' &&
135 - ( is_category() || is_archive() || is_search() ) &&
136 - $this->settings->category_enabled &&
137 - trim( $this->settings->category_widget_id ) !== ''
138 - );
139 -}
140 -
141 -/* ----------------------------------------------------------------------
142 - HOMEPAGE ▸ full-page buffer
143 - -------------------------------------------------------------------- */
144 -public function tb_home_buffer_start() {
145 - if ( $this->should_show_content_widget_home() ) {
146 - ob_start( [ $this, 'tb_home_buffer_inject' ] );
69 + if (is_admin()) {
70 + //add menu for plugin
71 + add_action( 'admin_menu', array(&$this, 'admin_generate_menu') );
72 + add_filter('plugin_action_links', array(&$this, 'plugin_action_links'), 10, 2 );
73 + }else if ($this->settings != NULL){
74 + add_action('wp_head', array(&$this, 'taboola_header_loader_inject'));
75 + add_action('wp_footer', array(&$this, 'taboola_footer_loader_js'));
76 + add_filter('the_content', array(&$this, 'load_taboola_content'));
77 + add_filter('the_content', array(&$this, 'load_taboola_content_mid'));
78 + add_filter('the_content', array(&$this, 'load_taboola_content_home'));
79 + }
147 80 }
148 -}
149 -public function tb_home_buffer_inject( $html ) {
150 - return $this->load_taboola_content_home( $html );
151 -}
152 81
153 -/* ----------------------------------------------------------------------
154 - CATEGORY ▸ buffer hooks
155 - -------------------------------------------------------------------- */
156 -public function tb_cat_buffer_start() {
157 - if ( $this->should_show_content_widget_category() ) {
158 - ob_start( [ $this, 'tb_cat_buffer_inject' ] );
159 - }
160 -}
161 -public function tb_cat_buffer_inject( $html ) {
162 - return $this->load_taboola_content_category( $html );
163 -}
164 -public function tb_cat_buffer_flush() {
165 - if ( ob_get_length() ) {
166 - echo ob_get_clean();
167 - }
168 -}
169 -
170 -/* ----------------------------------------------------------------------
171 - CATEGORY ▸ choose where to inject
172 - -------------------------------------------------------------------- */
173 -private function embed_taboola_content_location_category(
174 - string $html,
175 - array $taboola_content,
176 - string $selector ) : string {
177 -
178 - $formatted = $this->format_taboola_content_category( $taboola_content );
179 -
180 - /* A. no selector → bottom of page */
181 - if ( $selector === '' ) {
182 - return str_ireplace( '</body>', $formatted . '</body>', $html );
183 - }
184 -
185 - /* B. selector given → try server-side injection */
186 - $doc = str_get_html( $html );
187 - if ( ! $doc ) {
188 - // parser failed → graceful fallback
189 - return str_ireplace( '</body>', $formatted . '</body>', $html );
190 - }
191 -
192 - $occurrence = max( 0, $this->settings->category_location_string_occurrence - 1 );
193 - $target = $doc->find( $selector, $occurrence );
194 -
195 - if ( $target ) { // selector found
196 - $target->outertext .= $formatted;
197 - return (string) $doc; // done – no duplicate
198 - }
199 -
200 - /* C. selector not found → bottom of page */
201 - return str_ireplace( '</body>', $formatted . '</body>', $html );
202 -}
203 -
204 -/* ------------------------------------------------------------------ */
205 -public function tb_home_buffer_flush() {
206 - if ( ob_get_length() ) {
207 - echo ob_get_clean();
208 - }
209 -}
210 -
211 -
212 -
213 -
214 -function plugin_action_links($links, $file) {
82 + function plugin_action_links($links, $file) {
215 83 static $this_plugin;
216 84
217 85 if (!$this_plugin) {
218 86 $this_plugin = plugin_basename(__FILE__);
@@ -234,20 +102,17 @@
234 102 private function should_show_content_widget_mid(){
235 103 // PC - only if v2 was installed:
236 104 if (!$this->is_db_updated_for_min_ver("2.0.0"))
237 105 return false;
238 - $retVal1 = ((trim($this->settings->publisher_id) != '') && is_single() && !empty($this->settings->mid_enabled));
106 + $retVal1 = ((trim($this->settings->publisher_id) != '') && is_single() && $this->settings->mid_enabled && trim($this->settings->mid_widget_id) != '');
239 107 return $retVal1;
240 108 }
241 109
242 110 private function should_show_content_widget_home(){
243 111 // PC - only if v2 was installed:
244 -
245 - //error_log( print_r( $this->settings, true ) ); // TEMP line
246 -
247 112 if (!$this->is_db_updated_for_min_ver("2.0.0"))
248 113 return false;
249 - $retVal2 = ((trim($this->settings->publisher_id) != '') && (is_front_page() || is_home()) && $this->settings->home_enabled && trim($this->settings->home_widget_id) != '');
114 + $retVal2 = ((trim($this->settings->publisher_id) != '') && is_front_page() && $this->settings->home_enabled && trim($this->settings->home_widget_id) != '');
250 115 return $retVal2;
251 116 }
252 117
253 118 private function should_show_sidebar_widget(){
@@ -256,9 +121,9 @@
256 121 }
257 122
258 123 // Determine if a taboola widget should be added somewhere on the current page (content or sidebar)
259 124 function is_widget_on_page(){
260 - 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() ;
125 + return $this->should_show_content_widget() || $this->should_show_content_widget_mid() || $this->should_show_content_widget_home() || $this->should_show_sidebar_widget();
261 126 }
262 127
263 128 function get_page_type(){
264 129 $page_type='article';
@@ -270,21 +135,15 @@
270 135 return $page_type;
271 136 }
272 137
273 138 // return the head loader script
274 - function taboola_header_loader_js() {
139 + function taboola_header_loader_js() {
140 + $head_string = "";
141 +
142 + // Only adding the loader if a widget is going to be placed on the page.
275 143 if ($this->is_widget_on_page()){
276 -
277 - // New logic to get all mid-article locations
278 - $mid_locations_string = '';
279 - if (!empty($this->settings->mid_widgets)) {
280 - $mid_widgets_array = json_decode($this->settings->mid_widgets, true);
281 - if (is_array($mid_widgets_array)) {
282 - $locations = array_column($mid_widgets_array, 'location_string');
283 - $mid_locations_string = implode(', ', $locations);
284 - }
285 - }
286 -
144 + // PC - since these params will be inserted in 'loaderInjectionScript.js' via search and replace,
145 + // double brackets are used to ensure that each key is a unique string.
287 146 $stringParams = array(
288 147 '{{PUBLISHER_ID}}' => $this->settings->publisher_id,
289 148 '{{PAGE_TYPE}}' => $this->get_page_type(),
290 149 '{{WORDPRESS_VERSION}}' => get_bloginfo('version'),
@@ -289,38 +148,30 @@
289 148 '{{PAGE_TYPE}}' => $this->get_page_type(),
290 149 '{{WORDPRESS_VERSION}}' => get_bloginfo('version'),
291 150 '{{PHP_VERSION}}' => phpversion(),
292 151 '{{PLUGIN_VERSION}}' => TABOOLA_PLUGIN_VERSION,
293 - '{{LOC_MID}}' => $mid_locations_string,
294 - '{{LOC_HOME}}' => $this->settings->home_location_string ?? ''
152 + '{{LOC_MID}}' => $this->settings->mid_location_string,
153 + '{{LOC_HOME}}' => $this->settings->home_location_string
295 154 );
296 155
297 156 $scriptWrapper = new JavaScriptWrapper("loaderInjectionScript.js",$stringParams);
298 - return $scriptWrapper->getScriptMarkupString();
157 + $head_string = $scriptWrapper->getScriptMarkupString();
299 158 }
300 - return "";
159 +
160 + return $head_string;
301 161 }
302 162
163 +
303 164 // This function is used for the hook action, injects the header content to the <head> tag.
304 165 function taboola_header_loader_inject(){
305 166 echo $this->taboola_header_loader_js();
306 167 }
307 168
308 - // adding webpush loader
309 - function taboola_webpush_loader_js() {
310 - if(is_single() || is_home() || is_category() || is_front_page()){
311 - $stringParamsWeb = array(
312 - '{{PUBLISHER_ID}}' => $this->settings->publisher_id_push
313 - );
314 - $webpushInjectionScript = new JavaScriptWrapper("webPush.js",$stringParamsWeb);
315 - echo $webpushInjectionScript;
316 - }
317 - }
318 169
319 170 function taboola_footer_loader_js() {
320 171
321 172 // Only adding flush script if a widget is going to be placed on the page.
322 - if ($this->is_widget_on_page()){
173 + if ( $this->is_widget_on_page() ){
323 174 $flushInjectionScript = new JavaScriptWrapper('flushInjectionScript.js',array());
324 175 echo $flushInjectionScript->getScriptMarkupString();
325 176 }
326 177 }
@@ -348,37 +199,24 @@
348 199 return $content;
349 200 }
350 201
351 202 // Mid-article-widget
352 - function load_taboola_content_mid($content) {
203 + function load_taboola_content_mid($content)
204 + {
205 + $taboola_content_mid = array();
353 206 if ($this->should_show_content_widget_mid()){
354 - $mid_widgets = json_decode($this->settings->mid_widgets ?? '[]');
355 207
356 - if (is_array($mid_widgets) && !empty($mid_widgets)) {
357 - foreach ($mid_widgets as $index => $widget) {
358 - $container_id = 'taboola-mid-article-thumbnails-' . $index;
359 -
360 - $widgetParams = array(
361 - '{{WIDGET_ID}}' => $widget->widget_id,
362 - '{{CONTAINER}}' => $container_id,
363 - '{{PLACEMENT}}' => $widget->placement
364 - );
208 + $secondWidgetParams = array('{{WIDGET_ID}}' => $this->settings->mid_widget_id,
209 + '{{CONTAINER}}' => 'taboola-mid-article-thumbnails',
210 + '{{PLACEMENT}}' => $this->settings->mid_placement);
211 +
212 + $secondWidgetScript = new JavaScriptWrapper("widgetInjectionScript.js",$secondWidgetParams);
213 + $taboola_content_mid[TABOOLA_CONTENT_FORMAT_HTML][] = "<div id='taboola-mid-article-thumbnails'></div>";
214 + $taboola_content_mid[TABOOLA_CONTENT_FORMAT_SCRIPT][] = $secondWidgetScript;
365 215
366 - $widgetScript = new JavaScriptWrapper("widgetInjectionScript.js", $widgetParams);
367 - $taboola_content_mid = array(
368 - TABOOLA_CONTENT_FORMAT_HTML => array("<div id='{$container_id}'></div>"),
369 - TABOOLA_CONTENT_FORMAT_SCRIPT => array($widgetScript),
370 - );
216 + $content = $this->embed_taboola_content_location_mid($content,$taboola_content_mid,trim($this->settings->mid_location_string));
217 + }
371 218
372 - $content = $this->embed_taboola_content_location_mid(
373 - $content,
374 - $taboola_content_mid,
375 - $widget->location_string,
376 - $widget->occurrence
377 - );
378 - }
379 - }
380 - }
381 219 return $content;
382 220 }
383 221
384 222 // Homepage widget
@@ -383,9 +221,9 @@
383 221
384 222 // Homepage widget
385 223 function load_taboola_content_home($content)
386 224 {
387 - //error_log( 'TB-DEBUG ② entered load_taboola_content_home' );
225 +
388 226 $taboola_content_home = array();
389 227 if ($this->should_show_content_widget_home()){
390 228
391 229 $homeWidgetParams = array('{{WIDGET_ID}}' => $this->settings->home_widget_id,
@@ -400,33 +238,9 @@
400 238 }
401 239 return $content;
402 240
403 241 }
404 - /* ------------------------------------------------------------------
405 - * CATEGORY ▸ build widget & inject
406 - * ------------------------------------------------------------------*/
407 -public function load_taboola_content_category( $content ) {
408 242
409 - // 1) Build the DIV that Taboola will fill
410 - $taboola[TABOOLA_CONTENT_FORMAT_HTML][] =
411 - "<div id='taboola-category-thumbnails'></div>";
412 -
413 - // 2) Build the JS that loads the feed (reuse the wrapper)
414 - $taboola[TABOOLA_CONTENT_FORMAT_SCRIPT][] =
415 - new JavaScriptWrapper( 'widgetInjectionScript.js', [
416 - '{{WIDGET_ID}}' => $this->settings->category_widget_id,
417 - '{{CONTAINER}}' => 'taboola-category-thumbnails',
418 - '{{PLACEMENT}}' => $this->settings->category_placement,
419 - ]);
420 -
421 - // 3) Decide where to insert (selector or end of <body>)
422 - return $this->embed_taboola_content_location_category(
423 - $content,
424 - $taboola,
425 - trim( $this->settings->category_location_string )
426 - );
427 -}
428 -
429 243 // Below-article widget
430 244
431 245 // Extract the taboola content in the required format:
432 246 // String - for injecting on the servr side
@@ -493,41 +307,8 @@
493 307 return $ret_val;
494 308
495 309 }
496 310
497 -
498 - // ► CATEGORY formatter ◄
499 -private function format_taboola_content_category( $arr ) {
500 - return implode( "\n", [
501 - implode( "\n", $arr[TABOOLA_CONTENT_FORMAT_HTML] ?? [] ),
502 - '<script type="text/javascript">' .
503 - implode( "\n", $arr[TABOOLA_CONTENT_FORMAT_SCRIPT] ?? [] ) .
504 - '</script>',
505 - ]);
506 -}
507 - /* ------------------------------------------------------------------
508 - * wpautop() hardening for anything injected through the_content.
509 - *
510 - * wpautop() pads block-level tags with blank lines, then splits the
511 - * content on blank lines and wraps each chunk in <p>. Its <script>
512 - * protection only runs after that split, so two things tear an injected
513 - * <script> apart and spill its tail onto the page as reader-visible text:
514 - * 1. a blank line anywhere in the script body, and
515 - * 2. a block-level tag (e.g. <div>) sitting inside a JS string literal.
516 - * Both have to be neutralised; fixing only one still breaks.
517 - * ------------------------------------------------------------------*/
518 -
519 - // Hide markup from wpautop's block-tag scan. \x3C decodes back to "<"
520 - // when the surrounding JS string literal is evaluated.
521 - private function js_escape_markup($markup){
522 - return str_replace('<', '\x3C', (string) $markup);
523 - }
524 -
525 - // Collapse blank lines so wpautop has no paragraph boundary to split on.
526 - private function wpautop_safe_script($script){
527 - return preg_replace('/(\R[ \t]*){2,}/', "\n", (string) $script);
528 - }
529 -
530 311 // Below-article widget
531 312 // Do the actual logic of choosing where to place the taboola content.
532 313 function embed_taboola_content_location($content, $taboola_content){
533 314 $do_default = true;
@@ -535,13 +316,13 @@
535 316 // tag is placed outside of content in order to allow "read more" functionality.
536 317 if ($this->settings->out_of_content_enabled){
537 318
538 319 $scriptWrapper = new JavaScriptWrapper("js_inject.min.js",array(
539 - "{{HTML}}" => $this->js_escape_markup($this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_HTML)),
540 - "{{SCRIPT}}" => $this->js_escape_markup($this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_SCRIPT)))
320 + "{{HTML}}" => $this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_HTML),
321 + "{{SCRIPT}}" => $this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_SCRIPT))
541 322 );
542 323 $scriptWrapper->appendScript("injectWidgetByMarker('tbmarker');");
543 - $content = $content."<span id='tbmarker'></span><script type='text/javascript'>".$this->wpautop_safe_script($scriptWrapper)."</script>";
324 + $content = $content."<span id='tbmarker'></span><script type='text/javascript'>".$scriptWrapper."</script>";
544 325 $do_default = false;
545 326 }
546 327
547 328 // Default for below-article widget - add to the end of the content
@@ -553,9 +334,9 @@
553 334 }
554 335
555 336 // Mid-article widget
556 337 // Do the actual logic of choosing where to place the taboola content based on the "location" attribute
557 - function embed_taboola_content_location_mid($content, $taboola_content_mid, $location, $occurrence = 1){
338 + function embed_taboola_content_location_mid($content, $taboola_content_mid, $location){
558 339 $do_default = true;
559 340
560 341 if (isset($location) && $location != ''){
561 342 $first_char = substr($location,0,1);
@@ -567,13 +348,13 @@
567 348 if ($full_indicator == TABOOLA_JS_INDICATOR){
568 349
569 350 $xpath = substr($location,strlen(TABOOLA_JS_INDICATOR));
570 351 $scriptWrapper = new JavaScriptWrapper("js_inject.min.js",array(
571 - "{{HTML}}" => $this->js_escape_markup($this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_HTML)),
572 - "{{SCRIPT}}" => $this->js_escape_markup($this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_SCRIPT)))
352 + "{{HTML}}" => $this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_HTML),
353 + "{{SCRIPT}}" => $this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_SCRIPT))
573 354 );
574 355 $scriptWrapper->appendScript("injectWidgetByXpath('".$xpath."');");
575 - $content = $content."<span id='tbdefault'></span><script type='text/javascript'>".$this->wpautop_safe_script($scriptWrapper)."</script>";
356 + $content = $content."<span id='tbdefault'></span><script type='text/javascript'>".$scriptWrapper."</script>";
576 357
577 358 $do_default = false;
578 359 }
579 360
@@ -579,14 +360,12 @@
579 360
580 361 // server side selector provided (see simple_html_dom selectors http://simplehtmldom.sourceforge.net/manual.htm)
581 362 // basically it's CSS selectors like in jQuery
582 363 } else{
583 - if ( ! class_exists( 'simple_html_dom' ) ) {
584 - require_once('simple_html_dom.php');
585 - }
364 + require_once('simple_html_dom.php');
586 365
587 366 $html_doc = str_get_html($content);
588 - $target_location = $html_doc->find($location, ($occurrence) - 1);
367 + $target_location = $html_doc->find($location,($this->settings->mid_location_string_occurrence)-1);
589 368
590 369 // if the location was found within the html content
591 370 if (isset($target_location) && is_object($target_location)){
592 371
@@ -596,8 +375,12 @@
596 375 $do_default = false;
597 376 }
598 377 }
599 378 }
379 + // Default for below-article widget - add to the end of the content
380 + // if ($do_default){
381 + // $content = $content.$this->format_taboola_content_mid($taboola_content_mid,TABOOLA_CONTENT_FORMAT_STRING);
382 + // }
600 383
601 384 return $content;
602 385 }
603 386
@@ -604,22 +387,8 @@
604 387 // Homepage widget
605 388 // Do the actual logic of choosing where to place the taboola content based on the "location" attribute
606 389 function embed_taboola_content_location_home($content, $taboola_content_home, $location){
607 390
608 -
609 - // error_log( 'TB-DEBUG ③ raw selector string: [' . $location . ']' );
610 -
611 - // load parser
612 - //require_once plugin_dir_path( __FILE__ ) . 'simple_html_dom.php';
613 - // $html_doc = str_get_html( $content );
614 -
615 - // occurrence: settings is 1-based, find() wants 0-based
616 - // $occurrence = max( 1, intval( $this->settings->home_location_string_occurrence ) );
617 - // $node = $html_doc->find( $location, $occurrence - 1 );
618 - // $found = is_object( $node ) ? 1 : 0;
619 -
620 - // error_log( "TB-DEBUG ③ found {$found} matching node(s) for selector [{$location}]" );
621 - // ────────────────────────────
622 391 $do_default = true;
623 392
624 393 if (isset($location) && $location != ''){
625 394 $first_char = substr($location,0,1);
@@ -631,13 +400,13 @@
631 400 if ($full_indicator == TABOOLA_JS_INDICATOR){
632 401
633 402 $xpath = substr($location,strlen(TABOOLA_JS_INDICATOR));
634 403 $scriptWrapper = new JavaScriptWrapper("js_inject.min.js",array(
635 - "{{HTML}}" => $this->js_escape_markup($this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_HTML)),
636 - "{{SCRIPT}}" => $this->js_escape_markup($this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_SCRIPT)))
404 + "{{HTML}}" => $this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_HTML),
405 + "{{SCRIPT}}" => $this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_SCRIPT))
637 406 );
638 407 $scriptWrapper->appendScript("injectWidgetByXpath('".$xpath."');");
639 - $content = $content."<span id='tbdefault'></span><script type='text/javascript'>".$this->wpautop_safe_script($scriptWrapper)."</script>";
408 + $content = $content."<span id='tbdefault'></span><script type='text/javascript'>".$scriptWrapper."</script>";
640 409
641 410 $do_default = false;
642 411 }
643 412
@@ -642,12 +411,10 @@
642 411 }
643 412
644 413 // server side selector provided (see simple_html_dom selectors http://simplehtmldom.sourceforge.net/manual.htm)
645 414 // basically it's CSS selectors like in jQuery
646 - } else{
647 - if ( ! class_exists( 'simple_html_dom' ) ) {
415 + } else{
648 416 require_once('simple_html_dom.php');
649 - }
650 417
651 418 $html_doc = str_get_html($content);
652 419 $target_location = $html_doc->find($location,($this->settings->home_location_string_occurrence)-1);
653 420
@@ -661,148 +428,124 @@
661 428 }
662 429 }
663 430 }
664 431 // Default for below-article widget - add to the end of the content
665 - if ($do_default){
666 - $content = $content.$this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_STRING);
667 - }
432 + // if ($do_default){
433 + // $content = $content.$this->format_taboola_content_home($taboola_content_home,TABOOLA_CONTENT_FORMAT_STRING);
434 + // }
668 435 return $content;
669 -
670 436
671 437 }
672 438
673 439 function admin_generate_menu(){
674 440 global $current_user;
675 - add_menu_page(__('Taboola','taboola_widget'), __('Taboola','taboola_widget'), 'manage_options', 'taboola_widget', array(&$this, 'admin_taboola_settings'), $this->plugin_url.'img/taboola_icon.png', 110);
441 + add_menu_page('Taboola', 'Taboola', 'manage_options', 'taboola_widget', array(&$this, 'admin_taboola_settings'), $this->plugin_url.'img/taboola_icon.png', 110);
676 442 }
677 443
678 - // Empty numeric inputs must reach MySQL as NULL, not '', or strict mode
679 - // rejects the whole row.
680 - private function nullable_int($value){
681 - return (isset($value) && trim((string) $value) !== '') ? (int) $value : null;
682 - }
444 + function admin_taboola_settings(){
683 445
684 - function admin_taboola_settings(){
685 446 global $wpdb;
686 447 $settings = $wpdb->get_row("select * from ".$wpdb->prefix."_taboola_settings limit 1");
687 448 $taboola_errors = array();
688 - $taboola_save_error = '';
689 449 if($_SERVER['REQUEST_METHOD'] == 'POST'){
690 450
691 - if(trim(strip_tags($_POST['publisher_id'])) == ''){
451 + if(trim($_POST['publisher_id']) == ''){
692 452 $taboola_errors[] = "Publisher ID";
693 453 }
694 454
695 - if(isset($_POST['web_push_enabled'])) {
696 - if (trim(strip_tags($_POST['publisher_id_push'])) == '') {
697 - $taboola_errors[] = "Publisher Push ID";
698 - }
699 - }
700 -
701 455 if(isset($_POST['first_bc_enabled'])) {
702 - if (trim(strip_tags($_POST['first_bc_widget_id'])) == '') {
456 + if (trim($_POST['first_bc_widget_id']) == '') {
703 457 $taboola_errors[] = "Below-article > Widget ID";
704 458 }
705 - if (trim(strip_tags($_POST['first_bc_placement'])) == '') {
459 + if (trim($_POST['first_bc_placement']) == '') {
706 460 $taboola_errors[] = "Below-article > Placement Name";
707 461 }
708 462 }
709 463
710 464 if(isset($_POST['mid_enabled'])) {
711 - if(isset($_POST['mid_widget_id']) && is_array($_POST['mid_widget_id'])) {
712 - foreach ($_POST['mid_widget_id'] as $index => $widget_id) {
713 - if(trim($widget_id) == '') {
714 - $taboola_errors[] = "Mid-article Widget #".($index + 1)." > Widget ID";
715 - }
716 - if(trim($_POST['mid_placement'][$index]) == '') {
717 - $taboola_errors[] = "Mid-article Widget #".($index + 1)." > Placement Name";
718 - }
465 + if (trim($_POST['mid_widget_id']) == '') {
466 + $taboola_errors[] = "Mid-article > Widget ID";
467 + }
468 + if (trim($_POST['mid_placement']) == '') {
469 + $taboola_errors[] = "Mid-article > Placement Name";
470 + }
471 + if (trim($_POST['mid_location_string']) == '') {
472 + $taboola_errors[] = "Mid-article > CSS selector";
473 + }
474 + else {
475 + // If the 'location' WAS filled in, then...
476 +
477 + // 1) Check for a valid 'location':
478 +
479 + // Validation method has not been implemented
480 + // mid_if (!$this->is_locaton_string_valid1($_POST['mid_location_string'])) {
481 + // $taboola_errors[] = "Mid-article > CSS Selector (invalid value)";
482 + // }
483 +
484 + // 2) Validate the 'occurrence':
485 + if (!$this->is_mid_location_string_occurrence_valid($_POST['mid_location_string_occurrence'])) {
486 + $taboola_errors[] = "Mid-article > Occurance (must be >= 1)";
719 487 }
720 488 }
489 +
721 490 }
722 491
723 492 if(isset($_POST['home_enabled'])) {
724 - if (trim(strip_tags($_POST['home_widget_id'])) == '') {
493 + if (trim($_POST['home_widget_id']) == '') {
725 494 $taboola_errors[] = "Homepage > Widget ID";
726 495 }
727 - if (trim(strip_tags($_POST['home_placement'])) == '') {
496 + if (trim($_POST['home_placement']) == '') {
728 497 $taboola_errors[] = "Homepage > Placement Name";
729 498 }
730 499
731 - if (trim(strip_tags($_POST['home_location_string'])) == '') {
500 + if (trim($_POST['home_location_string']) == '') {
732 501 $taboola_errors[] = "Homepage > CSS selector";
733 502 }
734 503 else {
504 + // If the 'location' WAS filled in, then...
505 +
506 + // 1) Check for a valid 'location':
507 +
508 + // Validation method has not been implemented
509 + // if (!$this->is_home_location_string_valid($_POST['home_location_string'])) {
510 + // $taboola_errors[] = "Homepage > CSS Selector (invalid value)";
511 + // }
512 +
513 + // 2) Validate the 'occurrence':
735 514 if (!empty($_POST['home_location_string']) && !$this->is_home_location_string_occurrence_valid($_POST['home_location_string_occurrence'])) {
736 515 $taboola_errors[] = "Homepage > Occurance (must be >= 1)";
737 516 }
738 517 }
739 - }
740 - if ( isset($_POST['category_enabled']) ) {
741 - if ( trim(strip_tags($_POST['category_widget_id'])) == '' )
742 - $taboola_errors[] = "Category > Widget ID";
743 - if ( trim(strip_tags($_POST['category_placement'])) == '' )
744 - $taboola_errors[] = "Category > Placement Name";
745 - }
518 + }
746 519
747 520 if(count($taboola_errors) == 0){
748 -
749 - $mid_widgets_data = array();
750 - if (isset($_POST['mid_widget_id']) && is_array($_POST['mid_widget_id'])) {
751 - foreach ($_POST['mid_widget_id'] as $index => $widget_id) {
752 - if (!empty(trim($widget_id))) {
753 -
754 - $location_string = 'p';
755 - if (isset($_POST['mid_paragraph_ui_mode'][$index]) && $_POST['mid_paragraph_ui_mode'][$index] === 'Other') {
756 - if (isset($_POST['mid_location_string'][$index])) {
757 - $location_string = sanitize_text_field($_POST['mid_location_string'][$index]);
758 - }
759 - }
760 521
761 - $mid_widgets_data[] = array(
762 - 'widget_id' => sanitize_text_field($widget_id),
763 - 'placement' => sanitize_text_field($_POST['mid_placement'][$index]),
764 - 'location_string' => $location_string,
765 - 'occurrence' => intval($_POST['mid_location_string_occurrence'][$index]),
766 - );
767 - }
768 - }
769 - }
770 - $mid_widgets_json = json_encode($mid_widgets_data);
771 -
772 - /* $wpdb formats every value as %s unless told otherwise, so a PHP
773 - false or an empty string reaches MySQL as ''. Under
774 - STRICT_TRANS_TABLES (the MySQL 8 default) '' is rejected for the
775 - TINYINT/INT columns and the whole write is refused. Send real
776 - integers for the flags and NULL for empty numeric fields. */
777 522 $data = array(
778 523 "publisher_id" => trim($_POST['publisher_id']),
779 524
780 - "web_push_enabled" => isset($_POST['web_push_enabled']) ? 1 : 0,
781 - "publisher_id_push" => $this->nullable_int($_POST['publisher_id_push'] ?? null),
782 -
783 - "first_bc_enabled" => isset($_POST['first_bc_enabled']) ? 1 : 0,
525 + "first_bc_enabled" => isset($_POST['first_bc_enabled']) ? true : false,
784 526 "first_bc_widget_id" => !empty($_POST['first_bc_widget_id']) ? trim($_POST['first_bc_widget_id']) : '',
785 527 "first_bc_placement" => !empty($_POST['first_bc_placement']) ? trim($_POST['first_bc_placement']) : '',
786 528
787 - "out_of_content_enabled" => isset($_POST['out_of_content_enabled']) ? 1 : 0,
529 + "out_of_content_enabled" => isset($_POST['out_of_content_enabled']) ? true : false,
788 530
789 - "mid_enabled" => isset($_POST['mid_enabled']) ? 1 : 0,
790 - "mid_widgets" => $mid_widgets_json,
791 -
792 - "home_enabled" => isset($_POST['home_enabled']) ? 1 : 0,
531 + "mid_enabled" => isset($_POST['mid_enabled']) ? true : false,
532 + "mid_widget_id" => !empty($_POST['mid_widget_id']) ? trim($_POST['mid_widget_id']) : '',
533 + "mid_placement" => !empty($_POST['mid_placement']) ? trim($_POST['mid_placement']) : '',
534 + "mid_paragraph_ui_mode" => !empty($_POST['mid_paragraph_ui_mode']) ? trim($_POST['mid_paragraph_ui_mode']) : '',
535 +
536 + "mid_location_string_occurrence" => !empty($_POST['mid_location_string_occurrence']) ? $_POST['mid_location_string_occurrence'] : '',
537 + "mid_location_string" => !empty($_POST['mid_location_string']) ? trim($_POST['mid_location_string']) : '',
538 +
539 + "home_enabled" => isset($_POST['home_enabled']) ? true : false,
793 540 "home_widget_id" => !empty($_POST['home_widget_id']) ? trim($_POST['home_widget_id']) : '',
794 541 "home_placement" => !empty($_POST['home_placement']) ? trim($_POST['home_placement']) : '',
795 542
796 - "home_location_string_occurrence" => $this->nullable_int($_POST['home_location_string_occurrence'] ?? null),
797 - "home_location_string" => !empty($_POST['home_location_string']) ? trim($_POST['home_location_string']) : '',
798 - "category_enabled" => isset($_POST['category_enabled']) ? 1 : 0,
799 - "category_widget_id" => !empty($_POST['category_widget_id']) ? trim($_POST['category_widget_id']) : '',
800 - "category_placement" => !empty($_POST['category_placement']) ? trim($_POST['category_placement']) : '',
801 - "category_location_string_occurrence" => $this->nullable_int($_POST['category_location_string_occurrence'] ?? null),
802 - "category_location_string" => !empty($_POST['category_location_string']) ? trim($_POST['category_location_string']) : '',
543 + "home_location_string_occurrence" => !empty($_POST['home_location_string_occurrence']) ? $_POST['home_location_string_occurrence'] : '',
544 + "home_location_string" => !empty($_POST['home_location_string']) ? trim($_POST['home_location_string']) : ''
545 + );
803 546
804 - );
547 + //var_dump($settings);
805 548
806 549 $is_valid_nonce = false;
807 550
808 551 if (isset( $_POST['my_plugin_nonce']) && wp_verify_nonce( $_POST['my_plugin_nonce'], 'my_plugin_update_field_action' ) ) {
@@ -810,27 +553,21 @@
810 553 }
811 554
812 555 if ($is_valid_nonce) {
813 556 if($settings == NULL){
814 - $saved = $wpdb->insert($this->tbl_taboola_settings, $data);
557 + $wpdb->insert($this->tbl_taboola_settings, $data, null, null);
815 558 } else {
816 - $saved = $wpdb->update($this->tbl_taboola_settings, $data, array('id' => $settings->id));
559 + $wpdb->update($this->tbl_taboola_settings, $data, array('id' => $settings->id));
817 560 }
561 + }
818 562
819 - // update() returns 0 when nothing changed; only false is a failure.
820 - if ($saved === false) {
821 - $taboola_save_error = "The database rejected the write, so your changes were not saved: "
822 - . ($wpdb->last_error !== '' ? $wpdb->last_error : 'unknown database error');
823 - }
824 - } else {
825 - $taboola_save_error = "Security check failed - the settings page had been open too long. Reload it and apply your changes again.";
826 - }
827 563 }
828 564 $settings = $wpdb->get_row("select * from ".$wpdb->prefix."_taboola_settings limit 1");
829 565 }
566 +
830 567 include_once('settings.php');
831 568 }
832 -
569 +
833 570 function is_mid_location_string_valid($mid_location_string){
834 571 // TODO:: validate the location string
835 572 return true;
836 573 }
@@ -854,9 +591,8 @@
854 591 return true;
855 592 }
856 593 return false;
857 594 }
858 -
859 595 function columnExists($column_name) {
860 596 global $wpdb;
861 597 $table_name = $wpdb->prefix . "_taboola_settings";
862 598 tb_write_log("table name : " . $table_name);
@@ -882,44 +618,60 @@
882 618 else {
883 619 tb_write_log("This is NOT a v1 upgrade!"); //PC
884 620 return false;
885 621 }
622 +
886 623 }
887 624
888 625 function is_db_updated_for_min_ver($min_ver) {
626 + /**
627 + * Checks if the DB was *previously* updated for the minimum version specified.
628 + * $min_ver should be passed in a format like this: "2.1.0"
629 + */
889 630 global $wpdb;
890 - $table_name = $wpdb->prefix . "_taboola_settings";
891 631
892 - if($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
893 - tb_write_log("Table NOT FOUND");
894 - return false;
895 - }
896 - else {
897 - tb_write_log("Table EXISTS");
898 - }
632 + // Check the saved version in wp_options. Default to '1.0.0' if the option is not found.
899 633 $saved_version = get_option(TABOOLA_OPTION_NAME, '1.0.0');
900 634
901 635 $db_is_up_to_date = version_compare($saved_version, $min_ver, '>=');
636 + //tb_write_log($db_is_up_to_date);
902 637 return $db_is_up_to_date;
903 638
904 639 }
905 640
906 641 function is_db_updated_for_current_ver() {
642 + /**
643 + * Checks if the DB was *previously* updated for the version currently loaded.
644 + */
907 645 global $wpdb;
646 +
647 + // Check the saved version in wp_options. Default to '1.0.0' if the option is not found.
908 648 $saved_version = get_option(TABOOLA_OPTION_NAME, '1.0.0');
649 +
650 + // Get the currently loaded plugin version from wp_options.
909 651 $plugin_version = $this->get_loaded_plugin_version();
652 +
910 653 $db_is_up_to_date = version_compare($saved_version, $plugin_version, '>=');
654 + //tb_write_log($db_is_up_to_date);
911 655 return $db_is_up_to_date;
656 +
912 657 }
913 658
914 659 function get_loaded_plugin_version() {
915 - $plugin_data = get_plugin_data( __FILE__ );
660 +
661 + $plugin_data = get_plugin_data( __FILE__ ); // Can be invoked from Admin page only
916 662 $loaded_plugin_version = $plugin_data['Version'];
917 663 return $loaded_plugin_version;
664 +
918 665 }
919 666
920 667 function save_taboola_version($min_ver) {
668 + // Get the currently loaded plugin version
669 + // $plugin_version = $this->get_loaded_plugin_version();
670 +
921 671 tb_write_log("SAVING NEW MIN VERSION: " . $min_ver); // PC
672 +
673 + // Check the saved version in wp_options. Default to '' if the option is not found.
922 674 $saved_version = get_option(TABOOLA_OPTION_NAME, '');
923 675 if ($saved_version == '') {
924 676 add_option(TABOOLA_OPTION_NAME, $min_ver);
925 677 }
@@ -928,9 +680,12 @@
928 680 }
929 681 }
930 682
931 683 function update_db(){
684 +
685 + // If we are up to date, then skip this method...
932 686 if ($this->is_db_updated_for_min_ver(TABOOLA_MIN_VER)) {
687 + //tb_write_log("All up to date!");
933 688 return;
934 689 }
935 690
936 691 $this->save_taboola_version(TABOOLA_MIN_VER);
@@ -937,41 +692,54 @@
937 692
938 693 global $wpdb;
939 694 require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
940 695
941 - $charset_collate = '';
942 - if ( ! empty( $wpdb->charset ) ) {
943 - $charset_collate = "DEFAULT CHARACTER SET {$wpdb->charset}";
696 +
697 + //check mysql version
698 + if (function_exists('mysql_get_server_info') && version_compare(mysql_get_server_info(), '4.1.0', '>=')) {
699 + if (!empty($wpdb->charset))
700 + $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
701 + if (!empty($wpdb->collate))
702 + $charset_collate .= " COLLATE $wpdb->collate";
944 703 }
945 - if ( ! empty( $wpdb->collate ) ) {
946 - $charset_collate .= " COLLATE {$wpdb->collate}";
947 - }
948 704
705 + // Check if this is an upgrade from v1
949 706 $is_upgrade_from_v1 = $this->is_upgrade_from_v1();
707 +
708 + // tb_write_log("Is upgrade from v1: " . ($is_upgrade_from_v1 ? 'true' : 'false'));
709 +
710 +
711 + //settings table structure
950 712 $sql_table_settings = "
951 713 CREATE TABLE `" . $wpdb->prefix . "_taboola_settings` (
952 714 `id` INT NOT NULL AUTO_INCREMENT ,
953 715 `publisher_id` VARCHAR(255) DEFAULT NULL,
954 - `web_push_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
955 - `publisher_id_push` INT(15) DEFAULT NULL,
956 716 `first_bc_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
957 717 `first_bc_widget_id` VARCHAR(255) DEFAULT NULL,
958 718 `first_bc_placement` VARCHAR(255) DEFAULT " . ($is_upgrade_from_v1 ? "'below-article'" : "NULL") .",
719 + `first_bc_custom_css` TEXT DEFAULT NULL,
720 + `second_bc_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
721 + `second_bc_widget_id` VARCHAR(255) DEFAULT NULL,
722 + `second_bc_custom_css` TEXT DEFAULT NULL,
723 + `location_string` TEXT DEFAULT NULL,
724 + `mid_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
725 + `mid_widget_id` VARCHAR(255) DEFAULT NULL,
726 + `mid_placement` VARCHAR(255) DEFAULT NULL,
959 727 `out_of_content_enabled` TINYINT(1) NOT NULL DEFAULT TRUE,
960 - `mid_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
961 - `mid_widgets` TEXT DEFAULT NULL,
728 + `mid_location_string` TEXT DEFAULT NULL,
729 + `mid_location_string_occurrence` SMALLINT DEFAULT NULL,
730 + `mid_paragraph_ui_mode` VARCHAR(255) DEFAULT NULL,
962 731 `home_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
963 732 `home_widget_id` VARCHAR(255) DEFAULT NULL,
964 733 `home_placement` VARCHAR(255) DEFAULT NULL,
965 734 `home_location_string` TEXT DEFAULT NULL,
966 735 `home_location_string_occurrence` SMALLINT DEFAULT NULL,
967 - `category_enabled` TINYINT(1) NOT NULL DEFAULT FALSE,
968 - `category_widget_id` VARCHAR(255) DEFAULT NULL,
969 - `category_placement` VARCHAR(255) DEFAULT NULL,
970 - `category_location_string` TEXT DEFAULT NULL,
971 - `category_location_string_occurrence` SMALLINT DEFAULT NULL,
972 736 PRIMARY KEY (`id`)
973 - ) $charset_collate;";
737 + )" . $charset_collate . ";";
738 +
739 + // tb_write_log($sql_table_settings);
740 +
741 + // create/update the table
974 742 dbDelta($sql_table_settings);
975 743 }
976 744 }
977 745 }
@@ -978,13 +746,18 @@
978 746
979 747 global $taboolaWP;
980 748 $taboolaWP = new TaboolaWP();
981 749
750 +/*
751 +A few utility methods for logging
752 +*/
753 +
754 +// Writes debugging messages to 'logs/debug.log'.
755 +// The exact file location depends on *where* you trigger the function.
756 +// In this script, we trigger the function from the admin dashboard.
757 +// So the log file is located under 'wp-admin/logs'.
982 758 function tb_write_log($log_msg)
983 759 {
984 - if (!TABOOLA_DEBUG_MODE)
985 - return;
986 -
987 760 $log_filename = "logs";
988 761 if (!file_exists($log_filename))
989 762 {
990 763 mkdir($log_filename, 0777, true);
@@ -990,14 +763,18 @@
990 763 mkdir($log_filename, 0777, true);
991 764 }
992 765 $log_file_data = $log_filename.'/debug.log';
993 766
767 + // Add date/time
994 768 $date = date('Y-m-d H:i:s');
995 769 $log_msg_with_date = $date." : ".$log_msg;
996 -
997 - file_put_contents($log_file_data, $log_msg_with_date . "\n", FILE_APPEND);
770 +
771 + if (TABOOLA_DEBUG_MODE)
772 + file_put_contents($log_file_data, $log_msg_with_date . "\n", FILE_APPEND);
773 +
998 774 }
999 775
776 +// Write to console
1000 777 function tb_console_log( $data ){
1001 778
1002 779 If(wp_get_environment_type() === 'development') {
1003 780
@@ -1007,8 +784,9 @@
1007 784
1008 785 }
1009 786 }
1010 787
788 +// Write to webpage and stop
1011 789 function tb_print_to_page($data) {
1012 790 If(wp_get_environment_type() === 'development') {
1013 791 print_r($data);
1014 792 die;
@@ -1014,16 +792,5 @@
1014 792 die;
1015 793 }
1016 794 }
1017 795
1018 -function enqueue_taboola_scripts() {
1019 - wp_register_script(
1020 - 'taboola-injector',
1021 - plugins_url('js/js_inject.min.js', __FILE__),
1022 - array(),
1023 - null,
1024 - true
1025 - );
1026 -
1027 - wp_enqueue_script('taboola-injector');
1028 -}
1029 -add_action('wp_enqueue_scripts', 'enqueue_taboola_scripts');
796 +//