Photo Gallery by WD – Responsive Photo Gallery - Version 1.3.66

Version Description

  • Fixed: Minor bugs on widgets.
  • Updated: WD Library.
  • Fixed: Widget default parameters bug.
Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 Photo Gallery by WD – Responsive Photo Gallery
Version 1.3.66
Comparing to
See all releases

Code changes from version 1.3.65 to 1.3.66

Files changed (15) hide show
  1. framework/WDWLibrary.php +61 -62
  2. frontend/views/BWGViewSlideshow.php +9 -2
  3. photo-gallery.php +4 -4
  4. readme.txt +6 -1
  5. wd/README.md +1 -1
  6. wd/assets/css/deactivate_popup.css +1 -1
  7. wd/assets/css/overview.css +8 -1
  8. wd/assets/img/cfm_main_plugin.png +0 -0
  9. wd/assets/js/overview.js +2 -2
  10. wd/assets/js/subsribe.js +3 -3
  11. wd/includes/notices.php +170 -170
  12. wd/includes/overview.php +8 -0
  13. wd/templates/display_deactivation_popup.php +3 -4
  14. wd/templates/display_overview.php +39 -29
  15. wd/wd.php +1 -1
framework/WDWLibrary.php CHANGED
@@ -1641,7 +1641,7 @@ class WDWLibrary {
1641
  global $wd_bwg_options;
1642
  $theme = self::get_theme_row_data(0);
1643
  $use_option_defaults = (isset($params['use_option_defaults']) && $params['use_option_defaults'] == 1) ? TRUE : FALSE;
1644
-
1645
  $defaults = array(
1646
  'gallery_type' => $params['gallery_type'],
1647
  'gallery_id' => isset($params['gallery_id']) ? $params['gallery_id'] : 0,
@@ -1651,69 +1651,18 @@ class WDWLibrary {
1651
  'theme_id' => (!$use_option_defaults && isset($params['theme_id'])) ? $params['theme_id'] : $theme->id,
1652
  'sort_by' => (isset($params['sort_by'])) ? $params['sort_by'] : 'order',
1653
  'order_by' => (isset($params['order_by'])) ? $params['order_by'] : 'asc',
1654
- 'thumb_click_action' => ($use_option_defaults ? $wd_bwg_options->thumb_click_action : (isset($params['thumb_click_action']) && $params['thumb_click_action'] != 'undefined' ? $params['thumb_click_action'] : 'open_lightbox')),
1655
- 'image_title' => ($use_option_defaults ? $wd_bwg_options->image_title_show_hover : (isset($params['image_title']) ? $params['image_title'] : 'none')),
1656
- 'popup_fullscreen' => ($use_option_defaults ? $wd_bwg_options->popup_fullscreen : (isset($params['popup_fullscreen']) ? $params['popup_fullscreen'] : 0)),
1657
- 'popup_autoplay' => ($use_option_defaults ? $wd_bwg_options->popup_autoplay : (isset($params['popup_autoplay']) ? $params['popup_autoplay'] : 0)),
1658
- 'popup_enable_pinterest' => ($use_option_defaults ? $wd_bwg_options->popup_enable_pinterest : (isset($params['popup_enable_pinterest']) ? $params['popup_enable_pinterest'] : 0)),
1659
- 'popup_enable_tumblr' => ($use_option_defaults ? $wd_bwg_options->popup_enable_tumblr : (isset($params['popup_enable_tumblr']) ? $params['popup_enable_tumblr'] : 0)),
1660
  'show_search_box' => ($use_option_defaults ? $wd_bwg_options->show_search_box : (isset($params['show_search_box']) ? $params['show_search_box'] : 0)),
1661
  'search_box_width' => ($use_option_defaults ? $wd_bwg_options->search_box_width : (isset($params['search_box_width']) ? $params['search_box_width'] : 180)),
1662
- 'popup_enable_info' => ($use_option_defaults ? $wd_bwg_options->popup_enable_info : (isset($params['popup_enable_info']) ? $params['popup_enable_info'] : 1)),
1663
- 'popup_info_always_show' => ($use_option_defaults ? $wd_bwg_options->popup_info_always_show : (isset($params['popup_info_always_show']) ? $params['popup_info_always_show'] : 0)),
1664
- 'popup_info_full_width' => ($use_option_defaults ? $wd_bwg_options->popup_info_full_width : (isset($params['popup_info_full_width']) ? $params['popup_info_full_width'] : 0)),
1665
- 'popup_enable_rate' => ($use_option_defaults ? $wd_bwg_options->popup_enable_rate : (isset($params['popup_enable_rate']) ? $params['popup_enable_rate'] : 0)),
1666
- 'thumb_link_target' => ($use_option_defaults ? $wd_bwg_options->thumb_link_target : (isset($params['thumb_link_target']) ? $params['thumb_link_target'] : 1)),
1667
- 'popup_hit_counter' => ($use_option_defaults ? $wd_bwg_options->popup_hit_counter : (isset($params['popup_hit_counter']) ? $params['popup_hit_counter'] : 0)),
1668
  'show_sort_images' => ($use_option_defaults ? $wd_bwg_options->show_sort_images : (isset($params['show_sort_images']) ? $params['show_sort_images'] : 0)),
1669
  'image_enable_page' => ($use_option_defaults ? $wd_bwg_options->image_enable_page : (isset($params['image_enable_page']) ? $params['image_enable_page'] : 1)),
1670
  'show_tag_box' => ($use_option_defaults ? $wd_bwg_options->show_tag_box : (isset($params['show_tag_box']) ? $params['show_tag_box'] : 0)),
1671
  'show_gallery_description' => ($use_option_defaults ? $wd_bwg_options->show_gallery_description : (isset($params['show_gallery_description']) ? $params['show_gallery_description'] : 0)),
1672
  'showthumbs_name' => ($use_option_defaults ? $wd_bwg_options->showthumbs_name : (isset($params['showthumbs_name']) ? $params['showthumbs_name'] : $wd_bwg_options->showthumbs_name)),
1673
- 'popup_effect_duration' => ($use_option_defaults ? $wd_bwg_options->popup_effect_duration : (isset($params['popup_effect_duration']) ? $params['popup_effect_duration'] : 1)),
1674
- 'slideshow_title_full_width' => ($use_option_defaults ? $wd_bwg_options->slideshow_title_full_width : (isset($params['slideshow_title_full_width']) ? $params['slideshow_title_full_width'] : 0)),
1675
- 'enable_slideshow_music' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_music : (isset($params['enable_slideshow_music']) ? $params['enable_slideshow_music'] : 0)),
1676
- 'slideshow_music_url' => ($use_option_defaults ? $wd_bwg_options->slideshow_audio_url : (isset($params['slideshow_music_url']) ? $params['slideshow_music_url'] : '')),
1677
- 'slideshow_effect_duration' => ($use_option_defaults ? $wd_bwg_options->slideshow_effect_duration : (isset($params['slideshow_effect_duration']) ? $params['slideshow_effect_duration'] : 1)),
1678
- 'slideshow_effect' => ($use_option_defaults ? $wd_bwg_options->slideshow_type : (isset($params['slideshow_effect']) ? $params['slideshow_effect'] : 'fade')),
1679
- 'slideshow_interval' => ($use_option_defaults ? $wd_bwg_options->slideshow_interval : (isset($params['slideshow_interval']) ? $params['slideshow_interval'] : 5)),
1680
- 'slideshow_width' => ($use_option_defaults ? $wd_bwg_options->slideshow_width : (isset($params['slideshow_width']) ? $params['slideshow_width'] : 800)),
1681
- 'slideshow_height' => ($use_option_defaults ? $wd_bwg_options->slideshow_height : (isset($params['slideshow_height']) ? $params['slideshow_height'] : 600)),
1682
  'thumb_width' => ($use_option_defaults ? $wd_bwg_options->thumb_width : (isset($params['thumb_width']) ? $params['thumb_width'] : 120)),
1683
  'thumb_height' => ($use_option_defaults ? $wd_bwg_options->thumb_height : (isset($params['thumb_height']) ? $params['thumb_height'] : 90)),
1684
- 'enable_slideshow_autoplay' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_autoplay : (isset($params['enable_slideshow_autoplay']) ? $params['enable_slideshow_autoplay'] : $wd_bwg_options->slideshow_enable_autoplay)),
1685
- 'enable_slideshow_shuffle' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_shuffle : (isset($params['enable_slideshow_shuffle']) ? $params['enable_slideshow_shuffle'] : 0)),
1686
- 'enable_slideshow_ctrl' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_ctrl : (isset($params['enable_slideshow_ctrl']) ? $params['enable_slideshow_ctrl'] : $wd_bwg_options->slideshow_enable_ctrl)),
1687
- 'enable_slideshow_filmstrip' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_filmstrip : (isset($params['enable_slideshow_filmstrip']) ? $params['enable_slideshow_filmstrip'] : 0)),
1688
- 'slideshow_filmstrip_height' => ($use_option_defaults ? $wd_bwg_options->slideshow_filmstrip_height : (isset($params['slideshow_filmstrip_height']) ? $params['slideshow_filmstrip_height'] : 50)),
1689
- 'slideshow_enable_title' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_title : (isset($params['slideshow_enable_title']) ? $params['slideshow_enable_title'] : 0)),
1690
- 'slideshow_title_position' => ($use_option_defaults ? $wd_bwg_options->slideshow_title_position : (isset($params['slideshow_title_position']) ? $params['slideshow_title_position'] : 'bottom-right')),
1691
- 'slideshow_enable_description' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_description : (isset($params['slideshow_enable_description']) ? $params['slideshow_enable_description'] : 0)),
1692
- 'slideshow_description_position' => ($use_option_defaults ? $wd_bwg_options->slideshow_description_position : (isset($params['slideshow_description_position']) ? $params['slideshow_description_position'] : 'bottom-right')),
1693
- 'popup_width' => ($use_option_defaults ? $wd_bwg_options->popup_width : (isset($params['popup_width']) ? $params['popup_width'] : 800)),
1694
- 'popup_height' => ($use_option_defaults ? $wd_bwg_options->popup_height : (isset($params['popup_height']) ? $params['popup_height'] : 500)),
1695
- 'popup_effect' => ($use_option_defaults ? $wd_bwg_options->popup_type : (isset($params['popup_effect']) ? $params['popup_effect'] : 'none')),
1696
- 'popup_interval' => ($use_option_defaults ? $wd_bwg_options->popup_interval : (isset($params['popup_interval']) ? $params['popup_interval'] : 5)),
1697
- 'popup_enable_filmstrip' => ($use_option_defaults ? $wd_bwg_options->popup_enable_filmstrip : (isset($params['popup_enable_filmstrip']) ? $params['popup_enable_filmstrip'] : 0)),
1698
- 'popup_filmstrip_height' => ($use_option_defaults ? $wd_bwg_options->popup_filmstrip_height : (isset($params['popup_filmstrip_height']) ? $params['popup_filmstrip_height'] : 50)),
1699
- 'popup_enable_ctrl_btn' => ($use_option_defaults ? $wd_bwg_options->popup_enable_ctrl_btn : (isset($params['popup_enable_ctrl_btn']) ? $params['popup_enable_ctrl_btn'] : 1)),
1700
- 'popup_enable_fullscreen' => ($use_option_defaults ? $wd_bwg_options->popup_enable_fullscreen : (isset($params['popup_enable_fullscreen']) ? $params['popup_enable_fullscreen'] : 0)),
1701
- 'popup_enable_comment' => ($use_option_defaults ? $wd_bwg_options->popup_enable_comment : (isset($params['popup_enable_comment']) ? $params['popup_enable_comment'] : 0)),
1702
- 'popup_enable_facebook' => ($use_option_defaults ? $wd_bwg_options->popup_enable_facebook : (isset($params['popup_enable_facebook']) ? $params['popup_enable_facebook'] : 0)),
1703
- 'popup_enable_twitter' => ($use_option_defaults ? $wd_bwg_options->popup_enable_twitter : (isset($params['popup_enable_twitter']) ? $params['popup_enable_twitter'] : 0)),
1704
- 'popup_enable_google' => ($use_option_defaults ? $wd_bwg_options->popup_enable_google : (isset($params['popup_enable_google']) ? $params['popup_enable_google'] : 0)),
1705
- 'popup_enable_ecommerce' => ($use_option_defaults ? $wd_bwg_options->popup_enable_ecommerce : (isset($params['popup_enable_ecommerce']) ? $params['popup_enable_ecommerce'] : 0)),
1706
- 'watermark_type' => ($use_option_defaults ? $wd_bwg_options->watermark_type : (isset($params['watermark_type']) ? $params['watermark_type'] : 'none')),
1707
- 'watermark_text' => ($use_option_defaults ? urlencode($wd_bwg_options->watermark_text) : (isset($params['watermark_text']) ? urlencode($params['watermark_text']) : '')),
1708
- 'watermark_font_size' => ($use_option_defaults ? $wd_bwg_options->watermark_font_size : (isset($params['watermark_font_size']) ? $params['watermark_font_size'] : 12)),
1709
- 'watermark_font' => ($use_option_defaults ? $wd_bwg_options->watermark_font : (isset($params['watermark_font']) ? $params['watermark_font'] : 'Arial')),
1710
- 'watermark_color' => ($use_option_defaults ? $wd_bwg_options->watermark_color : (isset($params['watermark_color']) ? $params['watermark_color'] : 'FFFFFF')),
1711
- 'watermark_link' => ($use_option_defaults ? urlencode($wd_bwg_options->watermark_link) : (isset($params['watermark_link']) ? urlencode($params['watermark_link']) : '')),
1712
- 'watermark_url' => ($use_option_defaults ? urlencode($wd_bwg_options->watermark_url) : (isset($params['watermark_url']) ? urlencode($params['watermark_url']) : '')),
1713
- 'watermark_width' => ($use_option_defaults ? $wd_bwg_options->watermark_width : (isset($params['watermark_width']) ? $params['watermark_width'] : 90)),
1714
- 'watermark_height' => ($use_option_defaults ? $wd_bwg_options->watermark_height : (isset($params['watermark_height']) ? $params['watermark_height'] : 90)),
1715
- 'watermark_opacity' => ($use_option_defaults ? $wd_bwg_options->watermark_opacity : (isset($params['watermark_opacity']) ? $params['watermark_opacity'] : 30)),
1716
- 'watermark_position' => ($use_option_defaults ? $wd_bwg_options->watermark_position : (isset($params['watermark_position']) ? $params['watermark_position'] : 'bottom-right')),
1717
  'ecommerce_icon' => ($use_option_defaults ? $wd_bwg_options->ecommerce_icon_show_hover : (isset($params['ecommerce_icon']) ? $params['ecommerce_icon'] : 0)),
