Commit Plugin Version 1.8.2

valeriiiiiia · valeriiiiiia · commit c665169a8647 · 2016-08-09T12:44:42.000+02:00
Bug fixing: creative delivery now working properly with https
diff --git a/classes/PerformanceAds.php b/classes/PerformanceAds.php
@@ -78,11 +78,11 @@ public static function getAdCode($size)
         }
 
         $html = '<script language="javascript" type="text/javascript" src="' .
-            'http://' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=html&hnb=' . $hnb . '&js=1&subid='.$subId.
+            '//' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=html&hnb=' . $hnb . '&js=1&subid='.$subId.
             '"></script><noscript><a href="' .
-            'http://' . $clickUrl . '/click.asp?ref=' . $publisherId . '&site=' . $programId . '&type=b1&bnb=1&subid='.$subId.
+            '//' . $clickUrl . '/click.asp?ref=' . $publisherId . '&site=' . $programId . '&type=b1&bnb=1&subid='.$subId.
             '" target="_blank"><img src="' .
-            'http://' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&b=1&subid='.$subId.
+            '//' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&b=1&subid='.$subId.
             '" border="0"/></a><br /></noscript>';
 
         return $html;
diff --git a/classes/Plugin.php b/classes/Plugin.php
@@ -10,30 +10,27 @@ public function __construct()
         add_action('widgets_init', array($this, 'register_widget'));
 
         add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
-        add_action('admin_enqueue_scripts', array('Affilinet_View', 'settings_script') );
 
-        add_action('admin_head', array($this, 'editor_add_buttons'));
-        add_action('plugins_loaded', array($this, 'load_textdomain'));
+        // the script for settings page is currently not needed
+        //add_action('admin_enqueue_scripts', array('Affilinet_View', 'settings_script') );
 
+        add_action('plugins_loaded', array($this, 'load_textdomain'));
         add_shortcode('affilinet_performance_ad', array($this, 'performance_ad_shortcode'));
 
         /**
          * Disable YieldKit functionality in Version 1
          *
         if (get_option('affilinet_text_monetization') === '1'
-            ||
-            get_option('affilinet_link_replacement') === '1'
-            ||
-            get_option('affilinet_text_widget') === '1'
+        ||
+        get_option('affilinet_link_replacement') === '1'
+        ||
+        get_option('affilinet_text_widget') === '1'
         ) {
-            add_action('wp_footer', array($this, 'yielkit_code'));
+        add_action('wp_footer', array($this, 'yielkit_code'));
         }
 
          * End Disable YieldKit in Version 1
          */
-        foreach ( array('post.php','post-new.php') as $hook ) {
-            add_action( "admin_head-$hook",array($this, 'affilinet_adminScript') );
-        }
 
     }
 
@@ -86,14 +83,27 @@ public function register_widget()
     }
 
     /**
-     * Load jquery.flot.js for reporting page
+     * Load Admin scripts
+     * @param $hook string
      */
