Merge pull request #47 from ARCommunications/dev

update to v2.0.1
WPDevelopers · Dec 4, 2018 · 5cd7d2a · 5cd7d2a
2 parents e712d82 + 04778b6
commit 5cd7d2a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/admin/css/admin.css b/admin/css/admin.css
@@ -16,7 +16,7 @@
 	width: 100%;
 	height: auto;
 	display: flex;
-	flex-flow: row wrap;
+	flex-flow: row nowrap;
 	justify-content: space-between;
 	align-content: flex-start;
 	padding: 15px 0px;
@@ -544,6 +544,7 @@ textarea.wpsp-form-control {
 .wpsp-admin-sidebar {
 	flex: 1 1 200px;
 	padding: 20px;
+	margin-left: 15px;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
@@ -812,7 +813,7 @@ textarea.wpsp-form-control {
 	font-size: 17px;
 }
 
-.wpsp-error-text, .error{
+.wpsp-error-text{
 	color: #e8606d;
 	font-size: 17px;
 }
@@ -1079,4 +1080,13 @@ background-color: rgba(238,53,95, 1);
 .manage-schedule-forms {
 	flex-flow: row wrap;
 }
+.wpsp-settings-wrap {
+	flex-flow: row wrap;
+}
+.wpsp-admin-sidebar {
+	background-color: #fff;
+	box-shadow: 0 1px 4px rgba(0,0,0,0.1);
+	margin: 15px 0 0 0;
+}
+
 }
diff --git a/admin/manage-schedule/manage-schedule.php b/admin/manage-schedule/manage-schedule.php
@@ -17,7 +17,7 @@
 
 
 // get all installed plugins version
-function getInstallPluginVersion($allPlugins)
+function wpsp_getInstallPluginVersion($allPlugins)
 {
     foreach($allPlugins as $plugins):
         if($plugins['Name'] == "WP Scheduled Posts Pro")
@@ -614,7 +614,7 @@ function wpsp_scheduled_findNextSlot($post,$changePost = False){
 				}
 
 
-				function nextWeek($presentWk){
+				function wpsp_nextWeek($presentWk){
 					$presentWk2=array();
 					$pr_wk = count($presentWk);
 					for($d=0;$d<$pr_wk;$d++){
@@ -641,7 +641,7 @@ function nextWeek($presentWk){
 					if($deserved_date)
 						break;
 					else
-						$all_day_schedule = nextWeek($all_day_schedule);							 
+						$all_day_schedule = wpsp_nextWeek($all_day_schedule);							 
 				}
 
 
@@ -673,7 +673,7 @@ function nextWeek($presentWk){
 					array_push($activated_all_plugins, $plugins[$single_plugin]);
 				}           
 			}
-			$proPluginVersion = getProPluginVersion($activated_all_plugins);
+			$proPluginVersion = wpsp_getProPluginVersion($activated_all_plugins);
 			if($proPluginVersion)
 			{
 			$msgT .= '<strong>';
@@ -793,7 +793,7 @@ function wpsp_scheduled_do_publish_schedule($post){
 }
 
 // dependecy check function for menu
-function getProPluginVersion($allPlugins) {
+function wpsp_getProPluginVersion($allPlugins) {
     foreach($allPlugins as $plugins):
         if($plugins['Name'] == "WP Scheduled Posts Pro")
             return true;
@@ -817,7 +817,7 @@ function wpsp_scheduled_option_menu() {
             array_push($activated_all_plugins, $plugins[$single_plugin]);
         }           
     }
-    $proPluginVersion = getProPluginVersion($activated_all_plugins);
+    $proPluginVersion = wpsp_getProPluginVersion($activated_all_plugins);
 
 
 	if(function_exists('current_user_can')) {
@@ -990,7 +990,7 @@ function wpsp_scheduled_options_page(){
 			                 array_push($activated_plugins, $plugins[$p]);
 			            }           
 			        }
-			        $pluginVersion = getInstallPluginVersion($activated_plugins);
+			        $pluginVersion = wpsp_getInstallPluginVersion($activated_plugins);
 
 			        if(!$pluginVersion)
 			        {

diff --git a/readme.txt b/readme.txt
@@ -1,10 +1,10 @@
 === WP Scheduled Posts ===
-Contributors: Asif2BD, re_enter_rupok, onetarek
+Contributors: wpdevteam, Asif2BD, re_enter_rupok, onetarek, hakimcseru, nayanchamp7
 Tags: post schedule, editor calendar, schedule-calendar, schedule bar, scheduled posts, schedule, schedule widget, scheduler, schedule menu bar, admin bar, dashboard widget, missed scheduled, calendar, missed schedule, future post, schedule issue, post later, admin bar, admin, multi author
 Requires at least: 4.0
 Tested up to: 4.9.8
 Requires PHP: 5.4
-Stable tag: 2.0.0
+Stable tag: 2.0.1
 License: GPLv3
 License URI: https://opensource.org/licenses/GPL-3.0
 
@@ -14,6 +14,9 @@ A complete solution for WordPress Post Schedule. Manage schedule through editori
 
 A complete solution for WordPress Post Schedule. Manage schedule through editorial calendar and enable auto scheduler. Get an Admin Bar & Dashboard Widget showing all your scheduled posts.
 
+
+[Check the Demo](https://wpdeveloper.net/plugins/wp-scheduled-posts/)
+
 ### Schedule your WordPress posts in advance and have them posted automatically for you.
 
 - With no notifications or reminders.
@@ -41,9 +44,9 @@ From one place, you can easily get an overview of your blog posts and when each
 **Manage Multiple Author Efficiently:** Managing multiple authors for a blog is never an easy task. But you can make the process easier using our schedule calendar and manage co-authors from one place.
 
 
-## [WP Scheduled Posts PREMIUM](https://wpdeveloper.net/plugins/wp-scheduled-posts/)
+## WP Scheduled Posts PREMIUM
 
-**WP Scheduled Posts Pro** includes all features of the free version and awesome additional features including:
+**[WP Scheduled Posts Pro](https://wpdeveloper.net/plugins/wp-scheduled-posts/)** includes all features of the free version and awesome additional features including:
 
 **Auto Scheduler:** Get absolute control over your content schedule as you can create rules to post content automatically. You just need to specify the time interval in which you want to have your posts scheduled and this plugin will publish it on the exact time. You can also set exact date and time to create flexible schedule.
 
@@ -106,13 +109,18 @@ Contact at WPDeveloper.net [Support Page](https://wpdeveloper.net/support)
 
 == Screenshots ==
 
-1. Admin Bar Widget View
-2. Dashboard View
-3. Option Page
+1. Schedule Calendar 
+2. Creating and Scheduling Post right from the Calendar
+3. Auto Scheduler (Pro Feature)
+4. Manual Scheduler (Pro Feature)
+5. General Options Page
 
 
 == Changelog ==
 
+= 2.0.1 - 2018-12-04 =
+* Some minor improvements and conflict fixed
+
 = 2.0.0 - 2018-12-02 =
 * Completely revamped interface
 * Visual Schedule Calendar added
@@ -179,9 +187,3 @@ Contact at WPDeveloper.net [Support Page](https://wpdeveloper.net/support)
 * Completely revamped interface
 * Visual Schedule Calendar added
 * Lots of new features and improvements.
-
-== Donation ==
-
-Consider buying any of our Pro version at little cost.
-
-https://wpdeveloper.net/
diff --git a/wp-scheduled-posts.php b/wp-scheduled-posts.php
@@ -2,7 +2,7 @@
 /*
  * Plugin Name: WP Scheduled Posts
  * Description: A complete solution for WordPress Post Schedule. Get an admin Bar & Dashboard Widget showing all your scheduled posts. And full control.
- * Version: 2.0.0
+ * Version: 2.0.1
  * Author: WPDeveloper
  * Author URI: https://wpdeveloper.net
  * Text Domain: wp-scheduled-posts
@@ -31,7 +31,7 @@ function __construct() {
 
 			add_action( 'admin_enqueue_scripts', array(&$this, 'start_plugin') );
 			add_action( 'admin_init', array(&$this, 'check_some_other_plugin') );
-			//add_action( 'admin_notices', array(&$this,'wpse120377_error') );
+			add_action('admin_notices', 'wpsp_admin_notice');
 		}
 
 		function define_constant() {
@@ -305,7 +305,7 @@ function wpscp_initialize()
 
 /* Display a notice that can be dismissed */
 
-add_action('admin_notices', 'wpscp_admin_notice');
+// add_action('admin_notices', 'wpscp_admin_notice'); Hakim commented this line because function was called without declaration
 
 
 /**
@@ -321,13 +321,12 @@ function wpsp_admin_notice() {
     if ( ! get_user_meta($user_id, 'wpsp_ignore_notice200') ) {
       echo '<div class="wpsp-admin-notice updated" style="display: flex; align-items: center; padding-left: 0; border-left-color: #6648FE"><p style="width: 36px;background-color: #f1f2f9;border-radius: 50%;margin: 0.5em;">';
       echo '<img style="width: 100%; display: block;"  src="' . plugins_url( '/', __FILE__ ).'admin/assets/images/wpsp-logo.svg'. '" ></p><p> ';
-      printf(__('<a href="https://wpdeveloper.net/in/wpsp" target="_blank" style="font-weight: bolder;">WP Scheduled Posts Pro</a> is now available with <strong>Auto Scheduler</strong> and <strong>Missed Scheduler</strong> feautres. Use the coupon code <strong>WPSP-EARLYBIRD</strong> to redeem a <strong>25&#37; </strong> discount on Pro upgrade. <a href="https://wpdeveloper.net/in/wpsp" target="_blank" style="text-decoration: none;"><span class="dashicons dashicons-smiley" style="margin-left: 10px;"></span> Apply Coupon</a>
-        <a href="%1$s" style="text-decoration: none; margin-left: 10px;"><span class="dashicons dashicons-dismiss"></span> I\'m good with free version</a>'),  admin_url( 'admin.php?page=wpsp-settings&wpsp_nag_ignore=0' ));
+      printf(__('<a href="https://wpdeveloper.net/in/wpsp" target="_blank" style="font-weight: bolder;">WP Scheduled Posts Pro</a> is now available with <strong>Auto Scheduler</strong> and <strong>Missed Scheduler</strong> feautres. Use the coupon code <strong>WPSP-EARLYBIRD</strong> to redeem a <strong>50&#37; </strong> discount on Pro upgrade. <a href="https://wpdeveloper.net/in/wpsp" target="_blank" style="text-decoration: none;"><span class="dashicons dashicons-smiley" style="margin-left: 10px;"></span> Apply Coupon</a>
+        <a href="%1$s" style="text-decoration: none; margin-left: 10px;"><span class="dashicons dashicons-dismiss"></span> I\'m good with free version</a>'),  admin_url( 'admin.php?page=wp-scheduled-posts&wpsp_nag_ignore=0' ));
       echo "</p></div>";
     }
   }
 }
-add_action('admin_notices', 'wpsp_admin_notice');
 
 
 /**