Merge branch 'master' of github.com:virtualmin/virtualmin-gpl

Author: jcameron

lang/de

@@ -4668,7 +4668,6 @@ scripts_kit_clone_target2=Vorhandene Domain
 scripts_kit_clone_target3=Neue Sub-Domain
 scripts_kit_clone_target4=Neue Top-Level-Domain
 scripts_kit_apply=Anwenden
-scripts_kit_wp_login=Anmeldung bei WordPress
 scripts_kit_updcache=Updates prüfen
 scripts_kit_openin_fm=Im Dateimanager öffnen
 scripts_kit_backups_location=Backup-Standort
@@ -4692,7 +4691,7 @@ scripts_kit_estype_multi2=Verwenden Sie den Hilfsparameter '--script-path', um d
 scripts_kit_estype_path=Das Script des Typs '$1' am Pfad '$2' existiert nicht
 
 scripts_gpl_pro_tip=Pro-Feature
-scripts_gpl_pro_tip_hide=Danke für den Hinweis
+scripts_gpl_pro_tip_hide=Ausblenden
 scripts_gpl_pro_tip_hide2=Danke, ich werde darüber nachdenken
 scripts_gpl_pro_tip_open=Virtualmin Pro kaufen
 scripts_gpl_pro_tip_remind=Erinnere mich später
@@ -4710,6 +4709,9 @@ scripts_gpl_pro_tip_extra_db_users=Mit diesem Formular können Sie Datenbank-Ben
 scripts_gpl_pro_tip_extra_user_dismiss=Danke für den Tipp! Diese Seite und ihren Link ausblenden
 scripts_gpl_pro_tip_workbench_pro_only=Die $1 Workbench-Funktion ist in der GPL-Version nicht verfügbar.
 scripts_gpl_pro_tip_workbench_enot=Die $1 Workbench-Funktion ist für diese Web-App nicht verfügbar
+scripts_gpl_pro_tip_plugin_dashboard=Neues Plugin verfügbar
+scripts_gpl_pro_tip_learn_more=Mehr erfahren
+scripts_gpl_pro_tip_workbench_desc_dashboard=WP Workbench ist ein neues Plugin für Virtualmin Pro, das die Verwaltung von WordPress-Websites erleichtert. Es bietet eine übersichtliche, zentrale Oberfläche zur Verwaltung von WordPress-Plugins, -Themes, -Backups, zum Klonen sowie zur Konfiguration von Entwicklungseinstellungen.
 
 scripts_service_ename=Fehlender oder ungültiger Dienstname
 scripts_service_eport=Fehlende oder ungültige Dienstportnummer
@@ -6105,6 +6107,7 @@ newdynip_notify=IP-Update-Benachrichtigungen per E-Mail an
 newdynip_none=Niemand
 newdynip_eext=Fehler beim Ermitteln der extern sichtbaren IP-Adresse
 newdynip_eexternal=Im externen Skriptmodus muss der vollständige Pfad zu einem Skript eingegeben werden
+newdynip_eexternal2=Im Webmin-Modus muss der Hostname oder Hostname:Port eines Webmin-Servers eingegeben werden.
 
 dynip_dyndns=DynDNS
 dynip_webmin=Virtualmin-System ..

lang/en

@@ -4668,7 +4668,6 @@ scripts_kit_clone_target2=Existing domain
 scripts_kit_clone_target3=New sub-domain
 scripts_kit_clone_target4=New top-level domain
 scripts_kit_apply=Apply
-scripts_kit_wp_login=Login to WordPress
 scripts_kit_updcache=Check Updates
 scripts_kit_openin_fm=Open in File Manager
 scripts_kit_backups_location=Backups location

scripts-lib.pl

@@ -81,17 +81,21 @@ sub get_script
 				&guess_script_version($spath), 'plugin' ]);
 			}
 		}