-    public function admin_enqueue_scripts()
+    public function admin_enqueue_scripts($hook)
     {
-        wp_register_script('flot',      plugin_dir_url( plugin_basename( dirname(__FILE__) )  ).'js/jquery-flot/jquery.flot.js', array('jquery'));
-        wp_register_script('flot.time', plugin_dir_url( plugin_basename( dirname(__FILE__) )  ).'js/jquery-flot/jquery.flot.time.js', array('jquery', 'flot'));
-        wp_enqueue_script('flot');
-        wp_enqueue_script('flot.time');
+        // on post page add the editor button for affilinet plugin
+        if ($hook === 'post.php' || $hook == 'post-new.php') {
+
+            add_action('admin_head', array($this, 'editor_add_buttons'));
+            add_action( "admin_head-$hook",array($this, 'affilinet_adminScript') );
+        }
+
+        // on reporting page add jquery.flot
+        if ($hook === 'affilinet_page_affilinet_reporting') {
+            wp_register_script('flot',      plugin_dir_url( plugin_basename( dirname(__FILE__) )  ).'js/jquery-flot/jquery.flot.js', array('jquery'));
+            wp_register_script('flot.time', plugin_dir_url( plugin_basename( dirname(__FILE__) )  ).'js/jquery-flot/jquery.flot.time.js', array('jquery', 'flot'));
+            wp_enqueue_script('flot');
+            wp_enqueue_script('flot.time');
+        }
+
+
     }
 
     /**
@@ -151,7 +161,7 @@ public function affilinet_adminScript()
             };
         </script>
         <!-- TinyMCE Shortcode Plugin -->
-    <?php
+        <?php
     }
 
     public function add_buttons($plugin_array)
@@ -170,7 +180,7 @@ public function register_buttons($buttons)
 
     public function yielkit_code()
     {
-       echo Affilinet_Yieldkit::getAdCode();
+        echo Affilinet_Yieldkit::getAdCode();
     }
 
 }
diff --git a/classes/View.php b/classes/View.php
@@ -72,11 +72,16 @@ function euroFormatter(v, axis)
                 ], options);
 
         </script>
-    <?php
+        <?php
     }
 
-    public static function settings_script($hook_suffix)
+    public static function settings_script($hook)
     {
+        // this js is only needed on settings page
+        if ($hook !== 'affilinet_page_affilinet_settings') {
+            return;
+        }
+
         include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
         /** @var String $wp_version */
         if ($wp_version < 3.5) {
diff --git a/classes/Yieldkit.php b/classes/Yieldkit.php
@@ -82,7 +82,7 @@ public static function getAdCode()
         $ywcolor = str_replace('#','',$ywcolor);
         $hnb = 1;
 
-        $scriptUrl = 'http://' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=html&hnb=' . $hnb . '&js=1' .
+        $scriptUrl = '//' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=html&hnb=' . $hnb . '&js=1' .
             '&yword='. $yword.
             '&ylink='.$ylink
             .'&ywidget='.$ywidget
@@ -92,7 +92,7 @@ public static function getAdCode()
             .'&ywcolor='.$ywcolor
             .'&ywcid=content&ywcclass=site-content';
 
-        $noScriptUrl = 'http://' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=b1&bnb=1' .
+        $noScriptUrl = '//' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&type=b1&bnb=1' .
             '&yword='. $yword.
             '&ylink='.$ylink
             .'&ywidget='.$ywidget
@@ -107,7 +107,7 @@ public static function getAdCode()
             .'"></script><noscript><a href="'
             .$noScriptUrl
             .'" target="_blank"><img title="1x1" alt="1x1" src="'
-            .'http://' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&b=1'
+            .'//' . $viewUrl . '/view.asp?ref=' . $publisherId . '&site=' . $programId . '&b=1'
             .'" border="0"/></a><br /></noscript>';
 
         return $html;
diff --git a/readme.txt b/readme.txt
@@ -1,34 +1,48 @@
 === Affilinet Performance Ads ===
 Contributors: Affilinet, teraone
-Tags: advertising, affilinet, affiliate marketing, display, advertisement, vermarktung, geld verdienen, online marketing, marketing, performance
+Tags: affiliate marketing, online marketing, performance marketing, marketing, advertisement, advertising, advertise, affilinet, Affiliate, performance, Display, earn money, monetization, monetize, Monetarisierung, performance, Vermarktung, Banner, Geld verdienen, werbeintegration, Werbung
 Requires at least: 3.0.1
-Tested up to: 4.4
-Stable tag: 1.8.1
+Tested up to: 4.5
+Stable tag: 1.8.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 Integrate our data driven and automated performance display plugin into your WordPress platform and serve your users targeted ads in real time.
 
 == Description ==
-
+= English =
 Integrate affilinet's data driven advertising technology and automated ad display services seamlessly into your WordPress platform and serve the right message, at the right time, to the right person. Dont't worry about ad codes. This plugin will handle all technical details for you.
 
-You can easily add display ads to any sidebar of your blog. This plugin also enhances your WYSIWYG editor, thus its possible to integrate display ads in your content with just one click.
-
 This plugin comes with a statistic page where you can see your daily earnings. You will just have to enter your affilinet Webservice Password.
 
 The benefits at a glance:
 
-* Quick and simple sign up to the affilinet platform
 * Easy integration of intelligent display ad units into your site
+* Quick and simple sign up to the affilinet platform
 * Targeted adverts mean more relevancy for your readers and ultimately more earnings from your website
 
-We’ve made it really easy to get started.
+We’ve made it really easy to get started. If you need integration support, please watch our tutorial on Youtube: https://www.youtube.com/watch?v=AtZHeD1CK-E
 
 If you have any questions or need support please contact us at affilinet@teraone.de
 
 = German =
-Nutzen Sie die neue Data-Driven Advertising Technologie mit automatisierter Werbemittelausspielung, die Ihre User in Echtzeit anspricht.
+Nutzen Sie die neue Data-Driven Advertising Technologie mit automatisierter Werbemittelausspielung von affilinet, die Ihre User in Echtzeit anspricht! Mithilfe dieses Plugins wird Ihren Besuchern die richtige Werbebotschaft zur richtigen Zeit angezeigt – und das ohne jeglichen Programmieraufwand! Eine manuelle Integration des Ad Codes ist nicht erforderlich.
+
+Das affilinet Plugin für WordPress bietet Ihnen die Möglichkeit, zielgruppenadäquate Werbung ganz einfach auf der eigenen Webseite zu integrieren und so Ihren Blog oder Ihre Content-Website gezielt zu monetarisieren. Das Plugin bietet zahlreiche Auswahloptionen zur Platzierung der Banner auf der Seite. Die Werbeanzeigen lassen sich dabei ganz einfach in die Sidebar und in den Content-Bereich Ihres Blogs integrieren. Darüber hinaus bietet das Plugin eine Statistik- Funktionalität, die eine Übersicht über Ihre täglichen Einnahmen liefert.
+
+Ihre Vorteile im Überblick:
+
+* Einfache Integration von Werbung auf Ihrer Seite
+* Intelligente Werbemittelausspielung dank innovativer Data-Driven Advertising Technologie
+* Schnelle und einfache Registrierung bei affilinet
+* Mehr Relevanz für Ihre Besucher durch gezielte Werbeanzeigen
+
+So können Sie Ihren Besuchern in kürzester Zeit und ohne großen Aufwand profildatenbasierte Werbung anzeigen und mehr Sales durch höhere Relevanz der Werbeinhalte erreichen!
+
+Falls Sie noch Fragen zur genauen Integration haben, schauen Sie sich gerne unser dazugehöriges Tutorial auf Youtube an: https://www.youtube.com/watch?v=AtZHeD1CK-E
+
+Oder wenden Sie sich einfach an Ihren Ansprechpartner bei affilinet oder senden Sie eine Email an affilinet@teraone.de.
+
 
 = French =
 Profitez des avantages de notre nouvelle technologie publicitaire! Diffusez en temps réel des publicités ciblées selon le profil des internautes.
@@ -88,6 +102,11 @@ It may take up to 90 minutes for ads to show, additionally all publisher account
 
 == Changelog ==
 
+= 1.8.2 =
+* Release Date: June 22, 2016
+* Supporting pages under https
+* Enhanced compatibility with other plugins
+
 = 1.8.1 =
 * Release Date: August 26, 2015
 * enhanced installation docs
