This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via d4d50d53bb607ef153a54b557902a8085af4656c (commit)
via ebedd04b5ab2b88b87bdb0d15dc95717b0edf854 (commit)
from 6f214057cea6d5df6adc66d6b39cdb76592041da (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d4d50d53bb607ef153a54b557902a8085af4656c
Author: Sylvain Beucler <[email protected]>
Date: Wed May 27 19:12:02 2015 +0200
lists: use html_helpers, with absolute URL
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 703dbb4..610742cc 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1143,7 +1143,7 @@ function util_make_uri($path) {
}
/**
- * util_make_link - Construct proper (relative) URI from path & text
+ * util_make_link - Construct proper URL/URI from path & text
*
* @param string $path
* @param string $text
diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 5811b9e..becdc48 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -296,7 +296,7 @@ if ($group_id) {
if($currentList->getStatus() ==
MAIL__MAILING_LIST_IS_REQUESTED) {
echo _('Not activated yet');
} else {
- echo '<a
href="'.$currentList->getExternalAdminUrl().'">'._('Administration').'</a>';
+ echo
util_make_link($currentList->getExternalAdminUrl(), _('Administration'), false,
true);
}
echo '</td>';
echo '<td class="align-center">';
commit ebedd04b5ab2b88b87bdb0d15dc95717b0edf854
Author: Sylvain Beucler <[email protected]>
Date: Wed May 27 19:03:32 2015 +0200
lists: fix wrong URL in default list archives page
diff --git a/src/post-install.d/lists/lists.sh
b/src/post-install.d/lists/lists.sh
index c3ed79d..ef5fb20 100755
--- a/src/post-install.d/lists/lists.sh
+++ b/src/post-install.d/lists/lists.sh
@@ -27,9 +27,16 @@ case "$1" in
chown www-data:list /var/lib/mailman/archives/private
chmod 2770 /var/lib/mailman/archives/private
fi
+
# Managed by mailman, but referencing it to document where it is:
# echo "Use 'mmsitepass' to set the Mailman master password"
# echo "Cf. /var/lib/mailman/data/adm.pw"
+
+ # Normally defined in per-list config, but needed e.g. in default empty
archives page
+ lists_host=$(forge_get_config lists_host)
+ sed -i -e "s/^DEFAULT_EMAIL_HOST.*/DEFAULT_EMAIL_HOST = '$lists_host'/"
\
+ -e "s/^DEFAULT_URL_HOST.*/DEFAULT_URL_HOST = '$lists_host'/" \
+ /etc/mailman/mm_cfg.py
;;
*)
echo "Usage: $0 {configure}"
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 2 +-
src/post-install.d/lists/lists.sh | 7 +++++++
src/www/mail/admin/index.php | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 703dbb4..610742cc 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1143,7 +1143,7 @@ function util_make_uri($path) {
}
/**
- * util_make_link - Construct proper (relative) URI from path & text
+ * util_make_link - Construct proper URL/URI from path & text
*
* @param string $path
* @param string $text
diff --git a/src/post-install.d/lists/lists.sh
b/src/post-install.d/lists/lists.sh
index c3ed79d..ef5fb20 100755
--- a/src/post-install.d/lists/lists.sh
+++ b/src/post-install.d/lists/lists.sh
@@ -27,9 +27,16 @@ case "$1" in
chown www-data:list /var/lib/mailman/archives/private
chmod 2770 /var/lib/mailman/archives/private
fi
+
# Managed by mailman, but referencing it to document where it is:
# echo "Use 'mmsitepass' to set the Mailman master password"
# echo "Cf. /var/lib/mailman/data/adm.pw"
+
+ # Normally defined in per-list config, but needed e.g. in default empty
archives page
+ lists_host=$(forge_get_config lists_host)
+ sed -i -e "s/^DEFAULT_EMAIL_HOST.*/DEFAULT_EMAIL_HOST = '$lists_host'/"
\
+ -e "s/^DEFAULT_URL_HOST.*/DEFAULT_URL_HOST = '$lists_host'/" \
+ /etc/mailman/mm_cfg.py
;;
*)
echo "Usage: $0 {configure}"
diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 5811b9e..becdc48 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -296,7 +296,7 @@ if ($group_id) {
if($currentList->getStatus() ==
MAIL__MAILING_LIST_IS_REQUESTED) {
echo _('Not activated yet');
} else {
- echo '<a
href="'.$currentList->getExternalAdminUrl().'">'._('Administration').'</a>';
+ echo
util_make_link($currentList->getExternalAdminUrl(), _('Administration'), false,
true);
}
echo '</td>';
echo '<td class="align-center">';
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
