[evolvis-commits] r14904: Config API: migrated a handful of sys_*_host variables
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 23:29:33 CET 2011
Author: mirabilos
Date: 2011-02-28 23:29:32 +0100 (Mon, 28 Feb 2011)
New Revision: 14904
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/mail/MailingList.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/mail/mailing_lists_create.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmarch/etc/plugins/scmarch/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmbzr/etc/plugins/scmbzr/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/cronjobs/cvs.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/etc/plugins/scmcvs/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmdarcs/etc/plugins/scmdarcs/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmgit/etc/plugins/scmgit/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmhg/etc/plugins/scmhg/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_newreleases.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_news.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php
trunk/gforge_base/evolvisforge-5.1/tests/code/deprecations/DeprecationsTest.php
Log:
Config API: migrated a handful of sys_*_host variables
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -415,8 +415,8 @@
$address .= 'noreply';
}
$address .= '@';
- if(forge_get_config('use_gateways') && isset($GLOBALS['sys_forum_return_domain'])) {
- $address .= $GLOBALS['sys_forum_return_domain'];
+ if(forge_get_config('use_gateways') && forge_get_config('forum_return_domain')) {
+ $address .= forge_get_config('forum_return_domain');
} else {
$address .= forge_get_config('web_host');
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -53,6 +53,12 @@
forge_define_config_item ('use_project_vhost', 'core', $GLOBALS['sys_use_project_vhost']) ;
forge_define_config_item ('use_project_database', 'core', $GLOBALS['sys_use_project_database']) ;
forge_define_config_item ('use_project_multimedia', 'core', $GLOBALS['sys_use_project_multimedia']) ;
+forge_define_config_item ('download_host', 'core', $GLOBALS['sys_download_host']) ;
+forge_define_config_item ('shell_host', 'core', $GLOBALS['sys_shell_host']) ;
+forge_define_config_item ('users_host', 'core', $GLOBALS['sys_users_host']) ;
+forge_define_config_item ('lists_host', 'core', $GLOBALS['sys_lists_host']) ;
+forge_define_config_item ('scm_host', 'core', $GLOBALS['sys_scm_host']) ;
+forge_define_config_item ('forum_return_domain', 'core', $GLOBALS['sys_forum_return_domain']) ;
// forge_define_config_item ('', 'core', $GLOBALS['sys_']) ;
/* Long-term:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/mail/MailingList.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/mail/MailingList.class.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/mail/MailingList.class.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -125,9 +125,9 @@
$realListName = strtolower($this->Group->getUnixName().'-'.$listName);
- if(!validate_email($realListName.'@'.$GLOBALS['sys_lists_host'])) {
+ if(!validate_email($realListName.'@'.forge_get_config('lists_host'))) {
$this->setError(_('Invalid List Name') . ': ' .
- $realListName.'@'.$GLOBALS['sys_lists_host']);
+ $realListName.'@'.forge_get_config('lists_host'));
return false;
}
@@ -193,7 +193,7 @@
Thank you for registering your project with %1$s.
-- the %1$s staff
-'), forge_get_config ('forge_name'), $GLOBALS['sys_lists_host'], $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
+'), forge_get_config ('forge_name'), forge_get_config('lists_host'), $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
$mailSubject = sprintf(_('%1$s New Mailing List'), forge_get_config ('forge_name'));
util_send_message($userEmail, $mailSubject, $mailBody, 'admin@'.forge_get_config('web_host'));
@@ -335,9 +335,9 @@
*/
function getArchivesUrl() {
if ($this->isPublic()) {
- return 'http://'.$GLOBALS['sys_lists_host'].'/pipermail/'.$this->getName().'/';
+ return 'http://'.forge_get_config('lists_host').'/pipermail/'.$this->getName().'/';
} else {
- return 'http://'.$GLOBALS['sys_lists_host'].'/mailman/private/'.$this->getName().'/';
+ return 'http://'.forge_get_config('lists_host').'/mailman/private/'.$this->getName().'/';
}
}
@@ -347,7 +347,7 @@
* @return string url of the info page
*/
function getExternalInfoUrl() {
- return 'http://'.$GLOBALS['sys_lists_host'].'/mailman/listinfo/'.$this->getName();
+ return 'http://'.forge_get_config('lists_host').'/mailman/listinfo/'.$this->getName();
}
/**
@@ -356,7 +356,7 @@
* @return string url of the admin
*/
function getExternalAdminUrl() {
- return 'http://'.$GLOBALS['sys_lists_host'].'/mailman/admin/'.$this->getName();
+ return 'http://'.forge_get_config('lists_host').'/mailman/admin/'.$this->getName();
}
/**
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/mail/mailing_lists_create.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/mail/mailing_lists_create.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/mail/mailing_lists_create.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -75,7 +75,7 @@
if (! in_array($listname,$mailing_lists)) { // New list?
$err .= "Creating Mailing List: $listname\n";
- //$lcreate_cmd = $sys_path_to_mailman."/bin/newlist -q $listname@$sys_lists_host $email $listpassword &> /dev/null";
+ //$lcreate_cmd = $sys_path_to_mailman."/bin/newlist -q $listname@".forge_get_config('lists_host')." $email $listpassword &> /dev/null";
$lcreate_cmd = $sys_path_to_mailman."/bin/newlist -q $listname $email $listpassword";
$err .= "Command to be executed is $lcreate_cmd\n";
passthru($lcreate_cmd, $failed);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/cvstracker/common/cvstrackerPlugin.class.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -165,7 +165,7 @@
*
*/
function addCvsTrackerToFile($group, $path) {
- global $sys_plugins_path, $sys_users_host, $cvs_binary_version;
+ global $sys_plugins_path, $cvs_binary_version;
$FOut = fopen($path, "a");
if($FOut) {
@@ -193,7 +193,7 @@
* return array with the loginfo lines.
*/
function getCvsTrackerLogInfoLines() {
- global $sys_plugins_path, $sys_users_host, $cvs_binary_version;
+ global $sys_plugins_path, $cvs_binary_version;
$array=array();
$array[]="# BEGIN added by gforge-plugin-cvstracker\n";
if ( $cvs_binary_version == "1.11" ) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmarch/etc/plugins/scmarch/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmarch/etc/plugins/scmarch/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmarch/etc/plugins/scmarch/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,6 +1,6 @@
<?php
-$default_arch_server = $GLOBALS['sys_scm_host'];
+$default_arch_server = forge_get_config('scm_host');
// $arch_root = $GLOBALS['sys_chroot'].'/scmrepos/arch' ;
// Local Variables:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmbzr/etc/plugins/scmbzr/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmbzr/etc/plugins/scmbzr/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmbzr/etc/plugins/scmbzr/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,6 +1,6 @@
<?php
-$default_bzr_server = $GLOBALS['sys_scm_host'];
+$default_bzr_server = forge_get_config('scm_host');
// $bzr_root = $GLOBALS['sys_chroot'].'/scmrepos/bzr' ;
// Local Variables:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/cronjobs/cvs.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/cronjobs/cvs.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/cronjobs/cvs.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -142,7 +142,7 @@
*/
function add_sync_mail($unix_group_name) {
- global $sys_lists_host, $cvsdir_prefix, $cvs_binary_version,$sys_plugins_path;
+ global $cvsdir_prefix, $cvs_binary_version,$sys_plugins_path;
$loginfo_file=$cvsdir_prefix.'/'.$unix_group_name.'/CVSROOT/loginfo';
if (!$loginfo_file) {
@@ -156,11 +156,11 @@
if ( $cvs_binary_version == "1.11" ) {
$pathsyncmail = "DEFAULT ".
$sys_plugins_path."/cvssyncmail/bin/syncmail -u %{sVv} ".
- $unix_group_name."-commits@".$sys_lists_host;
+ $unix_group_name."-commits@".forge_get_config('lists_host');
} else { //it's 1.12
$pathsyncmail = "DEFAULT ".
$sys_plugins_path."/cvssyncmail/bin/syncmail -u %p %{sVv} ".
- $unix_group_name."-commits@".$sys_lists_host;
+ $unix_group_name."-commits@".forge_get_config('lists_host');
}
$content = "\n#BEGIN Added by cvs.php script\n".
$pathsyncmail. "\n#END Added by cvs.php script\n";
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/etc/plugins/scmcvs/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/etc/plugins/scmcvs/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/etc/plugins/scmcvs/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,10 +1,6 @@
<?php
-if (isset ($GLOBALS['sys_scm_host'])) {
- $default_cvs_server = "cvs." . forge_get_config('web_host');
-} else {
- $default_cvs_server = 'scm';
-}
+$default_cvs_server = forge_get_config('scm_host') ;
$cvs_binary_version='1.12';
$use_ssl=false;
$GLOBALS['cvs_binary_version']=$cvs_binary_version;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmdarcs/etc/plugins/scmdarcs/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmdarcs/etc/plugins/scmdarcs/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmdarcs/etc/plugins/scmdarcs/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,6 +1,6 @@
<?php
-$default_darcs_server = $GLOBALS['sys_scm_host'];
+$default_darcs_server = forge_get_config('scm_host');
// $darcs_root = $GLOBALS['sys_chroot'].'/scmrepos/darcs' ;
// Local Variables:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmgit/etc/plugins/scmgit/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmgit/etc/plugins/scmgit/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmgit/etc/plugins/scmgit/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,6 +1,6 @@
<?php
-$default_git_server = $GLOBALS['sys_scm_host'];
+$default_git_server = forge_get_config('scm_host');
// $git_root = $GLOBALS['sys_chroot'].'/scmrepos/git' ;
// Local Variables:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmhg/etc/plugins/scmhg/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmhg/etc/plugins/scmhg/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmhg/etc/plugins/scmhg/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -1,6 +1,6 @@
<?php
-$default_hg_server = $GLOBALS['sys_scm_host'];
+$default_hg_server = forge_get_config('scm_host');
// $hg_root = $GLOBALS['sys_chroot'].'/scmrepos/hg' ;
// Local Variables:
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -2,11 +2,7 @@
//$default_svn_server = forge_get_config('web_host') ;
//$default_svn_server = "svn." . forge_get_config('web_host') ;
-if (isset ($GLOBALS['sys_scm_host'])) {
- $default_svn_server = $GLOBALS['sys_scm_host'];
-} else {
- $default_svn_server = 'scm';
-}
+$default_svn_server = forge_get_config('scm_host');
$use_ssh = false;
$use_dav = true;
$use_ssl = true;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/svntracker/common/svntrackerPlugin.class.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -158,7 +158,7 @@
*
*/
/*function addCvsTrackerToFile($path) {
- global $sys_plugins_path, $sys_users_host, $cvs_binary_version;
+ global $sys_plugins_path, $cvs_binary_version;
$FOut = fopen($path, "a");
if($FOut) {
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -71,7 +71,7 @@
<p>
<?php
-printf (_('Welcome, %1$s. Your email change is complete. Your new email address on file is <strong>%2$s</strong>. Mail sent to <%3$s> will now be forwarded to this account.'),$u->getUnixName(),$u->getEmail(),$u->getUnixName().'@'.$GLOBALS['sys_users_host']) ?>
+printf (_('Welcome, %1$s. Your email change is complete. Your new email address on file is <strong>%2$s</strong>. Mail sent to <%3$s> will now be forwarded to this account.'),$u->getUnixName(),$u->getEmail(),$u->getUnixName().'@'.forge_get_config('users_host')) ?>
</p>
<p><?php echo util_make_link ('/',_('Return')); ?></p>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/register.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -159,7 +159,7 @@
<p>
@<?php
echo _('Email Address:') . utils_requiredField() . "<br />\n<em>";
- printf(_('This email address will be verified before account activation. You will receive a mail forward account at <loginname@%1$s> that will forward to this address.'), $GLOBALS['sys_users_host']); ?></em>
+ printf(_('This email address will be verified before account activation. You will receive a mail forward account at <loginname@%1$s> that will forward to this address.'), forge_get_config('users_host')); ?></em>
<br /><input size="30" type="text" name="email" value="<?php print(htmlspecialchars($email)); ?>" />
</p>
<p>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_activity.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -50,7 +50,7 @@
'A'),
1);
if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".$GLOBALS['sys_users_host']." (".$rowwm['realname'].")";
+ $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
} else {
$webmaster = $GLOBALS['sys_admin_email'];
}
@@ -121,7 +121,7 @@
}
print " <description>".rss_description($arr['description'])."</description>\n";
- print " <author>".$arr['user_name']."@".$GLOBALS['sys_users_host']." (".$arr['realname'].")</author>\n";
+ print " <author>".$arr['user_name']."@".forge_get_config('users_host')." (".$arr['realname'].")</author>\n";
print " <pubDate>".rss_date($arr['activity_date'])."</pubDate>\n";
print " </item>\n";
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_newreleases.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_newreleases.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_newreleases.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -28,7 +28,7 @@
array($group_id,
'A'));
if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".$GLOBALS['sys_users_host']." (".$rowwm['realname'].")";
+ $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
} else {
$webmaster = $GLOBALS['sys_admin_email'];
}
@@ -90,7 +90,7 @@
print " <title>".htmlspecialchars($row['package_name'])." ".htmlspecialchars($row['module_name'])."</title>\n";
print " <link>http://".forge_get_config('web_host')."/project/showfiles.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</link>\n";
print " <description>".rss_description($row['module_notes'])."</description>\n";
- print " <author>".$row['user_name']."@".$GLOBALS['sys_users_host']." (".$row['realname'].")</author>\n";
+ print " <author>".$row['user_name']."@".forge_get_config('users_host')." (".$row['realname'].")</author>\n";
print " <comments>http://".forge_get_config('web_host')."/project/shownotes.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</comments>\n";
print " <pubDate>".rss_date($row['release_date'])."</pubDate>\n";
print " <guid>http://".forge_get_config('web_host')."/project/showfiles.php?group_id=".$row['group_id']."&release_id=".$row['filerelease_id']."</guid>\n";
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_news.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/export/rss20_news.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -29,7 +29,7 @@
'A'),
1);
if ($rowwm = db_fetch_array($reswm)) {
- $webmaster = $rowwm['user_name']."@".$GLOBALS['sys_users_host']." (".$rowwm['realname'].")";
+ $webmaster = $rowwm['user_name']."@".forge_get_config('users_host')." (".$rowwm['realname'].")";
} else {
$webmaster = $GLOBALS['sys_admin_email'];
}
@@ -82,7 +82,7 @@
print " <link>http://".forge_get_config('web_host')."/</link>\n";
}
print " <description>".rss_description($row['details'])."</description>\n";
- print " <author>".$row['user_name']."@".$GLOBALS['sys_users_host']." (".$row['realname'].")</author>\n";
+ print " <author>".$row['user_name']."@".forge_get_config('users_host')." (".$row['realname'].")</author>\n";
print " <pubDate>".rss_date($row['post_date'])."</pubDate>\n";
if ($row['group_id'] != $sys_news_group) {
print " <guid>http://".forge_get_config('web_host')."/forum/forum.php?forum_id=".$row['forum_id']."</guid>\n";
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/mail/admin/index.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -122,7 +122,7 @@
if(getIntFromGet('add_list')) {
mail_header(array(
'title' => _('Add a Mailing List')));
- printf(_('<p>Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong></p><p>It will take <span class="important">6-24 Hours</span> for your list to be created.</p>'), $GLOBALS['sys_lists_host']);
+ printf(_('<p>Lists are named in this manner:<br /><strong>projectname-listname@%1$s</strong></p><p>It will take <span class="important">6-24 Hours</span> for your list to be created.</p>'), forge_get_config('lists_host'));
$mlFactory = new MailingListFactory($Group);
if (!$mlFactory || !is_object($mlFactory) || $mlFactory->isError()) {
@@ -168,7 +168,7 @@
<input type="hidden" name="add_list" value="y" />
<input type="hidden" name="form_key" value="<?php echo form_generate_key();?>" />
<p><strong><?php echo _('Mailing List Name:'); ?></strong><br />
- <strong><?php echo $Group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php echo $GLOBALS['sys_lists_host']; ?></strong><br /></p>
+ <strong><?php echo $Group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php echo forge_get_config('lists_host'); ?></strong><br /></p>
<p>
<strong><?php echo _('Is Public?'); ?></strong><br />
<input type="radio" name="is_public" value="<?php echo MAIL__MAILING_LIST_IS_PUBLIC; ?>" checked="checked" /> <?php echo _('Yes'); ?><br />
Modified: trunk/gforge_base/evolvisforge-5.1/tests/code/deprecations/DeprecationsTest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/code/deprecations/DeprecationsTest.php 2011-02-28 22:29:29 UTC (rev 14903)
+++ trunk/gforge_base/evolvisforge-5.1/tests/code/deprecations/DeprecationsTest.php 2011-02-28 22:29:32 UTC (rev 14904)
@@ -62,6 +62,12 @@
'sys_use_project_vhost',
'sys_use_project_database',
'sys_use_project_multimedia',
+ 'sys_download_host',
+ 'sys_shell_host',
+ 'sys_users_host',
+ 'sys_lists_host',
+ 'sys_scm_host',
+ 'sys_forum_return_domain',
) ;
$pattern = implode ('|', $vars) ;
More information about the evolvis-commits
mailing list