-	# Load script extension from plugins
-	if (@sfiles) {
-		foreach my $p (&check_script_plugins_extensions()) {
-			my @efiles =
-				&plugin_call($p, "get_scripts_extension_files",
-					     $name);
-			$sfiles[0]->[4] = \@efiles if (@efiles);
+	}
+
+# No such script
+return undef if (!@sfiles);
+
+# Load script extension from plugins for each file
+foreach my $p (&check_script_plugins_extensions()) {
+	my @efiles = &plugin_call($p, "get_scripts_extension_files", $name);
+	if (@efiles) {
+		foreach my $sfile (@sfiles) {
+			$sfile->[4] ||= [];
+			push(@{$sfile->[4]}, @efiles);
 			}
 		}
 	}
-return undef if (!@sfiles);
 
 # Work out the newest one, so that plugins can override Virtualmin and
 # vice-versa

scripts/classicpress.pl

@@ -26,7 +26,7 @@ sub script_classicpress_longdesc
 # script_classicpress_versions()
 sub script_classicpress_versions
 {
-return ( "2.3.1", "2.2.0", "2.1.1", "1.4.0" );
+return ( "2.4.1", "2.3.1", "2.2.0", "2.1.1", "1.4.0" );
 }
 
 sub script_classicpress_category
@@ -210,12 +210,17 @@ sub script_classicpress_install
 
 my $dom_php_bin = &get_php_cli_command($opts->{'phpver'}) || &has_command("php");
 $dom_php_bin || return (0, "Could not find PHP CLI command");
-my $wp = "cd $opts->{'dir'} && $dom_php_bin $opts->{'dir'}/wp-cli.phar";
+my $homebin = "$d->{'home'}/bin";
+&make_dir_as_domain_user($d, $homebin, 0755) if (!-d $homebin);
+my $wpcli = "$homebin/wp";
+my $wpcli_old = "$opts->{'dir'}/wp-cli.phar";
+&unlink_file_as_domain_user($d, $wpcli_old) if (-f $wpcli_old);
+my $wp = "cd $opts->{'dir'} && $dom_php_bin $wpcli --path=\"$opts->{'dir'}\"";
 
 # Copy WP-CLI
 &make_dir_as_domain_user($d, $opts->{'dir'}, 0755) if (!-d $opts->{'dir'});
-&copy_source_dest($files->{'cli'}, "$opts->{'dir'}/wp-cli.phar");
-&set_permissions_as_domain_user($d, 0750, "$opts->{'dir'}/wp-cli.phar");
+&copy_source_dest($files->{'cli'}, $wpcli);
+&set_permissions_as_domain_user($d, 0750, $wpcli);
 
 # Source URL
 my $download_server =
@@ -399,11 +404,8 @@ sub script_classicpress_realversion
 sub script_classicpress_latest
 {
 my ($ver) = @_;
-if (&compare_versions($ver, 6) >= 0) {
-	return ( "https://github.com/ClassicPress/ClassicPress-release/tags",
-		 "ClassicPress/ClassicPress-release/releases/tag/([\\d\\.]+)" );
-	}
-return ( );
+return ( 'https://github.com/ClassicPress/ClassicPress-release/tags',
+	 'ClassicPress/ClassicPress-release/releases/tag/([\\d\\.]+)"' );
 }
 
 sub script_classicpress_site

scripts/wordpress.pl

@@ -215,12 +215,17 @@ sub script_wordpress_install
 
 my $dom_php_bin = &get_php_cli_command($opts->{'phpver'}) || &has_command("php");
 $dom_php_bin || return (0, "Could not find PHP CLI command");
-my $wp = "cd $opts->{'dir'} && $dom_php_bin $opts->{'dir'}/wp-cli.phar";
-
-# Copy wordpress-cli
+my $homebin = "$d->{'home'}/bin";
+&make_dir_as_domain_user($d, $homebin, 0755) if (!-d $homebin);
+my $wpcli = "$homebin/wp";
+my $wpcli_old = "$opts->{'dir'}/wp-cli.phar";
+&unlink_file_as_domain_user($d, $wpcli_old) if (-f $wpcli_old);
+my $wp = "cd $opts->{'dir'} && $dom_php_bin $wpcli --path=\"$opts->{'dir'}\"";
+
+# Copy WP-CLI
 &make_dir_as_domain_user($d, $opts->{'dir'}, 0755) if (!-d $opts->{'dir'});
-&copy_source_dest($files->{'cli'}, "$opts->{'dir'}/wp-cli.phar");
-&set_permissions_as_domain_user($d, 0750, "$opts->{'dir'}/wp-cli.phar");
+&copy_source_dest($files->{'cli'}, $wpcli);
+&set_permissions_as_domain_user($d, 0750, $wpcli);
 
 # Source URL
 my $aux_download_server = "http://scripts.virtualmin.com";