1718
  'load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['load_more_image_count']) ? $params['load_more_image_count'] : 30)),
1719
  'image_column_number' => ($use_option_defaults ? $wd_bwg_options->image_column_number : (isset($params['image_column_number']) ? $params['image_column_number'] : 5)),
@@ -1725,6 +1674,57 @@ class WDWLibrary {
1725
  'image_browser_width' => ($use_option_defaults ? $wd_bwg_options->image_browser_width : (isset($params['image_browser_width']) ? $params['image_browser_width'] : 800)),
1726
  'image_browser_title_enable' => ($use_option_defaults ? $wd_bwg_options->image_browser_title_enable : (isset($params['image_browser_title_enable']) ? $params['image_browser_title_enable'] : 1)),
1727
  'image_browser_description_enable' => ($use_option_defaults ? $wd_bwg_options->image_browser_description_enable : (isset($params['image_browser_description_enable']) ? $params['image_browser_description_enable'] : 1)),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1728
  'blog_style_width' => ($use_option_defaults ? $wd_bwg_options->image_browser_width : (isset($params['blog_style_width']) ? $params['blog_style_width'] : 800)),
1729
  'blog_style_title_enable' => ($use_option_defaults ? $wd_bwg_options->blog_style_title_enable : (isset($params['blog_style_title_enable']) ? $params['blog_style_title_enable'] : 1)),
1730
  'blog_style_images_per_page' => ($use_option_defaults ? $wd_bwg_options->blog_style_images_per_page : (isset($params['blog_style_images_per_page']) ? $params['blog_style_images_per_page'] : 5)),
@@ -1742,17 +1742,17 @@ class WDWLibrary {
1742
  'carousel_fit_containerWidth' => ($use_option_defaults ? $wd_bwg_options->carousel_fit_containerWidth : (isset($params['carousel_fit_containerWidth']) ? $params['carousel_fit_containerWidth'] : 1)),
1743
  'carousel_prev_next_butt' => ($use_option_defaults ? $wd_bwg_options->carousel_prev_next_butt : (isset($params['carousel_prev_next_butt']) ? $params['carousel_prev_next_butt'] : 1)),
1744
  'carousel_play_pause_butt' => ($use_option_defaults ? $wd_bwg_options->carousel_play_pause_butt : (isset($params['carousel_play_pause_butt']) ? $params['carousel_play_pause_butt'] : 1)),
1745
- 'compuct_album_column_number' => ($use_option_defaults ? $wd_bwg_options->album_column_number : (isset($params['compuct_album_column_number']) ? $params['compuct_album_column_number'] : 5)),
1746
  'compuct_albums_per_page' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['compuct_albums_per_page']) ? $params['compuct_albums_per_page'] : 30)),
1747
  'compuct_album_title' => ($use_option_defaults ? $wd_bwg_options->album_title_show_hover : (isset($params['compuct_album_title']) ? $params['compuct_album_title'] : 'show')),
1748
  'compuct_album_view_type' => ($use_option_defaults ? $wd_bwg_options->album_view_type : (isset($params['compuct_album_view_type']) ? $params['compuct_album_view_type'] : 'thumbnail')),
1749
- 'compuct_album_thumb_width' => ($use_option_defaults ? $wd_bwg_options->album_thumb_width : (isset($params['compuct_album_thumb_width']) ? $params['compuct_album_thumb_width'] : 120)),
1750
- 'compuct_album_thumb_height' => ($use_option_defaults ? $wd_bwg_options->album_thumb_height : (isset($params['compuct_album_thumb_height']) ? $params['compuct_album_thumb_height'] : 90)),
1751
- 'compuct_album_image_column_number' => ($use_option_defaults ? $wd_bwg_options->image_column_number : (isset($params['compuct_album_image_column_number']) ? $params['compuct_album_image_column_number'] : 5)),
1752
  'compuct_album_images_per_page' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['compuct_album_images_per_page']) ? $params['compuct_album_images_per_page'] : 30)),
1753
  'compuct_album_image_title' => ($use_option_defaults ? $wd_bwg_options->image_title_show_hover : (isset($params['compuct_album_image_title']) ? $params['compuct_album_image_title'] : 'show')),
1754
- 'compuct_album_image_thumb_width' => ($use_option_defaults ? $wd_bwg_options->thumb_width : (isset($params['compuct_album_image_thumb_width']) ? $params['compuct_album_image_thumb_width'] : 120)),
1755
- 'compuct_album_image_thumb_height' => ($use_option_defaults ? $wd_bwg_options->thumb_height : (isset($params['compuct_album_image_thumb_height']) ? $params['compuct_album_image_thumb_height'] : 90)),
1756
  'compuct_album_enable_page' => ($use_option_defaults ? $wd_bwg_options->album_enable_page : (isset($params['compuct_album_enable_page']) ? $params['compuct_album_enable_page'] : 1)),
