From 36956bbeeb7b6d6fa7971e9f13ffcab9bc1ad0b9 Mon Sep 17 00:00:00 2001
From: Thibault Dockx <thibault.dockx@fusiondirectory.org>
Date: Tue, 7 Mar 2023 14:46:13 +0000
Subject: [PATCH] :ambulance: Fix(Core) - Changes our tools name to correct
ones.
Changes the old naming convention of our tools to the new ones.
---
contrib/apache/fusiondirectory-apache.conf | 2 +-
html/index.php | 2 +-
include/class_acl.inc | 2 +-
include/functions.inc | 10 +++++-----
include/variables.inc | 2 +-
setup/setup_finish.tpl | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/contrib/apache/fusiondirectory-apache.conf b/contrib/apache/fusiondirectory-apache.conf
index e21275cba..c1a35b7dc 100644
--- a/contrib/apache/fusiondirectory-apache.conf
+++ b/contrib/apache/fusiondirectory-apache.conf
@@ -2,7 +2,7 @@
Alias /fusiondirectory /var/www/fusiondirectory/html
<Directory /var/www/fusiondirectory/html>
-# Remove the comment from the line below if you use fusiondirectory-setup --encrypt-passwords
+# Remove the comment from the line below if you use fusiondirectory-configuration-manager --encrypt-passwords
# include /etc/fusiondirectory/fusiondirectory.secrets
</Directory>
diff --git a/html/index.php b/html/index.php
index 6f586d71f..99afe636e 100644
--- a/html/index.php
+++ b/html/index.php
@@ -89,7 +89,7 @@ if (!file_exists(CONFIG_DIR.'/'.CONFIG_FILE)) {
if (!is_readable(CONFIG_DIR.'/'.CONFIG_FILE)) {
throw new FatalError(
htmlescape(sprintf(
- _('FusionDirectory configuration %s/%s is not readable. Please run fusiondirectory-setup --check-config to fix this.'),
+ _('FusionDirectory configuration %s/%s is not readable. Please run fusiondirectory-configuration-manager --check-config to fix this.'),
CONFIG_DIR,
CONFIG_FILE
))
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 0a5329785..470a2c522 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -102,7 +102,7 @@ class acl
if (!in_array($type, ['subtree', 'base'])) {
$error = new FusionDirectoryError(
nl2br(htmlescape(sprintf(
- _("Unkown ACL type \"%s\"!\nYou might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."),
+ _("Unkown ACL type \"%s\"!\nYou might need to run \"fusiondirectory-configuration-manager --migrate-acls\" to migrate your acls to the new format."),
$type
)))
);
diff --git a/include/functions.inc b/include/functions.inc
index cd68ecad5..0517b1b32 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -35,7 +35,7 @@ require_once('accept-to-gettext.inc');
/*!
* \brief Does autoloading for classes used in FusionDirectory.
*
- * Takes the list generated by 'fusiondirectory-setup' and loads the
+ * Takes the list generated by 'fusiondirectory-configuration-manager' and loads the
* file containing the requested class.
*
* \param array $class_name list of class name
@@ -52,7 +52,7 @@ function fusiondirectory_autoload ($class_name)
echo $trace;
echo "<br/>\n";
}
- echo sprintf(_("Fatal error: no class locations defined - please run '%s' to fix this"), "<b>fusiondirectory-setup --update-cache</b>");
+ echo sprintf(_("Fatal error: no class locations defined - please run '%s' to fix this"), "<b>fusiondirectory-configuration-manager --update-cache</b>");
exit;
}
@@ -75,7 +75,7 @@ function fusiondirectory_autoload ($class_name)
echo $trace;
echo "<br/>\n";
}
- echo sprintf(_("Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"), $class_name, "<b>fusiondirectory-setup --update-cache</b>");
+ echo sprintf(_("Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"), $class_name, "<b>fusiondirectory-configuration-manager --update-cache</b>");
exit;
}
}
@@ -921,7 +921,7 @@ function clean_smarty_compile_dir ($directory)
if (is_file($directory.'/'.$file) && !unlink($directory.'/'.$file)) {
$error = new FusionDirectoryError(
htmlescape(sprintf(
- _('File "%s" could not be deleted. Try "fusiondirectory-setup --check-directories" to fix permissions.'),
+ _('File "%s" could not be deleted. Try "fusiondirectory-configuration-manager --check-directories" to fix permissions.'),
$directory."/".$file
))
);
@@ -1514,7 +1514,7 @@ function load_all_classes ()
sprintf(
htmlescape(_('Cannot locate file "%s" - please run "%s" to fix this')),
htmlescape("$BASE_DIR/$path"),
- '<b>fusiondirectory-setup --update-cache</b>'
+ '<b>fusiondirectory-configuration-manager --update-cache</b>'
)
);
}
diff --git a/include/variables.inc b/include/variables.inc
index 0385a59e7..0240aa59d 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -22,7 +22,7 @@
/*!
* \file variables.inc
* Define common locations and variables
- * Generated by fusiondirectory-setup
+ * Generated by fusiondirectory-configuration-manager
*/
require_once('variables_common.inc');
diff --git a/setup/setup_finish.tpl b/setup/setup_finish.tpl
index cd1c04c91..eaaa753c5 100644
--- a/setup/setup_finish.tpl
+++ b/setup/setup_finish.tpl
@@ -6,7 +6,7 @@
{$msg2}
</p>
<p>
- {t escape=no 1="<strong>fusiondirectory-setup --check-config</strong>"}Run %1 to put the correct right on fusiondirectory.conf{/t}
+ {t escape=no 1="<strong>fusiondirectory-configuration-manager --check-config</strong>"}Run %1 to put the correct right on fusiondirectory.conf{/t}
</p>
<p>
<input type="submit" name="getconf" value="{t}Download configuration{/t}"/>
--
GitLab