Merge pull request #29 from circuscode/develop

Develop

Author: circuscode

.github/workflows/deploy-env-dev.yml

@@ -17,7 +17,7 @@ jobs:
         username: ${{ secrets.FTP_USER_GITHUBDEPLOY }}
         password: ${{ secrets.FTP_PASSWORD_GITHUBDEPLOY }}
         protocol: ftp
-        server-dir: unmus/dev/wordpress/wp-content/plugins/hello-dolly-for-your-song/
+        server-dir: ${{ vars.FTP_PATH_DEV }}
         exclude: |
           **/.git*
           **/.git*/**

.github/workflows/deploy-env-public.yml

@@ -17,7 +17,7 @@ jobs:
         username: ${{ secrets.FTP_USER_GITHUBDEPLOY }}
         password: ${{ secrets.FTP_PASSWORD_GITHUBDEPLOY }}
         protocol: ftp
-        server-dir: unmus/public/wordpress/wp-content/plugins/hello-dolly-for-your-song/
+        server-dir: ${{ vars.FTP_PATH_PUBLIC }}
         exclude: |
           **/.git*
           **/.git*/**

hdfys_display.php

@@ -51,7 +51,7 @@ function hdfys_where_am_i() {
 	global $pagenow;
 
 	// Run on specific pages only
-    if ( $pagenow == 'index.php' OR $pagenow == 'edit.php' OR $pagenow == 'upload.php' OR $pagenow == 'edit-comments.php' OR $pagenow == 'post.php') {
+    if ( $pagenow == 'index.php' OR $pagenow == 'edit.php' OR $pagenow == 'edit-comments.php' OR $pagenow == 'post.php') {
 
 		// Get Post Type
 		if (isset($_GET['post_type'])) {

hdfys_installation.php

@@ -26,13 +26,12 @@ function hdfys_activate () {
 	/* Initialize Settings */
 	add_option('hdfys_activated',"1");
 	add_option('hdfys_song',"");
-	add_option('hdfys_version', "17");
+	add_option('hdfys_version', "18");
 	add_option('widget_hdfys_widget');
 	add_option('hdfys_admin_lyric',"1");
 	add_option('hdfys_text_updated',"0");
 	}
 }
-register_activation_hook( __FILE__ , 'hdfys_activate' );
 
 /**
  * Deactivate the plugin.
@@ -43,6 +42,5 @@ function hdfys_activate () {
 function hdfys_deactivate () {
 	// nothing to do
 }
-register_deactivation_hook( __FILE__ , 'hdfys_deactivate' );
 
 ?>

hdfys_random.php

@@ -89,7 +89,13 @@ function hdfys_get_hello_dolly() {
 
 function hdfys_random_line ($text) {
 	$text = explode( "\n", $text );
-    return wptexturize( $text[ mt_rand( 0, count( $text ) - 1 ) ] );
+    $text = wptexturize( $text[ mt_rand( 0, count( $text ) - 1 ) ] );
+
+	// If the last character of the line is blank, remove it
+	$lastchar = substr($text, -1);
+	if($lastchar == ' ') {$text = rtrim($text, " ");}
+
+	return $text;
 }
 
 /**
@@ -105,12 +111,12 @@ function hdfys_get_anything () {
 	// Get Custom Text
 	$text = get_option('hdfys_song');
 
-	// If Length=0 then no text is maintained
+	// If Length=0 > No text is maintained
 	$text = strlen($text);
 
 	// Decide which text to take
 	$line = ($text > 0) ? hdfys_get_lyric() : hdfys_get_hello_dolly() ;
-	
+
 	return $line;
 }
 

hdfys_settings.php

@@ -105,7 +105,7 @@ function hdfys_validate_songtext ( $songtext ) {
  */
 
 function hdfys_show_options() {
-	add_options_page('Hello Dolly For Your Song', 'Hello Dolly Your Song', 10, basename(__FILE__), "hdfys_options");
+	add_options_page('Hello Dolly For Your Song', 'Hello Dolly Your Song', 'manage_options', basename(__FILE__), "hdfys_options");
 }
 add_action( 'admin_menu', 'hdfys_show_options');
 

hdfys_update.php

