Skip to content
GitLab
Unverified Commit 61018c63 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:sparkles: feat(subscription) Add subscription name at start of filename 

issue #6099
parent a05216c3
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects 6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
subscriptions/admin/subscriptions/class_subscription.inc
+ 2
− 2
View file @ 61018c63
...@@ -194,7 +194,7 @@ class subscription extends simplePlugin ...@@ -194,7 +194,7 @@ class subscription extends simplePlugin
$label = $this->attributesAccess['fdSubscriptionAptRepository']->displayValue($this->fdSubscriptionAptRepository); $label = $this->attributesAccess['fdSubscriptionAptRepository']->displayValue($this->fdSubscriptionAptRepository);
$name = strtolower(preg_replace(['/\s/','/[^[:alnum:]]/'], ['-',''], $label)); $name = strtolower(preg_replace(['/\s/','/[^[:alnum:]]/'], ['-',''], $label));
$fileName = 'fusiondirectory-subscription-'.$name.'.list'; $fileName = strtolower($this->cn).'-fusiondirectory-subscription-'.$name.'.list';
$fileContent = 'deb https://'.$config->get_cfg_value('SubscriptionHost').'/'.$this->fdSubscriptionAptRepository.' main'."\n"; $fileContent = 'deb https://'.$config->get_cfg_value('SubscriptionHost').'/'.$this->fdSubscriptionAptRepository.' main'."\n";
send_binary_content($fileContent, $fileName); send_binary_content($fileContent, $fileName);
...@@ -207,7 +207,7 @@ class subscription extends simplePlugin ...@@ -207,7 +207,7 @@ class subscription extends simplePlugin
$label = $this->attributesAccess['fdSubscriptionRpmRepository']->displayValue($this->fdSubscriptionRpmRepository); $label = $this->attributesAccess['fdSubscriptionRpmRepository']->displayValue($this->fdSubscriptionRpmRepository);
$name = strtolower(preg_replace(['/\s/','/[^[:alnum:]]/'], ['-',''], $label)); $name = strtolower(preg_replace(['/\s/','/[^[:alnum:]]/'], ['-',''], $label));
$fileName = 'fusiondirectory-subscription-'.$name.'.repo'; $fileName = strtolower($this->cn).'-fusiondirectory-subscription-'.$name.'.repo';
$fileContent = '[fusiondirectory-subscription-'.$name.']'."\n"; $fileContent = '[fusiondirectory-subscription-'.$name.']'."\n";
$fileContent .= 'name=Fusiondirectory Packages for '.$label."\n"; $fileContent .= 'name=Fusiondirectory Packages for '.$label."\n";
$fileContent .= 'baseurl=https://'.$this->uid.':'.$this->userPassword.'@'.$config->get_cfg_value('SubscriptionHost').'/'.$this->fdSubscriptionRpmRepository."\n"; $fileContent .= 'baseurl=https://'.$this->uid.':'.$this->userPassword.'@'.$config->get_cfg_value('SubscriptionHost').'/'.$this->fdSubscriptionRpmRepository."\n";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment