[Fusionforge-commits] r12105 - in branches/Branch_5_1/src: common/include plugins/mediawiki/www www/account www/project/admin www/register
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Sat Jan 29 15:02:59 CET 2011
Author: aljeux
Date: 2011-01-29 15:02:59 +0100 (Sat, 29 Jan 2011)
New Revision: 12105
Modified:
branches/Branch_5_1/src/common/include/config-vars.php
branches/Branch_5_1/src/common/include/session.php
branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php
branches/Branch_5_1/src/www/account/register.php
branches/Branch_5_1/src/www/project/admin/index.php
branches/Branch_5_1/src/www/register/index.php
Log:
Migrate some missed global vars to new config system.
Modified: branches/Branch_5_1/src/common/include/config-vars.php
===================================================================
--- branches/Branch_5_1/src/common/include/config-vars.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/common/include/config-vars.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -137,9 +137,14 @@
forge_define_config_item ('images_secure_url', 'core', $GLOBALS['sys_images_secure_url']) ;
forge_define_config_item ('admin_email', 'core', $GLOBALS['sys_admin_email']) ;
forge_define_config_item ('session_key', 'core', $GLOBALS['sys_session_key']) ;
+forge_define_config_item ('session_expire', 'core', $GLOBALS['sys_session_expire']) ;
forge_define_config_item ('show_source', 'core', $GLOBALS['sys_show_source']) ;
forge_set_config_item_bool ('show_source', 'core') ;
forge_define_config_item ('default_trove_cat', 'core', $GLOBALS['default_trove_cat']) ;
+forge_define_config_item ('user_registration_accept_conditions', 'core', $GLOBALS['sys_require_accept_conditions']);
+forge_set_config_item_bool ('user_registration_accept_conditions', 'core') ;
+forge_define_config_item ('use_private_project', 'core', $GLOBALS['sys_use_private_project']);
+forge_set_config_item_bool ('use_private_project', 'core') ;
// Arch plugin
if (file_exists ($gfconfig.'plugins/scmarch/config.php')) {
Modified: branches/Branch_5_1/src/common/include/session.php
===================================================================
--- branches/Branch_5_1/src/common/include/session.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/common/include/session.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -90,8 +90,8 @@
if (trim($user_agent) != getStringFromServer('HTTP_USER_AGENT')) {
return false;
}
- if (($GLOBALS['sys_session_expire'] > 0) &&
- ($time - time() >= $GLOBALS['sys_session_expire'])) {
+ if ((forge_get_config('session_expire') > 0) &&
+ ($time - time() >= forge_get_config('session_expire'))) {
return false;
}
@@ -454,7 +454,7 @@
// set session cookie
//
$cookie = session_build_session_cookie($user_id);
- session_cookie("session_ser", $cookie, "", $GLOBALS['sys_session_expire']);
+ session_cookie("session_ser", $cookie, "", forge_get_config('session_expire'));
$session_ser=$cookie;
$res = db_query_params ('SELECT count(*) as c FROM user_session WHERE session_hash =$1',
Modified: branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -111,7 +111,7 @@
$GLOBALS['sys_lang'] = forge_get_config('default_language') ;
$GLOBALS['sys_urlroot'] = forge_get_config('url_root');
$GLOBALS['sys_session_key'] = forge_get_config('session_key');
-$GLOBALS['sys_session_expire'] = $sys_session_expire;
+$GLOBALS['sys_session_expire'] = forge_get_config('session_expire');
$GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ;
$GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ;
Modified: branches/Branch_5_1/src/www/account/register.php
===================================================================
--- branches/Branch_5_1/src/www/account/register.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/www/account/register.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -71,7 +71,7 @@
exit_form_double_submit('my');
}
- if ($GLOBALS['sys_require_accept_conditions'] && ! $accept_conditions) {
+ if (forge_get_config('user_registration_accept_conditions') && ! $accept_conditions) {
$warning_msg = _("You can't register an account unless you accept the terms of use.") ;
} else {
$activate_immediately = getIntFromRequest('activate_immediately');
@@ -224,7 +224,7 @@
<input type="checkbox" name="mail_va" value="1" />
<?php echo _('Receive additional community mailings. <i>(Low traffic.)</i>'); ?>
</p>
-<?php if ($GLOBALS['sys_require_accept_conditions']) { ?>
+<?php if (forge_get_config('user_registration_accept_conditions')) { ?>
<p>
<input type="checkbox" name="accept_conditions" value="1" />
<?php printf (_('Do you accept the <a href="%1$s">terms of use</a> for this site?'),
Modified: branches/Branch_5_1/src/www/project/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/index.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/www/project/admin/index.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -201,7 +201,7 @@
</p>
<?php
- if ($sys_use_private_project) {
+ if (forge_get_config('use_private_project')) {
echo '<p>' ;
echo _('Visibility: ');
echo html_build_select_box_from_arrays(
Modified: branches/Branch_5_1/src/www/register/index.php
===================================================================
--- branches/Branch_5_1/src/www/register/index.php 2011-01-29 13:52:02 UTC (rev 12104)
+++ branches/Branch_5_1/src/www/register/index.php 2011-01-29 14:02:59 UTC (rev 12105)
@@ -273,7 +273,7 @@
echo '</p>';
}
-if ($sys_use_private_project) {
+if (forge_get_config('use_private_project')) {
$index++;
echo '<h3>'.$index.'. '._('Visibility'). '</h3>';
echo '<p><input type="radio" name="is_public" value="1" ';
More information about the Fusionforge-commits
mailing list