From fa5bd3dc01a487c1db71fba55e00920d41acb79c Mon Sep 17 00:00:00 2001 From: Arnan de Gans Date: Wed, 4 Sep 2024 11:15:25 -0600 Subject: [PATCH] Version 5.13.4 --- adrotate-admin-functions.php | 6 ++--- adrotate-admin-manage.php | 16 ++++------- adrotate.php | 2 +- dashboard/adrotatepro.php | 5 ++-- dashboard/publisher/adverts-edit.php | 2 +- dashboard/publisher/adverts-generator.php | 33 ++++++++++++----------- dashboard/publisher/media.php | 20 +++++++------- readme.txt | 8 ++++-- 8 files changed, 45 insertions(+), 47 deletions(-) diff --git a/adrotate-admin-functions.php b/adrotate-admin-functions.php index 3b4e6ee..a0a571d 100644 --- a/adrotate-admin-functions.php +++ b/adrotate-admin-functions.php @@ -622,16 +622,16 @@ function adrotate_credits() { echo ""; echo ""; echo " ".__("Get more features with AdRotate Professional", 'adrotate').""; - echo " ".__("Starting at € 49.00", 'adrotate')." - ".__("Compare Licenses", 'adrotate')." »"; + echo " ".__("Starting at € 49.00", 'adrotate')." - ".__("Compare Licenses", 'adrotate')." »"; echo ""; echo ""; echo ""; echo ""; - echo "

".__("AdRotate Professional has a lot more to offer for even better advertising management and premium support. Enjoy features like Geo Targeting, Schedules, more advanced Post Injection and much more. Check out the feature comparison tab on any of the product pages to see what AdRotate Pro has to offer for you! When you upgrade to AdRotate Professional make sure you use coupon GETADROTATEPRO on checkout for 10 percent off on any license.", 'adrotate')." ".__("Compare Licenses", 'adrotate')." »

"; + echo "

".__("AdRotate Professional has a lot more to offer for even better advertising management and premium support. Enjoy features like Geo Targeting, Schedules, more advanced Post Injection and much more. Check out the feature comparison tab on any of the product pages to see what AdRotate Pro has to offer for you! When you upgrade to AdRotate Professional make sure you use coupon GETADROTATEPRO on checkout for 10 percent off on any license.", 'adrotate')." ".__("Compare Licenses", 'adrotate')." »

"; - echo "

".__("Get a Single License", 'adrotate')."
".__("One year of updates for one WordPress website.", 'adrotate')."

"."

".__("Go big with the Multi License", 'adrotate')."
".__("One year of updates for up-to five WordPress websites.", 'adrotate')."

"; + echo "

".__("Get a Single License", 'adrotate')."
".__("One year of updates for one WordPress website.", 'adrotate')."

"."

".__("Go big with the Multi License", 'adrotate')."
".__("One year of updates for up-to five WordPress websites.", 'adrotate')."

"; echo ""; diff --git a/adrotate-admin-manage.php b/adrotate-admin-manage.php index 1fec59b..bf3d6fc 100644 --- a/adrotate-admin-manage.php +++ b/adrotate-admin-manage.php @@ -20,14 +20,10 @@ function adrotate_generate_input() { $id = ''; if(isset($_POST['adrotate_id'])) $id = sanitize_key($_POST['adrotate_id']); - $fullsize_image = $targeturl = $nofollow = $basic_dropdown = $adwidth = $adheight = ''; + $fullsize_image = $targeturl = $new_window = $portability = $nofollow = $adwidth = $adheight = ''; if(isset($_POST['adrotate_fullsize_dropdown'])) $fullsize_image = strip_tags(trim($_POST['adrotate_fullsize_dropdown'])); if(isset($_POST['adrotate_targeturl'])) $targeturl = strip_tags(trim($_POST['adrotate_targeturl'])); - - $new_window = ''; if(isset($_POST['adrotate_newwindow'])) $new_window = strip_tags(trim($_POST['adrotate_newwindow'])); - - $portability = ''; if(isset($_POST['adrotate_portability'])) $portability = strip_tags(trim($_POST['adrotate_portability'])); if(current_user_can('adrotate_ad_manage')) { @@ -37,20 +33,16 @@ function adrotate_generate_input() { if($fullsize_size){ $adwidth = " width=\"".$fullsize_size[0]."\""; $adheight = " height=\"".$fullsize_size[1]."\""; - } else { - $adwidth = $adheight = ""; } // Open in a new window? if(isset($new_window) AND strlen($new_window) != 0) { $new_window = " target=\"_blank\""; - } else { - $new_window = ""; } // Determine image settings $imagetype = 'dropdown'; - $image = WP_CONTENT_URL."/%folder%/".$fullsize_image; + $image = WP_CONTENT_URL."/banners/".$fullsize_image; $asset = ""; // Generate code @@ -219,7 +211,9 @@ function adrotate_insert_advert() { } unset($value); - // Verify ad + // Verify ads + adrotate_evaluate_ads(); + if($type == 'empty') { $action = 'new'; } else { diff --git a/adrotate.php b/adrotate.php index e2f2a47..49a87b7 100644 --- a/adrotate.php +++ b/adrotate.php @@ -6,7 +6,7 @@ Author URI: https://www.arnan.me/?mtm_campaign=adrotate&mtm_keyword=plugin_info Description: Manage all your adverts with all the features you need while keeping things simple. Text Domain: adrotate -Version: 5.13.3 +Version: 5.13.4 License: GPLv3 */ diff --git a/dashboard/adrotatepro.php b/dashboard/adrotatepro.php index e19f255..fbc6306 100644 --- a/dashboard/adrotatepro.php +++ b/dashboard/adrotatepro.php @@ -133,7 +133,6 @@
-