1757
  'compuct_album_load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['compuct_album_load_more_image_count']) ? $params['compuct_album_load_more_image_count'] : 30)),
1758
  'compuct_albums_per_page_load_more' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['compuct_albums_per_page_load_more']) ? $params['compuct_albums_per_page_load_more'] : 30)),
@@ -1788,7 +1788,6 @@ class WDWLibrary {
1788
  'extended_album_load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['extended_album_load_more_image_count']) ? $params['extended_album_load_more_image_count'] : 30)),
1789
  'extended_albums_per_page_load_more' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['extended_albums_per_page_load_more']) ? $params['extended_albums_per_page_load_more'] : 30)),
1790
  );
1791
-
1792
  return array_merge($params, $defaults);
1793
  }
1794
 
1641
  global $wd_bwg_options;
1642
  $theme = self::get_theme_row_data(0);
1643
  $use_option_defaults = (isset($params['use_option_defaults']) && $params['use_option_defaults'] == 1) ? TRUE : FALSE;
1644
+ $from = (isset($params['from']) && $params['from'] == 'widget') ? TRUE : FALSE;
1645
  $defaults = array(
1646
  'gallery_type' => $params['gallery_type'],
1647
  'gallery_id' => isset($params['gallery_id']) ? $params['gallery_id'] : 0,
1651
  'theme_id' => (!$use_option_defaults && isset($params['theme_id'])) ? $params['theme_id'] : $theme->id,
1652
  'sort_by' => (isset($params['sort_by'])) ? $params['sort_by'] : 'order',
1653
  'order_by' => (isset($params['order_by'])) ? $params['order_by'] : 'asc',
1654
+ 'thumb_click_action' => ($from || $use_option_defaults ? $wd_bwg_options->thumb_click_action : (isset($params['thumb_click_action']) && $params['thumb_click_action'] != 'undefined' ? $params['thumb_click_action'] : 'open_lightbox')),
1655
+ 'thumb_link_target' => ($from || $use_option_defaults ? $wd_bwg_options->thumb_link_target : (isset($params['thumb_link_target']) ? $params['thumb_link_target'] : 1)),
1656
+ 'image_title' => ($from || $use_option_defaults ? $wd_bwg_options->image_title_show_hover : (isset($params['image_title']) ? $params['image_title'] : 'none')),
 
 
 
1657
  'show_search_box' => ($use_option_defaults ? $wd_bwg_options->show_search_box : (isset($params['show_search_box']) ? $params['show_search_box'] : 0)),
1658
  'search_box_width' => ($use_option_defaults ? $wd_bwg_options->search_box_width : (isset($params['search_box_width']) ? $params['search_box_width'] : 180)),
 
 
 
 
 
 
1659
  'show_sort_images' => ($use_option_defaults ? $wd_bwg_options->show_sort_images : (isset($params['show_sort_images']) ? $params['show_sort_images'] : 0)),
1660
  'image_enable_page' => ($use_option_defaults ? $wd_bwg_options->image_enable_page : (isset($params['image_enable_page']) ? $params['image_enable_page'] : 1)),
1661
  'show_tag_box' => ($use_option_defaults ? $wd_bwg_options->show_tag_box : (isset($params['show_tag_box']) ? $params['show_tag_box'] : 0)),
1662
  'show_gallery_description' => ($use_option_defaults ? $wd_bwg_options->show_gallery_description : (isset($params['show_gallery_description']) ? $params['show_gallery_description'] : 0)),
1663
  'showthumbs_name' => ($use_option_defaults ? $wd_bwg_options->showthumbs_name : (isset($params['showthumbs_name']) ? $params['showthumbs_name'] : $wd_bwg_options->showthumbs_name)),
 
 
 
 
 
 
 
 
 
1664
  'thumb_width' => ($use_option_defaults ? $wd_bwg_options->thumb_width : (isset($params['thumb_width']) ? $params['thumb_width'] : 120)),
1665
  'thumb_height' => ($use_option_defaults ? $wd_bwg_options->thumb_height : (isset($params['thumb_height']) ? $params['thumb_height'] : 90)),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1666
  'ecommerce_icon' => ($use_option_defaults ? $wd_bwg_options->ecommerce_icon_show_hover : (isset($params['ecommerce_icon']) ? $params['ecommerce_icon'] : 0)),
1667
  'load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['load_more_image_count']) ? $params['load_more_image_count'] : 30)),
1668
  'image_column_number' => ($use_option_defaults ? $wd_bwg_options->image_column_number : (isset($params['image_column_number']) ? $params['image_column_number'] : 5)),
1674
  'image_browser_width' => ($use_option_defaults ? $wd_bwg_options->image_browser_width : (isset($params['image_browser_width']) ? $params['image_browser_width'] : 800)),
1675
  'image_browser_title_enable' => ($use_option_defaults ? $wd_bwg_options->image_browser_title_enable : (isset($params['image_browser_title_enable']) ? $params['image_browser_title_enable'] : 1)),
1676
  'image_browser_description_enable' => ($use_option_defaults ? $wd_bwg_options->image_browser_description_enable : (isset($params['image_browser_description_enable']) ? $params['image_browser_description_enable'] : 1)),
1677
+ 'popup_autoplay' => ($from || $use_option_defaults ? $wd_bwg_options->popup_autoplay : (isset($params['popup_autoplay']) ? $params['popup_autoplay'] : 0)),
1678
+ 'popup_enable_pinterest' => ($use_option_defaults ? $wd_bwg_options->popup_enable_pinterest : (isset($params['popup_enable_pinterest']) ? $params['popup_enable_pinterest'] : 0)),
1679
+ 'popup_enable_tumblr' => ($use_option_defaults ? $wd_bwg_options->popup_enable_tumblr : (isset($params['popup_enable_tumblr']) ? $params['popup_enable_tumblr'] : 0)),
1680
+ 'popup_enable_info' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_info : (isset($params['popup_enable_info']) ? $params['popup_enable_info'] : 1)),
1681
+ 'popup_info_always_show' => ($from || $use_option_defaults ? $wd_bwg_options->popup_info_always_show : (isset($params['popup_info_always_show']) ? $params['popup_info_always_show'] : 0)),
1682
+ 'popup_info_full_width' => ($from || $use_option_defaults ? $wd_bwg_options->popup_info_full_width : (isset($params['popup_info_full_width']) ? $params['popup_info_full_width'] : 0)),
1683
+ 'popup_enable_rate' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_rate : (isset($params['popup_enable_rate']) ? $params['popup_enable_rate'] : 0)),
1684
+ 'popup_width' => ($from || $use_option_defaults ? $wd_bwg_options->popup_width : (isset($params['popup_width']) ? $params['popup_width'] : 800)),
1685
+ 'popup_height' => ($from || $use_option_defaults ? $wd_bwg_options->popup_height : (isset($params['popup_height']) ? $params['popup_height'] : 500)),
1686
+ 'popup_effect' => ($from || $use_option_defaults ? $wd_bwg_options->popup_type : (isset($params['popup_effect']) ? $params['popup_effect'] : 'none')),
1687
+ 'popup_interval' => ($from || $use_option_defaults ? $wd_bwg_options->popup_interval : (isset($params['popup_interval']) ? $params['popup_interval'] : 5)),
1688
+ 'popup_enable_filmstrip' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_filmstrip : (isset($params['popup_enable_filmstrip']) ? $params['popup_enable_filmstrip'] : 0)),
1689
+ 'popup_filmstrip_height' => ($from || $use_option_defaults ? $wd_bwg_options->popup_filmstrip_height : (isset($params['popup_filmstrip_height']) ? $params['popup_filmstrip_height'] : 50)),
1690
+ 'popup_enable_ctrl_btn' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_ctrl_btn : (isset($params['popup_enable_ctrl_btn']) ? $params['popup_enable_ctrl_btn'] : 1)),
1691
+ 'popup_enable_fullscreen' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_fullscreen : (isset($params['popup_enable_fullscreen']) ? $params['popup_enable_fullscreen'] : 0)),
1692
+ 'popup_fullscreen' => ($from || $use_option_defaults ? $wd_bwg_options->popup_fullscreen : (isset($params['popup_fullscreen']) ? $params['popup_fullscreen'] : 0)),
1693
+ 'popup_enable_comment' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_comment : (isset($params['popup_enable_comment']) ? $params['popup_enable_comment'] : 0)),
1694
+ 'popup_enable_facebook' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_facebook : (isset($params['popup_enable_facebook']) ? $params['popup_enable_facebook'] : 0)),
1695
+ 'popup_enable_twitter' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_twitter : (isset($params['popup_enable_twitter']) ? $params['popup_enable_twitter'] : 0)),
1696
+ 'popup_enable_google' => ($from || $use_option_defaults ? $wd_bwg_options->popup_enable_google : (isset($params['popup_enable_google']) ? $params['popup_enable_google'] : 0)),
1697
+ 'popup_enable_ecommerce' => ($use_option_defaults ? $wd_bwg_options->popup_enable_ecommerce : (isset($params['popup_enable_ecommerce']) ? $params['popup_enable_ecommerce'] : 0)),
1698
+ 'popup_hit_counter' => ($from || $use_option_defaults ? $wd_bwg_options->popup_hit_counter : (isset($params['popup_hit_counter']) ? $params['popup_hit_counter'] : 0)),
1699
+ 'popup_effect_duration' => ($from || $use_option_defaults ? $wd_bwg_options->popup_effect_duration : (isset($params['popup_effect_duration']) ? $params['popup_effect_duration'] : 1)),
1700
+ 'enable_slideshow_music' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_enable_music : (isset($params['enable_slideshow_music']) ? $params['enable_slideshow_music'] : 0)),
1701
+ 'slideshow_title_full_width' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_title_full_width : (isset($params['slideshow_title_full_width']) ? $params['slideshow_title_full_width'] : 0)),
1702
+ 'slideshow_music_url' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_audio_url : (isset($params['slideshow_music_url']) ? $params['slideshow_music_url'] : '')),
1703
+ 'slideshow_effect_duration' => ($use_option_defaults ? $wd_bwg_options->slideshow_effect_duration : (isset($params['slideshow_effect_duration']) ? $params['slideshow_effect_duration'] : 1)),
1704
+ 'slideshow_effect' => ($use_option_defaults ? $wd_bwg_options->slideshow_type : (isset($params['slideshow_effect']) ? $params['slideshow_effect'] : 'fade')),
1705
+ 'slideshow_interval' => ($use_option_defaults ? $wd_bwg_options->slideshow_interval : (isset($params['slideshow_interval']) ? $params['slideshow_interval'] : 5)),
1706
+ 'slideshow_width' => ($use_option_defaults ? $wd_bwg_options->slideshow_width : (isset($params['slideshow_width']) ? $params['slideshow_width'] : 800)),
1707
+ 'slideshow_height' => ($use_option_defaults ? $wd_bwg_options->slideshow_height : (isset($params['slideshow_height']) ? $params['slideshow_height'] : 600)),
1708
+ 'enable_slideshow_autoplay' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_autoplay : (isset($params['enable_slideshow_autoplay']) ? $params['enable_slideshow_autoplay'] : $wd_bwg_options->slideshow_enable_autoplay)),
1709
+ 'enable_slideshow_shuffle' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_shuffle : (isset($params['enable_slideshow_shuffle']) ? $params['enable_slideshow_shuffle'] : 0)),
1710
+ 'enable_slideshow_ctrl' => ($use_option_defaults ? $wd_bwg_options->slideshow_enable_ctrl : (isset($params['enable_slideshow_ctrl']) ? $params['enable_slideshow_ctrl'] : $wd_bwg_options->slideshow_enable_ctrl)),
1711
+ 'enable_slideshow_filmstrip' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_enable_filmstrip : (isset($params['enable_slideshow_filmstrip']) ? $params['enable_slideshow_filmstrip'] : 0)),
1712
+ 'slideshow_filmstrip_height' => ($use_option_defaults ? $wd_bwg_options->slideshow_filmstrip_height : (isset($params['slideshow_filmstrip_height']) ? $params['slideshow_filmstrip_height'] : 50)),
1713
+ 'slideshow_enable_title' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_enable_title : (isset($params['slideshow_enable_title']) ? $params['slideshow_enable_title'] : 0)),
1714
+ 'slideshow_title_position' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_title_position : (isset($params['slideshow_title_position']) ? $params['slideshow_title_position'] : 'bottom-right')),
1715
+ 'slideshow_enable_description' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_enable_description : (isset($params['slideshow_enable_description']) ? $params['slideshow_enable_description'] : 0)),
1716
+ 'slideshow_description_position' => ($from || $use_option_defaults ? $wd_bwg_options->slideshow_description_position : (isset($params['slideshow_description_position']) ? $params['slideshow_description_position'] : 'bottom-right')),
1717
+ 'watermark_type' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_type : (isset($params['watermark_type']) ? $params['watermark_type'] : 'none')),
1718
+ 'watermark_text' => ($from || $use_option_defaults ? urlencode($wd_bwg_options->watermark_text) : (isset($params['watermark_text']) ? urlencode($params['watermark_text']) : '')),
1719
+ 'watermark_font_size' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_font_size : (isset($params['watermark_font_size']) ? $params['watermark_font_size'] : 12)),
1720
+ 'watermark_font' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_font : (isset($params['watermark_font']) ? $params['watermark_font'] : 'Arial')),
1721
+ 'watermark_color' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_color : (isset($params['watermark_color']) ? $params['watermark_color'] : 'FFFFFF')),
1722
+ 'watermark_link' => ($from || $use_option_defaults ? urlencode($wd_bwg_options->watermark_link) : (isset($params['watermark_link']) ? urlencode($params['watermark_link']) : '')),
1723
+ 'watermark_url' => ($from || $use_option_defaults ? urlencode($wd_bwg_options->watermark_url) : (isset($params['watermark_url']) ? urlencode($params['watermark_url']) : '')),
1724
+ 'watermark_width' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_width : (isset($params['watermark_width']) ? $params['watermark_width'] : 90)),
1725
+ 'watermark_height' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_height : (isset($params['watermark_height']) ? $params['watermark_height'] : 90)),
1726
+ 'watermark_opacity' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_opacity : (isset($params['watermark_opacity']) ? $params['watermark_opacity'] : 30)),
1727
+ 'watermark_position' => ($from || $use_option_defaults ? $wd_bwg_options->watermark_position : (isset($params['watermark_position']) ? $params['watermark_position'] : 'bottom-right')),
1728
  'blog_style_width' => ($use_option_defaults ? $wd_bwg_options->image_browser_width : (isset($params['blog_style_width']) ? $params['blog_style_width'] : 800)),