@@ -24,7 +24,7 @@ function hdfys_update () {
 $hdfys_previous_version = get_option('hdfys_version');
 
 /* Update Process Version 0.7 */
-  if($hdfys_previous_version==false) {
+if($hdfys_previous_version==false) {
 add_option('hdfys_activated',"1");
 add_option('hdfys_version', "7");
 $lyrics = get_option('hdfys_song');
@@ -73,7 +73,11 @@ function hdfys_update () {
 if($hdfys_previous_version==16) {
 update_option('hdfys_version','17');
 }
-
+/* Update Process Version 0.18 */
+if($hdfys_previous_version==17) {
+update_option('hdfys_version','18');
+}
+  
 }
 add_action( 'plugins_loaded', 'hdfys_update' );
 

hellodollyforyoursong.php

@@ -4,7 +4,7 @@
 Plugin Name:  Hello Dolly For Your Song
 Plugin URI:   https://www.unmus.de/wordpress-plugin-hello-dolly-for-your-song/
 Description:  This simple plugin shows a random line of any text in your blog.
-Version:	0.17
+Version:	  0.18
 Author:       Marco Hitschler
 Author URI:   https://www.unmus.de/
 License:      GPL3
@@ -37,6 +37,13 @@
 require_once('hdfys_sitehealth.php');
 require_once('hdfys_api.php');
 
+/**
+ * Installation & Deactivation
+ */
+
+register_activation_hook( __FILE__ , 'hdfys_activate' );
+register_deactivation_hook( __FILE__ , 'hdfys_deactivate' );
+
 /**
  * Add the settings link on the plugin page.
  * 

readme.md

@@ -66,9 +66,9 @@ The filter will be applied before output of the gutenberg block, template tag an
 
 This is Hello Dolly by Louis Armstrong. If no text is maintained in the options, the programm uses the songtext of Hello Dolly.
 
-### How can I use the gutenberg block?
+### Where do I find the gutenberg block?
 
-Just add the block in your content. You find the block in the category "widgets".
+You find the block in the category "widgets".
 
 ### How can I use the shortcode?
 
@@ -122,8 +122,8 @@ This repository follows the git-flow workflow.
 * develop branch is the current state of development
 * feature branches contain dedicated features in development
 * bugfix branches contain dedicated bugfixes in development
-* hotfix branches contain dedicated bugfixes in development
-* release branches contain the next release in preparation
+
+Hotfix and release branches will not be applied.
 
 ## Unterstanding the Deployment
 
@@ -153,6 +153,14 @@ This project is licensed under the GPL3 License.
 
 ## Changelog
 
+### 0.18
+
+* april 2023
+* Bugfix: LastChar is blank
+* Bugfix: Installation Process
+* Changed: Page Uploads excluded
+* Others: Depreciated Authorization replaced
+
 ### 0.17
 
 * may 2020

readme.txt

@@ -3,8 +3,8 @@ Contributors: unmus, jordansilaen
 Tags: hello world, love, random, learning wordpress, admin
 Requires at least: 4.4
 Requires PHP: 7.0
-Tested up to: 5.4.1
-Stable tag: 0.17
+Tested up to: 6.2
+Stable tag: 0.18
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -47,9 +47,9 @@ This simple plugin is an extended version of the famous hello dolly plugin by Ma
 
 This is Hello Dolly by Louis Armstrong. If no text is maintained in the options, the programm uses the songtext of Hello Dolly.
 
-= How can I use the gutenberg block? =
+= Where do I find the gutenberg block? =
 
-Just add the block in your content. You find the block in the category "widgets".
+You find the block in the category "widgets".
 
 = How can I use the shortcode? =
 
@@ -101,6 +101,13 @@ Several admin pages like settings are excluded, because some plugins do not use
 
 == Changelog ==
 
+= 0.18 =
+* april 2023
+* Bugfix: LastChar is blank
+* Bugfix: Installation Process
+* Changed: Page Uploads excluded
+* Others: Depreciated Authorization replaced
+
 = 0.17 =
 * may 2020
 * Russian Translation
@@ -196,6 +203,9 @@ Several admin pages like settings are excluded, because some plugins do not use
 
 == Upgrade Notice ==
 
+= 0.18 =
+This version is a maintenance release (no new features, but bugfixes).
+
 = 0.17 =
 This version brings russian translation.