Let me know if you have any questions! -
I'm looking forward to your and message!

+

Let me know if you have any questions.
I'm looking forward to hearing from you!

- \ No newline at end of file + diff --git a/dashboard/publisher/adverts-edit.php b/dashboard/publisher/adverts-edit.php index c5d8d56..e800c7e 100644 --- a/dashboard/publisher/adverts-edit.php +++ b/dashboard/publisher/adverts-edit.php @@ -322,4 +322,4 @@ } else { echo adrotate_error('error_loading_item'); } -?> \ No newline at end of file +?> diff --git a/dashboard/publisher/adverts-generator.php b/dashboard/publisher/adverts-generator.php index 3c83ac2..8d6987c 100644 --- a/dashboard/publisher/adverts-generator.php +++ b/dashboard/publisher/adverts-generator.php @@ -9,7 +9,7 @@ * liability that might arise from its use. ------------------------------------------------------------------------------------ */ -if(!$ad_edit_id) { +if(!$ad_edit_id) { $edit_id = $wpdb->get_var("SELECT `id` FROM `{$wpdb->prefix}adrotate` WHERE `type` = 'generator' ORDER BY `id` DESC LIMIT 1;"); if($edit_id == 0) { $wpdb->insert($wpdb->prefix."adrotate", array('title' => '', 'bannercode' => '', 'thetime' => $now, 'updated' => $now, 'author' => $userdata->user_login, 'imagetype' => 'dropdown', 'image' => '', 'tracker' => 'N', 'desktop' => 'Y', 'mobile' => 'Y', 'tablet' => 'Y', 'os_ios' => 'Y', 'os_android' => 'Y', 'type' => 'generator', 'weight' => 6, 'autodelete' => 'N', 'budget' => 0, 'crate' => 0, 'irate' => 0, 'cities' => serialize(array()), 'countries' => serialize(array()))); @@ -28,28 +28,29 @@ wp_enqueue_media(); wp_enqueue_script('uploader-hook', plugins_url().'/adrotate/library/uploader-hook.js', array('jquery')); ?> - +
- +

- + - + - + - + @@ -98,13 +99,13 @@ - + - + @@ -125,13 +126,13 @@ - + - + @@ -142,16 +143,16 @@
-

- +

" />

- +


\ No newline at end of file +?> diff --git a/dashboard/publisher/media.php b/dashboard/publisher/media.php index f30d473..aeef149 100644 --- a/dashboard/publisher/media.php +++ b/dashboard/publisher/media.php @@ -28,13 +28,13 @@ if(array_key_exists('contents', $level_one)) { echo ""; } - } + } } } } ?> - +

" /> @@ -55,13 +55,13 @@ " /> - + 0) { $class = ''; foreach($assets as $asset) { $class = ($class != 'alternate') ? 'alternate' : ''; - + echo ""; echo ""; echo $asset['basename']; @@ -75,13 +75,13 @@ foreach($level_one['contents'] as $level_two) { echo "
—— ".$level_two['basename']; echo "".__("Delete", 'adrotate').""; - + unset($level_two); - } + } } - + unset($level_one); - } + } echo ""; } echo ""; @@ -100,5 +100,5 @@


- -

\ No newline at end of file + +

diff --git a/readme.txt b/readme.txt index 8826932..603d4b1 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Tested up to: 6.6.1 CP requires at least: 1.0 CP tested up to: 2.1.1 Requires PHP: 7.4 -Stable tag: 5.13.3 +Stable tag: 5.13.4 License: GPLv3 Advertising made easy. Manage all your ads including Google Ads, Amazon banners and many more from your dashboard. @@ -80,7 +80,7 @@ As a result **AdRotate Banner Manager** is trusted by tens of thousands of busin * Option to either track clicks or impressions, or both * Same day ticket support accessible from your dashboard -Learn all about [AdRotate Banner Manager](https://ajdg.solutions/product/adrotate-banner-manager/) and [AdRotate Pro](https://ajdg.solutions/product/adrotate-pro-single/) on my website! \ +Learn all about [AdRotate Banner Manager](https://ajdg.solutions/product/adrotate-banner-manager/) and [AdRotate Pro](https://ajdg.solutions/product/adrotate-pro-single/) on my website! Available AdRotate Pro licenses [1 site license](https://ajdg.solutions/product/adrotate-pro-single/) [2 sites license](https://ajdg.solutions/product/adrotate-pro-duo/) [5 sites license](https://ajdg.solutions/product/adrotate-pro-multi/) [100 sites license](https://ajdg.solutions/product/adrotate-pro-developer/) = Translations = @@ -107,6 +107,10 @@ For more detailed instructions check out the [installation steps](https://ajdg.s For the full changelog check out the [development page](https://ajdg.solutions/support/adrotate-development/?mtm_campaign=adrotate&mtm_kwd=readme). += AdRotate 5.13.4 = +* [fix] Image selection not kept when using the advert generator +* [fix] webp images are now listed in the advert generator + = AdRotate 5.13.3 = * [change] Use WordPress native function when uploading files * [change] Use WordPress native function when creating folders