1729
  'blog_style_title_enable' => ($use_option_defaults ? $wd_bwg_options->blog_style_title_enable : (isset($params['blog_style_title_enable']) ? $params['blog_style_title_enable'] : 1)),
1730
  'blog_style_images_per_page' => ($use_option_defaults ? $wd_bwg_options->blog_style_images_per_page : (isset($params['blog_style_images_per_page']) ? $params['blog_style_images_per_page'] : 5)),
1742
  'carousel_fit_containerWidth' => ($use_option_defaults ? $wd_bwg_options->carousel_fit_containerWidth : (isset($params['carousel_fit_containerWidth']) ? $params['carousel_fit_containerWidth'] : 1)),
1743
  'carousel_prev_next_butt' => ($use_option_defaults ? $wd_bwg_options->carousel_prev_next_butt : (isset($params['carousel_prev_next_butt']) ? $params['carousel_prev_next_butt'] : 1)),
1744
  'carousel_play_pause_butt' => ($use_option_defaults ? $wd_bwg_options->carousel_play_pause_butt : (isset($params['carousel_play_pause_butt']) ? $params['carousel_play_pause_butt'] : 1)),
1745
+ 'compuct_album_column_number' => ($from || $use_option_defaults ? $wd_bwg_options->album_column_number : (isset($params['compuct_album_column_number']) ? $params['compuct_album_column_number'] : 5)),
1746
  'compuct_albums_per_page' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['compuct_albums_per_page']) ? $params['compuct_albums_per_page'] : 30)),
1747
  'compuct_album_title' => ($use_option_defaults ? $wd_bwg_options->album_title_show_hover : (isset($params['compuct_album_title']) ? $params['compuct_album_title'] : 'show')),
1748
  'compuct_album_view_type' => ($use_option_defaults ? $wd_bwg_options->album_view_type : (isset($params['compuct_album_view_type']) ? $params['compuct_album_view_type'] : 'thumbnail')),
1749
+ 'compuct_album_thumb_width' => ($from || $use_option_defaults ? $wd_bwg_options->album_thumb_width : (isset($params['compuct_album_thumb_width']) ? $params['compuct_album_thumb_width'] : 120)),
1750
+ 'compuct_album_thumb_height' => ($from || $use_option_defaults ? $wd_bwg_options->album_thumb_height : (isset($params['compuct_album_thumb_height']) ? $params['compuct_album_thumb_height'] : 90)),
1751
+ 'compuct_album_image_column_number' => ($from || $use_option_defaults ? $wd_bwg_options->image_column_number : (isset($params['compuct_album_image_column_number']) ? $params['compuct_album_image_column_number'] : 5)),
1752
  'compuct_album_images_per_page' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['compuct_album_images_per_page']) ? $params['compuct_album_images_per_page'] : 30)),
1753
  'compuct_album_image_title' => ($use_option_defaults ? $wd_bwg_options->image_title_show_hover : (isset($params['compuct_album_image_title']) ? $params['compuct_album_image_title'] : 'show')),
1754
+ 'compuct_album_image_thumb_width' => ($from || $use_option_defaults ? $wd_bwg_options->thumb_width : (isset($params['compuct_album_image_thumb_width']) ? $params['compuct_album_image_thumb_width'] : 120)),
1755
+ 'compuct_album_image_thumb_height' => ($from || $use_option_defaults ? $wd_bwg_options->thumb_height : (isset($params['compuct_album_image_thumb_height']) ? $params['compuct_album_image_thumb_height'] : 90)),
1756
  'compuct_album_enable_page' => ($use_option_defaults ? $wd_bwg_options->album_enable_page : (isset($params['compuct_album_enable_page']) ? $params['compuct_album_enable_page'] : 1)),
1757
  'compuct_album_load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['compuct_album_load_more_image_count']) ? $params['compuct_album_load_more_image_count'] : 30)),
1758
  'compuct_albums_per_page_load_more' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['compuct_albums_per_page_load_more']) ? $params['compuct_albums_per_page_load_more'] : 30)),
1788
  'extended_album_load_more_image_count' => ($use_option_defaults ? $wd_bwg_options->images_per_page : (isset($params['extended_album_load_more_image_count']) ? $params['extended_album_load_more_image_count'] : 30)),
1789
  'extended_albums_per_page_load_more' => ($use_option_defaults ? $wd_bwg_options->albums_per_page : (isset($params['extended_albums_per_page_load_more']) ? $params['extended_albums_per_page_load_more'] : 30)),
1790
  );
 
1791
  return array_merge($params, $defaults);
1792
  }
1793
 
