Changeset 2795104

Timestamp:

10/06/2022 12:12:39 PM (3 years ago)

Author:

taboolawordpress

Message:

Minor fixes and improvements.

Location:

taboola

Files:

• tags/1.0.13 (added)
• tags/1.0.13/JavaScriptWrapper.php (added)
• tags/1.0.13/img (added)
• tags/1.0.13/img/arrow_right_32.png (added)
• tags/1.0.13/img/question-mark.png (added)
• tags/1.0.13/img/taboola.jpg (added)
• tags/1.0.13/img/taboola.png (added)
• tags/1.0.13/img/taboola_icon.png (added)
• tags/1.0.13/js (added)
• tags/1.0.13/js/flushInjectionScript.js (added)
• tags/1.0.13/js/js_inject.js (added)
• tags/1.0.13/js/js_inject.min.js (added)
• tags/1.0.13/js/loaderInjectionScript.js (added)
• tags/1.0.13/js/widgetInjectionScript.js (added)
• tags/1.0.13/readme.txt (added)
• tags/1.0.13/settings.php (added)
• tags/1.0.13/simple_html_dom.php (added)
• tags/1.0.13/taboola_widget.php (added)
• tags/1.0.13/widget.php (added)
• trunk/readme.txt (modified) (1 diff)
• trunk/settings.php (modified) (10 diffs)
• trunk/simple_html_dom.php (modified) (2 diffs)
• trunk/taboola_widget.php (modified) (4 diffs)

taboola/trunk/readme.txt

@@ -63 +63 @@
 == Changelog ==
 
+= 1.0.13 =
+* Minor fixes and improvements.
+
 = 1.0.12 =
 * Minor fix for PHP 8.0.x

taboola/trunk/settings.php

@@ -116 +116 @@
                 <td>Publisher ID</td>
                 <td>
-                    <input type="text" name="publisher_id" placeholder="publisher" value="<?php echo htmlspecialchars($settings->publisher_id) ?>"/>
+                    <input type="text" name="publisher_id" placeholder="publisher" value="<?php echo !empty($settings->publisher_id) ? htmlspecialchars($settings->publisher_id) : '' ?>"/>
                 </td>
                 <td class='tooltip'>
@@ -134 +134 @@
 
         <div class='checkbox'>
-            <input id="first_bc_enabled" type="checkbox" <?php echo $settings->first_bc_enabled ? "checked='checked'" : "" ?> name="first_bc_enabled"/>
+            <input id="first_bc_enabled" type="checkbox" <?php echo !empty($settings->first_bc_enabled) ? "checked='checked'" : "" ?> name="first_bc_enabled"/>
             Below Article
         </div>
@@ -141 +141 @@
                 <td>Widget ID</td>
                 <td>
-                    <input type="text" value="<?php echo $settings->first_bc_widget_id ?>" name="first_bc_widget_id" placeholder="Widget ID" />
+                    <input type="text" value="<?php echo !empty($settings->first_bc_widget_id) ? htmlspecialchars($settings->first_bc_widget_id) : '' ?>" name="first_bc_widget_id" placeholder="Widget ID" />
                 </td>
                 <td class='tooltip'>
@@ -153 +153 @@
 
         <div class='checkbox'>
-            <input id="second_bc_enabled" type="checkbox" <?php echo $settings->second_bc_enabled ? "checked='checked'" : "" ?> name="second_bc_enabled"/>
+            <input id="second_bc_enabled" type="checkbox" <?php echo !empty($settings->second_bc_enabled) ? "checked='checked'" : "" ?> name="second_bc_enabled"/>
             Below Article 2nd
         </div>
@@ -161 +161 @@
                 <td>Widget ID</td>
                 <td>
-                    <input type="text" value="<?php echo htmlspecialchars($settings->second_bc_widget_id) ?>" name="second_bc_widget_id" placeholder="Widget ID" />
+                    <input type="text" value="<?php echo !empty($settings->second_bc_widget_id) ? htmlspecialchars($settings->second_bc_widget_id) : '' ?>" name="second_bc_widget_id" placeholder="Widget ID" />
                 </td>
                 <td class='tooltip'>
@@ -172 +172 @@
         <hr style='border-bottom: 1px solid #fafafa;'>
 
-        <?php $location_defined = (htmlspecialchars($settings->location_string) != ""); ?>
+        <?php $location_defined = !empty($settings->location_string); ?>
 
 
@@ -190 +190 @@
             <?php endif; ?>
 
-                   
             <tr>
                 <td>Location</td>
                 <td>
-                    <input type="text" value="<?php echo htmlspecialchars($settings->location_string) ?>" name="location_string" placeholder="" />
+                    <input type="text" value="<?php echo !empty($settings->location_string) ? htmlspecialchars($settings->location_string) : '' ?>" name="location_string" placeholder="" />
                 </td>
                 <td class='tooltip'>
@@ -203 +202 @@
             <tr>
                 <td colspan="2"> <div class='checkbox'>
-                        <input id="out_of_content_enabled" type="checkbox" <?php echo $settings->out_of_content_enabled ? "checked='checked'" : "" ?> name="out_of_content_enabled"/>
+                        <input id="out_of_content_enabled" type="checkbox" <?php echo !empty($settings->out_of_content_enabled) ? "checked='checked'" : "" ?> name="out_of_content_enabled"/>
                         Place widget after main content DOM element
                     </div></td>
@@ -212 +211 @@
 
             </tr>
-
 
         </table>
@@ -221 +219 @@
 
     <?php
-        $logPublisher = ($settings->publisher_id == "") ? "wordpressplugin" : $settings->publisher_id;
+        $logPublisher = empty($settings->publisher_id) ? "wordpressplugin" : $settings->publisher_id;
         $userDetails = wp_get_current_user();
         $detailsString = $userDetails->first_name." ".$userDetails->last_name;

taboola/trunk/simple_html_dom.php

@@ -1034 +1034 @@
         if ($str)
         {
-            if (preg_match("/^https:\/\//i",$str) || is_file($str))
+            if (preg_match("/^http:\/\//i",$str) || is_file($str))
             {
                 $this->load_file($str);
@@ -1222 +1222 @@
         if (empty($charset))
         {
-            $el = $this->root->find('meta[https-equiv=Content-Type]',0, true);
+            $el = $this->root->find('meta[http-equiv=Content-Type]',0, true);
             if (!empty($el))
             {

taboola/trunk/taboola_widget.php

@@ -4 +4 @@
  * Plugin URI: https://developers.taboola.com/web-integrations/discuss
  * Description: Taboola
- * Version: 1.0.12
+ * Version: 1.0.13
  * Author: Taboola
  */
@@ -14 +14 @@
 define ("TABOOLA_CONTENT_FORMAT_SCRIPT",'script');
 define ("TABOOLA_CONTENT_FORMAT_HTML",'html');
-define ("TABOOLA_PLUGIN_VERSION","1.0.12");
+define ("TABOOLA_PLUGIN_VERSION","1.0.13");
 
 
@@ -59 +59 @@
             }
 
-            $this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled;
+            //$this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled;
 
             if (is_admin()) {
@@ -255 +255 @@
 
             // tag is placed outside of content in order to allow "read more" functionality.
-            }elseif ($this->should_place_tag_outside_of_content){
+            }elseif ($this->settings->out_of_content_enabled){
 
                 $scriptWrapper = new JavaScriptWrapper("js_inject.min.js",array(