frontend/views/BWGViewSlideshow.php CHANGED
@@ -432,11 +432,18 @@ class BWGViewSlideshow {
432
  /* For images.*/
433
  var bwg_current_image_span = jQuery(this).find("img");
434
  if (bwg_current_image_span.length) {
435
- bwg_current_image_span.on('load', function () {
436
  var width = bwg_current_image_span.width();
437
  var height = bwg_current_image_span.height();
438
  bwg_change_each_watermark_container_<?php echo $bwg; ?>(width, height);
439
- });
 
 
 
 
 
 
 
440
  }
441
  else {
442
  /* For embeds and videos.*/
432
  /* For images.*/
433
  var bwg_current_image_span = jQuery(this).find("img");
434
  if (bwg_current_image_span.length) {
435
+ if (bwg_current_image_span.prop('complete')) {
436
  var width = bwg_current_image_span.width();
437
  var height = bwg_current_image_span.height();
438
  bwg_change_each_watermark_container_<?php echo $bwg; ?>(width, height);
439
+ }
440
+ else {
441
+ bwg_current_image_span.on("load", function () {
442
+ var width = bwg_current_image_span.width();
443
+ var height = bwg_current_image_span.height();
444
+ bwg_change_each_watermark_container_<?php echo $bwg; ?>(width, height);
445
+ });
446
+ }
447
  }
448
  else {
449
  /* For embeds and videos.*/
photo-gallery.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Photo Gallery
5
  * Plugin URI: https://web-dorado.com/products/wordpress-photo-gallery-plugin.html
6
  * Description: This plugin is a fully responsive gallery plugin with advanced functionality. It allows having different image galleries for your posts and pages. You can create unlimited number of galleries, combine them into albums, and provide descriptions and tags.
7
- * Version: 1.3.65
8
  * Author: Photo Gallery Team
9
  * Author URI: https://web-dorado.com/wordpress-plugins-bundle.html
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -1504,7 +1504,7 @@ function bwg_activate() {
1504
  }
1505
 
1506
  $version = get_option('wd_bwg_version');
1507
- $new_version = '1.3.65';
1508
  if ($version && version_compare($version, $new_version, '<')) {
1509
  require_once WD_BWG_DIR . "/update/bwg_update.php";
1510
  bwg_update($version);
@@ -1556,7 +1556,7 @@ wp_oembed_add_provider( '#https://instagr(\.am|am\.com)/p/.*#i', 'https://api.in
1556
 
1557
  function bwg_update_hook() {
1558
  $version = get_option('wd_bwg_version');
1559
- $new_version = '1.3.65';
1560
  if ($version && version_compare($version, $new_version, '<')) {
1561
  require_once WD_BWG_DIR . "/update/bwg_update.php";
1562
  bwg_update($version);
@@ -2145,7 +2145,7 @@ function bwg_topic() {
2145
  </div>
2146
  <?php
2147
  }
2148
- if (FALSE) {
2149
  ?>
2150
  <span class="wd_support">
2151
  <a target="_blank" href="<?php echo $support_forum_link; ?>">
4
  * Plugin Name: Photo Gallery
5
  * Plugin URI: https://web-dorado.com/products/wordpress-photo-gallery-plugin.html
6
  * Description: This plugin is a fully responsive gallery plugin with advanced functionality. It allows having different image galleries for your posts and pages. You can create unlimited number of galleries, combine them into albums, and provide descriptions and tags.
7
+ * Version: 1.3.66
8
  * Author: Photo Gallery Team
9
  * Author URI: https://web-dorado.com/wordpress-plugins-bundle.html
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
1504
  }
1505
 
1506
  $version = get_option('wd_bwg_version');
1507
+ $new_version = '1.3.66';
1508
  if ($version && version_compare($version, $new_version, '<')) {
1509
  require_once WD_BWG_DIR . "/update/bwg_update.php";
1510
  bwg_update($version);
1556
 
1557
  function bwg_update_hook() {
1558
  $version = get_option('wd_bwg_version');
1559
+ $new_version = '1.3.66';
1560
  if ($version && version_compare($version, $new_version, '<')) {
1561
  require_once WD_BWG_DIR . "/update/bwg_update.php";
1562
  bwg_update($version);
2145
  </div>
2146
  <?php
2147
  }
2148
+ if (TRUE) {
2149
  ?>
2150
  <span class="wd_support">
2151
  <a target="_blank" href="<?php echo $support_forum_link; ?>">
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-photo-gallery-plugin.html
4
  Tags: gallery, photo gallery, image gallery, responsive gallery, wordpress gallery plugin, photo albums, gallery slider, gallery lightbox, wordpress photo gallery plugin, fullscreen gallery, watermarking, video gallery
5
  Requires at least: 3.4
6
  Tested up to: 4.9
7
- Stable tag: 1.3.65
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -187,6 +187,11 @@ To enable the feature of adding Media Library images, go to Photo Gallery > Opti
187
 
188
  == Changelog ==
189
 
 
 
 
 
 
190
  = 1.3.65 =
191
  * Fixed: Widgets pagination bug.
192
 
4
  Tags: gallery, photo gallery, image gallery, responsive gallery, wordpress gallery plugin, photo albums, gallery slider, gallery lightbox, wordpress photo gallery plugin, fullscreen gallery, watermarking, video gallery
5
  Requires at least: 3.4
6
  Tested up to: 4.9
7
+ Stable tag: 1.3.66
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
187
 
188
  == Changelog ==
189
 
190
+ = 1.3.66 =
191
+ * Fixed: Minor bugs on widgets.
192
+ * Updated: WD Library.
193
+ * Fixed: Widget default parameters bug.
194
+
195
  = 1.3.65 =
196
  * Fixed: Widgets pagination bug.
197
 
wd/README.md CHANGED
@@ -1,4 +1,4 @@
1
- Version: 1.0.10
2
 
3
 
4
 
1
+ Version: 1.0.13
2
 
3
 
4
 
wd/assets/css/deactivate_popup.css CHANGED
@@ -87,4 +87,4 @@
87
  bottom: 0;
88
  margin: auto;
89
  z-index: 63;
90
- }
87
  bottom: 0;
88
  margin: auto;
89
  z-index: 63;
90
+ }
wd/assets/css/overview.css CHANGED
@@ -451,5 +451,12 @@ a:focus{
451
  font-size: 16px;
452
  }
453
 
 
 
 
 
454
 
455
-
 
 
 
451
  font-size: 16px;
452
  }
453
 
454
+ .wd-start-using-button .button{
455
+ margin-left: 7px;
456
+ margin-top: 7px;
457
+ }
458
 
459
+ .wd-start-using-button{
460
+ margin-right:10px;
461
+ float: right;
462
+ }
wd/assets/img/cfm_main_plugin.png ADDED
Binary file
wd/assets/js/overview.js CHANGED
@@ -12,7 +12,7 @@
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  jQuery(document).ready(function () {
14
  jQuery(".overview_content > div:not(#welcome)").hide();
15
- jQuery(".overview_tabs li a:not(.not_tab)").click(function(){
16
  jQuery(".overview_tabs li a").removeClass("overview_tab_active");
17
  jQuery(this).addClass("overview_tab_active");
18
  jQuery(".overview_content > div").hide();
@@ -31,7 +31,7 @@ jQuery(document).ready(function () {
31
  // jQuery("body").append('<style>.stars-' + rate.toString() + ':after{width:' + rate + '%;}</style>');
32
  // });
33
 
34
- jQuery("#wd-copy").click(function(){
35
  var selector = document.querySelector('#wd-site-deatils-textarea');
36
  selector.select();
37
  document.execCommand('copy');
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  jQuery(document).ready(function () {
14
  jQuery(".overview_content > div:not(#welcome)").hide();
15
+ jQuery(".overview_tabs li a:not(.not_tab)").on("click", function(){
16
  jQuery(".overview_tabs li a").removeClass("overview_tab_active");
17
  jQuery(this).addClass("overview_tab_active");
18
  jQuery(".overview_content > div").hide();
31
  // jQuery("body").append('<style>.stars-' + rate.toString() + ':after{width:' + rate + '%;}</style>');
32
  // });
33
 
34
+ jQuery("#wd-copy").on("click", function(){
35
  var selector = document.querySelector('#wd-site-deatils-textarea');
36
  selector.select();
37
  document.execCommand('copy');
wd/assets/js/subsribe.js CHANGED
@@ -10,13 +10,13 @@
10
  ////////////////////////////////////////////////////////////////////////////////////////
11
  // Constructor & Destructor //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
- jQuery(document).ready(function () {
14
- jQuery(".permissions").click(function(){
15
  jQuery(".list").toggle();
16
  return false;
17
  });
18
 
19
- jQuery(".allow_and_continue").click(function(){
20
  jQuery(this).css("opacity", "0.5");
21
  jQuery(".wd_loader").css("visibility", "visible");
22
  });
10
  ////////////////////////////////////////////////////////////////////////////////////////
11
  // Constructor & Destructor //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
+ jQuery(document).on("ready", function () {
14
+ jQuery(".permissions").on("click", function(){
15
  jQuery(".list").toggle();
16
  return false;
17
  });
18
 
19
+ jQuery(".allow_and_continue").on("click", function(){
20
  jQuery(this).css("opacity", "0.5");
21
  jQuery(".wd_loader").css("visibility", "visible");
22
  });
wd/includes/notices.php CHANGED
@@ -1,96 +1,96 @@
1
  <?php
2
- if ( !defined( 'ABSPATH' ) ) {
3
- exit;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4
  }
5
 
6
- class DoradoWebNotices {
7
-
8
- protected $promo_link = '';
9
-
10
- public $config;
11
- public $notice_spam = 0;
12
- public $notice_spam_max = 2;
13
-
14
- // Basic actions to run
15
- public function __construct( $config = array() ) {
16
- $this->config = $config;
17
- // Runs the admin notice ignore function incase a dismiss button has been clicked
18
- add_action( 'admin_init', array( $this, 'admin_notice_ignore' ) );
19
- // Runs the admin notice temp ignore function incase a temp dismiss link has been clicked
20
- add_action( 'admin_init', array( $this, 'admin_notice_temp_ignore' ) );
21
- add_action( 'admin_notices', array( $this, 'wd_admin_notices' ) );
22
  }
 
 
23
 
24
- // Checks to ensure notices aren't disabled and the user has the correct permissions.
25
- public function wd_admin_notice() {
26
- $wd_options = $this->config;
27
- $settings = get_option($wd_options->prefix . '_admin_notice');
28
- if ( !isset( $settings['disable_admin_notices'] ) || ( isset( $settings['disable_admin_notices'] ) && $settings['disable_admin_notices'] == 0 ) ) {
29
- if ( current_user_can( 'manage_options' ) ) {
30
- return true;
31
- }
32
- }
33
  return false;
34
  }
35
-
36
- // Primary notice function that can be called from an outside function sending necessary variables
37
- public function admin_notice( $admin_notices ) {
38
- $wd_options = $this->config;
39
- // Check options
40
- if ( !$this->wd_admin_notice() ) {
41
  return false;
42
  }
43
- foreach ( $admin_notices as $slug => $admin_notice ) {
44
- // Call for spam protection
45
- if ( $this->anti_notice_spam() ) {
 
46
  return false;
47
  }
 
48
 
49
- // Check for proper page to display on
50
- if (isset( $admin_notices[$slug]['pages']) && is_array( $admin_notices[$slug]['pages'])) {
51
- if ( !$this->admin_notice_pages( $admin_notices[$slug]['pages'] ) ) {
52
- return false;
53
- }
54
- }
55
 
56
- // Check for required fields
57
- if ( !$this->required_fields( $admin_notices[$slug] ) ) {
58
-
59
- // Get the current date then set start date to either passed value or current date value and add interval
60
- $current_date = current_time( "n/j/Y" );
61
- $start = ( isset( $admin_notices[$slug]['start'] ) ? $admin_notices[$slug]['start'] : $current_date );
62
- $start = date( "n/j/Y", strtotime( $start ) );
63
- $date_array = explode( '/', $start );
64
- $interval = ( isset( $admin_notices[$slug]['int'] ) ? $admin_notices[$slug]['int'] : 0 );
65
-
66
- $date_array[1] += $interval;
67
- $start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
68
-
69
- // This is the main notices storage option
70
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
71
- // Check if the message is already stored and if so just grab the key otherwise store the message and its associated date information
72
- if ( !array_key_exists( $slug, $admin_notices_option ) ) {
73
- $admin_notices_option[$slug]['start'] = $start;
74
- $admin_notices_option[$slug]['int'] = $interval;
75
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
76
- }
77
 
78
- // Sanity check to ensure we have accurate information
79
- // New date information will not overwrite old date information
80
- $admin_display_check = ( isset( $admin_notices_option[$slug]['dismissed'] ) ? $admin_notices_option[$slug]['dismissed'] : 0 );
81
- $admin_display_start = ( isset( $admin_notices_option[$slug]['start'] ) ? $admin_notices_option[$slug]['start'] : $start );
82
- $admin_display_interval = ( isset($admin_notices_option[$slug]['int'] ) ? $admin_notices_option[$slug]['int'] : $interval );
83
- $admin_display_msg = ( isset($admin_notices[$slug]['msg'] ) ? $admin_notices[$slug]['msg'] : '' );
84
- $admin_display_title = ( isset($admin_notices[$slug]['title'] ) ? $admin_notices[$slug]['title'] : '' );
85
- $admin_display_link = ( isset( $admin_notices[$slug]['link'] ) ? $admin_notices[$slug]['link'] : '' );
86
- $output_css = false;
87
-
88
- // Ensure the notice hasn't been hidden and that the current date is after the start date
89
- if ( $admin_display_check == 0 && strtotime($admin_display_start) <= strtotime($current_date ) ) {
90
-
91
- // Get remaining query string
92
- $query_str = ( isset( $admin_notices[$slug]['later_link'] ) ? $admin_notices[$slug]['later_link'] : esc_url(add_query_arg( $wd_options->prefix . '_admin_notice_ignore', $slug ) ) );
93
- if ( strpos($slug, 'promo' ) === FALSE ) {
 
 
 
 
 
 
 
 
 
 
 
 
94
  // Admin notice display output
95
  echo '<div class="update-nag wd-admin-notice">
96
  <div class="wd-notice-logo" style="background-image: url(' . $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png);"></div>
@@ -99,8 +99,8 @@
99
  <ul class="wd-notice-body wd-blue">' . $admin_display_link . '</ul>
100
  <a href="' . $query_str . '" class="dashicons dashicons-dismiss"></a>
101
  </div>';
102
- }
103
- else {
104
  echo '<div class="admin-notice-promo">';
105
  echo $admin_display_msg;
106
  echo '<ul class="notice-body-promo blue">
@@ -108,116 +108,116 @@
108
  </ul>';
109
  echo '<a href="' . $query_str . '" class="dashicons dashicons-dismiss close-promo"></a>';
110
  echo '</div>';
111
- }
112
- $this->notice_spam += 1;
113
- $output_css = true;
114
- }
115
- if ( $output_css ) {
116
- wp_enqueue_style( $wd_options->prefix . '-admin-notices', $wd_options->wd_url_css . '/notices.css', array(), get_option($wd_options->prefix . "_version" ) );
117
  }
 
 
 
 
 
118
  }
119
  }
120
  }
 
121
 
122
- // Spam protection check
123
- public function anti_notice_spam() {
124
- if ( $this->notice_spam >= $this->notice_spam_max ) {
125
- return true;
126
- }
127
- return false;
128
  }
 
 
129
 
130
- // Ignore function that gets ran at admin init to ensure any messages that were dismissed get marked
131
- public function admin_notice_ignore() {
132
- $wd_options = $this->config;
133
- // If user clicks to ignore the notice, update the option to not show it again
134
- if ( isset( $_GET[$wd_options->prefix . '_admin_notice_ignore'] ) ) {
135
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
136
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_ignore']]['dismissed'] = 1;
137
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
138
- $query_str = remove_query_arg( $wd_options->prefix . '_admin_notice_ignore' );
139
- wp_redirect( $query_str );
140
- exit;
141
- }
142
  }
 
143
 
144
- // Temp Ignore function that gets ran at admin init to ensure any messages that were temp dismissed get their start date changed
145
- public function admin_notice_temp_ignore() {
146
- $wd_options = $this->config;
147
- // If user clicks to temp ignore the notice, update the option to change the start date - default interval of 14 days
148
- if ( isset( $_GET[$wd_options->prefix . '_admin_notice_temp_ignore'] ) ) {
149
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
150
- $current_date = current_time( "n/j/Y" );
151
- $date_array = explode( '/', $current_date );
152
- $interval = (isset($_GET['wd_int']) ? $_GET['wd_int'] : 14);
153
- $date_array[1] += $interval;
154
- $new_start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
155
-
156
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['start'] = $new_start;
157
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['dismissed'] = 0;
158
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
159
- $query_str = remove_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore', 'wd_int' ) );
160
- wp_redirect( $query_str );
161
- exit;
162
- }
163
  }
 
164
 
165
- public function admin_notice_pages($pages) {
166
- $wd_options = $this->config;
167
- foreach ( $pages as $key => $page ) {
168
- if (is_array($page)) {
169
- if ( isset( $_GET['page'] ) && $_GET['page'] == $page[0] && isset($_GET['tab']) && $_GET['tab'] == $page[1] ) {
170
- return true;
171
- }
172
- }
173
- else {
174
- if ( $page == 'all' ) {
175
- return true;
176
- }
177
- if ( get_current_screen()->id === $page ) {
178
- return true;
179
- }
180
- if ( isset($_GET['page']) && $_GET['page'] == $page ) {
181
- return true;
182
- }
183
  }
184
- return false;
185
  }
186
- }
187
-
188
- // Required fields check
189
- public function required_fields( $fields ) {
190
- if ( !isset( $fields['msg'] ) || ( isset($fields['msg'] ) && empty( $fields['msg'] ) ) ) {
191
- return true;
192
- }
193
- if ( !isset( $fields['title'] ) || ( isset( $fields['title'] ) && empty( $fields['title'] ) ) ) {
194
- return true;
 
195
  }
196
  return false;
197
  }
 
198
 
199
- // Special parameters function that is to be used in any extension of this class
200
- public function special_parameters($admin_notices) {
201
- // Intentionally left blank
 
 
 
 
202
  }
 
 
203
 
204
- public function wd_admin_notices() {
205
- $wd_options = $this->config;
206
- $two_week_review_ignore = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'two_week_review' ) );
207
- $two_week_review_temp = add_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore' => 'two_week_review', 'int' => 14 ) );
208
- $promo_close = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'ecommerce_promo' ) );
209
 
210
- $notices['two_week_review'] = array(
211
- 'title' => __('Leave A Review?', $wd_options->prefix),
212
- 'msg' => sprintf(__('We hope you\'ve enjoyed using WordPress %s! Would you consider leaving us a review on WordPress.org?', $wd_options->prefix), $wd_options->plugin_title),
213
- 'link' => '<li><span class="dashicons dashicons-external"></span><a href="https://wordpress.org/support/view/plugin-reviews/' . $wd_options->plugin_wordpress_slug . '?filter=5" target="_blank">' . __('Sure! I\'d love to!', $wd_options->prefix) . '</a></li>
 
 
 
 
 
 
214
  <li><span class="dashicons dashicons-smiley"></span><a href="' . $two_week_review_ignore . '"> ' . __('I\'ve already left a review', $wd_options->prefix) . '</a></li>
215
  <li><span class="dashicons dashicons-calendar-alt"></span><a href="' . $two_week_review_temp . '">' . __('Maybe Later', $wd_options->prefix) . '</a></li>
216
  <li><span class="dashicons dashicons-dismiss"></span><a href="' . $two_week_review_ignore . '">' . __('Never show again', $wd_options->prefix) . '</a></li>',
217
- 'later_link' => $two_week_review_temp,
218
- 'int' => 14
219
- );
220
-
221
- $this->admin_notice($notices);
222
- }
223
  }
 
1
  <?php
2
+ if ( !defined( 'ABSPATH' ) ) {
3
+ exit;
4
+ }
5
+
6
+ class DoradoWebNotices {
7
+
8
+ protected $promo_link = '';
9
+
10
+ public $config;
11
+ public $notice_spam = 0;
12
+ public $notice_spam_max = 2;
13
+
14
+ // Basic actions to run
15
+ public function __construct( $config = array() ) {
16
+ $this->config = $config;
17
+ // Runs the admin notice ignore function incase a dismiss button has been clicked
18
+ add_action( 'admin_init', array( $this, 'admin_notice_ignore' ) );
19
+ // Runs the admin notice temp ignore function incase a temp dismiss link has been clicked
20
+ add_action( 'admin_init', array( $this, 'admin_notice_temp_ignore' ) );
21
+ add_action( 'admin_notices', array( $this, 'wd_admin_notices' ) );
22
  }
23
 
24
+ // Checks to ensure notices aren't disabled and the user has the correct permissions.
25
+ public function wd_admin_notice() {
26
+ $wd_options = $this->config;
27
+ $settings = get_option($wd_options->prefix . '_admin_notice');
28
+ if ( !isset( $settings['disable_admin_notices'] ) || ( isset( $settings['disable_admin_notices'] ) && $settings['disable_admin_notices'] == 0 ) ) {
29
+ if ( current_user_can( 'manage_options' ) ) {
30
+ return true;
31
+ }
 
 
 
 
 
 
 
 
32
  }
33
+ return false;
34
+ }
35
 
36
+ // Primary notice function that can be called from an outside function sending necessary variables
37
+ public function admin_notice( $admin_notices ) {
38
+ $wd_options = $this->config;
39
+ // Check options
40
+ if ( !$this->wd_admin_notice() ) {
 
 
 
 
41
  return false;
42
  }
43
+ foreach ( $admin_notices as $slug => $admin_notice ) {
44
+ // Call for spam protection
45
+ if ( $this->anti_notice_spam() ) {
 
 
 
46
  return false;
47
  }
48
+
49
+ // Check for proper page to display on
50
+ if (isset( $admin_notices[$slug]['pages']) && is_array( $admin_notices[$slug]['pages'])) {
51
+ if ( !$this->admin_notice_pages( $admin_notices[$slug]['pages'] ) ) {
52
  return false;
53
  }
54
+ }
55
 
56
+ // Check for required fields
57
+ if ( !$this->required_fields( $admin_notices[$slug] ) ) {
 
 
 
 
58
 
59
+ // Get the current date then set start date to either passed value or current date value and add interval
60
+ $current_date = current_time( "n/j/Y" );
61
+ $start = ( isset( $admin_notices[$slug]['start'] ) ? $admin_notices[$slug]['start'] : $current_date );
62
+ $start = date( "n/j/Y", strtotime( $start ) );
63
+ $date_array = explode( '/', $start );
64
+ $interval = ( isset( $admin_notices[$slug]['int'] ) ? $admin_notices[$slug]['int'] : 0 );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
65
 
66
+ $date_array[1] += $interval;
67
+ $start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
68
+
69
+ // This is the main notices storage option
70
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
71
+ // Check if the message is already stored and if so just grab the key otherwise store the message and its associated date information
72
+ if ( !array_key_exists( $slug, $admin_notices_option ) ) {
73
+ $admin_notices_option[$slug]['start'] = $start;
74
+ $admin_notices_option[$slug]['int'] = $interval;
75
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
76
+ }
77
+
78
+ // Sanity check to ensure we have accurate information
79
+ // New date information will not overwrite old date information
80
+ $admin_display_check = ( isset( $admin_notices_option[$slug]['dismissed'] ) ? $admin_notices_option[$slug]['dismissed'] : 0 );
81
+ $admin_display_start = ( isset( $admin_notices_option[$slug]['start'] ) ? $admin_notices_option[$slug]['start'] : $start );
82
+ $admin_display_interval = ( isset($admin_notices_option[$slug]['int'] ) ? $admin_notices_option[$slug]['int'] : $interval );
83
+ $admin_display_msg = ( isset($admin_notices[$slug]['msg'] ) ? $admin_notices[$slug]['msg'] : '' );
84
+ $admin_display_title = ( isset($admin_notices[$slug]['title'] ) ? $admin_notices[$slug]['title'] : '' );
85
+ $admin_display_link = ( isset( $admin_notices[$slug]['link'] ) ? $admin_notices[$slug]['link'] : '' );
86
+ $output_css = false;
87
+
88
+ // Ensure the notice hasn't been hidden and that the current date is after the start date
89
+ if ( $admin_display_check == 0 && strtotime($admin_display_start) <= strtotime($current_date ) ) {
90
+
91
+ // Get remaining query string
92
+ $query_str = ( isset( $admin_notices[$slug]['later_link'] ) ? $admin_notices[$slug]['later_link'] : esc_url(add_query_arg( $wd_options->prefix . '_admin_notice_ignore', $slug ) ) );
93
+ if ( strpos($slug, 'promo' ) === FALSE ) {
94
  // Admin notice display output
95
  echo '<div class="update-nag wd-admin-notice">
96
  <div class="wd-notice-logo" style="background-image: url(' . $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png);"></div>
99
  <ul class="wd-notice-body wd-blue">' . $admin_display_link . '</ul>
100
  <a href="' . $query_str . '" class="dashicons dashicons-dismiss"></a>
101
  </div>';
102
+ }
103
+ else {
104
  echo '<div class="admin-notice-promo">';
105
  echo $admin_display_msg;
106
  echo '<ul class="notice-body-promo blue">
108
  </ul>';
109
  echo '<a href="' . $query_str . '" class="dashicons dashicons-dismiss close-promo"></a>';
110
  echo '</div>';
 
 
 
 
 
 
111
  }
112
+ $this->notice_spam += 1;
113
+ $output_css = true;
114
+ }
115
+ if ( $output_css ) {
116
+ wp_enqueue_style( $wd_options->prefix . '-admin-notices', $wd_options->wd_url_css . '/notices.css', array(), get_option($wd_options->prefix . "_version" ) );
117
  }
118
  }
119
  }
120
+ }
121
 
122
+ // Spam protection check
123
+ public function anti_notice_spam() {
124
+ if ( $this->notice_spam >= $this->notice_spam_max ) {
125
+ return true;
 
 
126
  }
127
+ return false;
128
+ }
129
 
130
+ // Ignore function that gets ran at admin init to ensure any messages that were dismissed get marked
131
+ public function admin_notice_ignore() {
132
+ $wd_options = $this->config;
133
+ // If user clicks to ignore the notice, update the option to not show it again
134
+ if ( isset( $_GET[$wd_options->prefix . '_admin_notice_ignore'] ) ) {
135
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
136
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_ignore']]['dismissed'] = 1;
137
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
138
+ $query_str = remove_query_arg( $wd_options->prefix . '_admin_notice_ignore' );
139
+ wp_redirect( $query_str );
140
+ exit;
 
141
  }
142
+ }
143
 
144
+ // Temp Ignore function that gets ran at admin init to ensure any messages that were temp dismissed get their start date changed
145
+ public function admin_notice_temp_ignore() {
146
+ $wd_options = $this->config;
147
+ // If user clicks to temp ignore the notice, update the option to change the start date - default interval of 14 days
148
+ if ( isset( $_GET[$wd_options->prefix . '_admin_notice_temp_ignore'] ) ) {
149
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
150
+ $current_date = current_time( "n/j/Y" );
151
+ $date_array = explode( '/', $current_date );
152
+ $interval = (isset($_GET['wd_int']) ? $_GET['wd_int'] : 14);
153
+ $date_array[1] += $interval;
154
+ $new_start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
155
+
156
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['start'] = $new_start;
157
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['dismissed'] = 0;
158
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
159
+ $query_str = remove_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore', 'wd_int' ) );
160
+ wp_redirect( $query_str );
161
+ exit;
 
162
  }
163
+ }
164
 
165
+ public function admin_notice_pages($pages) {
166
+ $wd_options = $this->config;
167
+ foreach ( $pages as $key => $page ) {
168
+ if (is_array($page)) {
169
+ if ( isset( $_GET['page'] ) && $_GET['page'] == $page[0] && isset($_GET['tab']) && $_GET['tab'] == $page[1] ) {
170
+ return true;
 
 
 
 
 
 
 
 
 
 
 
 
171
  }
 
172
  }
173
+ else {
174
+ if ( $page == 'all' ) {
175
+ return true;
176
+ }
177
+ if ( get_current_screen()->id === $page ) {
178
+ return true;
179
+ }
180
+ if ( isset($_GET['page']) && $_GET['page'] == $page ) {
181
+ return true;
182
+ }
183
  }
184
  return false;
185
  }
186
+ }
187
 
188
+ // Required fields check
189
+ public function required_fields( $fields ) {
190
+ if ( !isset( $fields['msg'] ) || ( isset($fields['msg'] ) && empty( $fields['msg'] ) ) ) {
191
+ return true;
192
+ }
193
+ if ( !isset( $fields['title'] ) || ( isset( $fields['title'] ) && empty( $fields['title'] ) ) ) {
194
+ return true;
195
  }
196
+ return false;
197
+ }
198
 
199
+ // Special parameters function that is to be used in any extension of this class
200
+ public function special_parameters($admin_notices) {
201
+ // Intentionally left blank
202
+ }
 
203
 
204
+ public function wd_admin_notices() {
205
+ $wd_options = $this->config;
206
+ $two_week_review_ignore = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'two_week_review' ) );
207
+ $two_week_review_temp = add_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore' => 'two_week_review', 'int' => 14 ) );
208
+ $promo_close = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'ecommerce_promo' ) );
209
+
210
+ $notices['two_week_review'] = array(
211
+ 'title' => __('Leave A Review?', $wd_options->prefix),
212
+ 'msg' => sprintf(__('We hope you\'ve enjoyed using WordPress %s! Would you consider leaving us a review on WordPress.org?', $wd_options->prefix), $wd_options->plugin_title),
213
+ 'link' => '<li><span class="dashicons dashicons-external"></span><a href="https://wordpress.org/support/plugin/' . $wd_options->plugin_wordpress_slug . '/reviews?filter=5&rate=5#new-post" target="_blank">' . __('Sure! I\'d love to!', $wd_options->prefix) . '</a></li>
214
  <li><span class="dashicons dashicons-smiley"></span><a href="' . $two_week_review_ignore . '"> ' . __('I\'ve already left a review', $wd_options->prefix) . '</a></li>
215
  <li><span class="dashicons dashicons-calendar-alt"></span><a href="' . $two_week_review_temp . '">' . __('Maybe Later', $wd_options->prefix) . '</a></li>
216
  <li><span class="dashicons dashicons-dismiss"></span><a href="' . $two_week_review_ignore . '">' . __('Never show again', $wd_options->prefix) . '</a></li>',
217
+ 'later_link' => $two_week_review_temp,
218
+ 'int' => 14
219
+ );
220
+
221
+ $this->admin_notice($notices);
 
222
  }
223
+ }
wd/includes/overview.php CHANGED
@@ -58,6 +58,14 @@
58
  public function display_overview_page(){
59
  $wd_options = $this->config;
60
  $tabs = $this->tabs;
 
 
 
 
 
 
 
 
61
  require_once( $wd_options->wd_dir_templates . "/display_overview.php" );
62
  }
63
  public function wd_overview_welcome(){
58
  public function display_overview_page(){
59
  $wd_options = $this->config;
60
  $tabs = $this->tabs;
61
+ $start_using_url = "";
62
+ if(!empty($this->config->custom_post)) {
63
+ if (strpos($this->config->custom_post, 'post_type', 0) !== false) {
64
+ $start_using_url = admin_url($this->config->custom_post);
65
+ } else {
66
+ $start_using_url = menu_page_url($this->config->custom_post, false);
67
+ }
68
+ }
69
  require_once( $wd_options->wd_dir_templates . "/display_overview.php" );
70
  }
71
  public function wd_overview_welcome(){
wd/templates/display_deactivation_popup.php CHANGED
@@ -5,7 +5,7 @@
5
  </div>
6
  <form method="post" id="<?php echo $wd_options->prefix; ?>_deactivate_form">
7
  <div class="wd-deactivate-popup-header">
8
- <?php _e( "Please let us know why you are deactivating. Your answer will help us to serve you better", $wd_options->prefix ); ?>:
9
  </div>
10
 
11
  <div class="wd-deactivate-popup-body">
@@ -18,9 +18,8 @@
18
  <div class="<?php echo $wd_options->prefix; ?>_additional_details_wrap"></div>
19
  </div>
20
  <div class="wd-btns">
21
- <a href="<?php echo $deactivate_url; ?>" data-val="1" class="button button-secondary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-deactivate"><?php _e( "Deactivate" , $wd_options->prefix ); ?></a>
22
- <a href="<?php echo $deactivate_url; ?>" data-val="2" class="button button-secondary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-submit-and-deactivate" style="display:none;"><?php _e( "Submit and deactivate" , $wd_options->prefix ); ?></a>
23
- <a href="<?php echo admin_url( 'plugins.php' ); ?>" class="button button-primary wd-<?php echo $wd_options->prefix; ?>-cancel"><?php _e( "Cancel" , $wd_options->prefix ); ?></a>
24
  </div>
25
  <input type="hidden" name="<?php echo $wd_options->prefix . "_submit_and_deactivate"; ?>" value="" >
26
  <?php wp_nonce_field( $wd_options->prefix . '_save_form', $wd_options->prefix . '_save_form_fild'); ?>
5
  </div>
6
  <form method="post" id="<?php echo $wd_options->prefix; ?>_deactivate_form">
7
  <div class="wd-deactivate-popup-header">
8
+ <?php _e( "Please let us know why you are deactivating. Your answer will help us to serve you better (Optional)", $wd_options->prefix ); ?>:
9
  </div>
10
 
11
  <div class="wd-deactivate-popup-body">
18
  <div class="<?php echo $wd_options->prefix; ?>_additional_details_wrap"></div>
19
  </div>
20
  <div class="wd-btns">
21
+ <a href="<?php echo $deactivate_url; ?>" data-val="1" class="button button-primary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-deactivate"><?php _e( "Skip and Deactivate" , $wd_options->prefix ); ?></a>
22
+ <a href="<?php echo $deactivate_url; ?>" data-val="2" class="button button-primary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-submit-and-deactivate" style="display:none;"><?php _e( "Submit and Deactivate" , $wd_options->prefix ); ?></a>
 
23
  </div>
24
  <input type="hidden" name="<?php echo $wd_options->prefix . "_submit_and_deactivate"; ?>" value="" >
25
  <?php wp_nonce_field( $wd_options->prefix . '_save_form', $wd_options->prefix . '_save_form_fild'); ?>
wd/templates/display_overview.php CHANGED
@@ -1,33 +1,43 @@
1
  <div class="overview_welcome">
2
- <div class="wd-cell wd-valign-middle">
3
- <a href="<?php echo $wd_options->plugin_wd_url; ?>" target="_blank"><img src="<?php echo $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png'; ?>"></a>
4
- </div>
5
- <div class="wd-cell wd-valign-middle">
6
- <h2><?php echo sprintf( __( "Welcome to %s", $wd_options->prefix ), $wd_options->plugin_title ); ?></h2>
7
- <div class="overview_welcome_text">
8
- <div><?php echo sprintf( __( "CONGRATS! You've successfully installed %s WordPress plugin.", $wd_options->prefix ), $wd_options->plugin_title ) ; ?></div>
9
- <div><?php echo $wd_options->description ; ?></div>
10
- </div>
11
- </div>
 
 
 
 
 
 
 
 
12
  </div>
13
  <div class="overview_wrap">
14
- <ul class="overview_tabs">
15
- <?php
16
- foreach ( $tabs as $tab_key => $tab ) {
17
- $href = $tab['view'] !== false ? "#" . $tab_key : $tab_key;
18
- $target = $tab['view'] == false ? 'target="_blank" class="not_tab"' : '';
19
- $overview_tab_active_class = $tab_key == 'welcome' ? 'class="overview_tab_active"' : ''
20
- ?>
21
- <li class=""><a href="<?php echo $href; ?>" <?php echo $overview_tab_active_class; ?> <?php echo $target; ?>><?php echo esc_html( $tab['name'] ); ?></a></li>
22
- <?php } ?>
23
- </ul>
24
- <div class="overview_content">
25
- <?php
26
- foreach ( $tabs as $tab_key => $tab ) {
27
- if( $tab['view'] !== false ){
28
- echo call_user_func( $tab['view'] );
29
- }
30
- }
31
- ?>
32
- </div>
 
 
33
  </div>
1
  <div class="overview_welcome">
2
+ <div class="wd-cell wd-valign-middle">
3
+ <a href="<?php echo $wd_options->plugin_wd_url; ?>" target="_blank"><img
4
+ src="<?php echo $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png'; ?>"></a>
5
+ </div>
6
+ <div class="wd-cell wd-valign-middle">
7
+
8
+ <h2><?php echo sprintf(__("Welcome to %s", $wd_options->prefix), $wd_options->plugin_title); ?> <?php if (!empty($start_using_url)) { ?>
9
+ <div class="wd-start-using-button">
10
+ <a href="<?php echo $start_using_url; ?>" class="button button-primary button-large">Start using</a>
11
+ </div>
12
+ <?php } ?></h2>
13
+
14
+ <div class="overview_welcome_text">
15
+
16
+ <div><?php echo sprintf(__("CONGRATS! You've successfully installed %s WordPress plugin.", $wd_options->prefix), $wd_options->plugin_title); ?></div>
17
+ <div><?php echo $wd_options->description; ?></div>
18
+ </div>
19
+ </div>
20
  </div>
21
  <div class="overview_wrap">
22
+ <ul class="overview_tabs">
23
+ <?php
24
+ foreach ($tabs as $tab_key => $tab) {
25
+ $href = $tab['view'] !== false ? "#" . $tab_key : $tab_key;
26
+ $target = $tab['view'] == false ? 'target="_blank" class="not_tab"' : '';
27
+ $overview_tab_active_class = $tab_key == 'welcome' ? 'class="overview_tab_active"' : ''
28
+ ?>
29
+ <li class=""><a
30
+ href="<?php echo $href; ?>" <?php echo $overview_tab_active_class; ?> <?php echo $target; ?>><?php echo esc_html($tab['name']); ?></a>
31
+ </li>
32
+ <?php } ?>
33
+ </ul>
34
+ <div class="overview_content">
35
+ <?php
36
+ foreach ($tabs as $tab_key => $tab) {
37
+ if ($tab['view'] !== false) {
38
+ echo call_user_func($tab['view']);
39
+ }
40
+ }
41
+ ?>
42
+ </div>
43
  </div>
wd/wd.php CHANGED
@@ -17,7 +17,7 @@
17
  public $overview_instance;
18
  public $subscribe_instance;
19
  public $config;
20
- private $version = "1.0.2";
21
 
22
  ////////////////////////////////////////////////////////////////////////////////////////
23
  // Constructor & Destructor //
17
  public $overview_instance;
18
  public $subscribe_instance;
19
  public $config;
20
+ private $version = "1.0.13";
21
 
22
  ////////////////////////////////////////////////////////////////////////////////////////
23
  // Constructor & Destructor //