Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences
In directory usw-pr-cvs1:/tmp/cvs-serv21839
Modified Files:
preferences.php main.php
Log Message:
no message
Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/preferences.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** preferences.php 23 Aug 2002 04:18:03 -0000 1.4
--- preferences.php 5 Sep 2002 11:10:57 -0000 1.5
***************
*** 38,44 ****
$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
$newuser_group_select = new XoopsFormSelectGroup(_MD_AM_NOTIFYTO, "new_user_notify_group", false, $xoopsConfig['new_user_notify_group'], 1, false);
! $newuser_tray = new XoopsFormElementTray(_MD_AM_NEWUNOTIFY, "<br />");
$newuser_tray->addElement($newuser_radio);
$newuser_tray->addElement($newuser_group_select);
$sdelete_radio = new XoopsFormRadioYN(_MD_AM_SELFDELETE, "self_delete", $xoopsConfig['self_delete'], _MD_AM_YES,_MD_AM_NO);
$loading_radio = new XoopsFormRadioYN(_MD_AM_LOADINGIMG, "display_loading_img", $xoopsConfig['display_loading_img'], _MD_AM_YES,_MD_AM_NO);
--- 38,52 ----
$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
$newuser_group_select = new XoopsFormSelectGroup(_MD_AM_NOTIFYTO, "new_user_notify_group", false, $xoopsConfig['new_user_notify_group'], 1, false);
! $newuser_tray = new XoopsFormElementTray(_MD_AM_NEWUNOTIFY, '<br />');
$newuser_tray->addElement($newuser_radio);
$newuser_tray->addElement($newuser_group_select);
+
+ $actv_select = new XoopsFormSelect('', 'activation_type', $xoopsConfig['activation_type']);
+ $actv_select->addOptionArray(array(0 => _MD_AM_USERACTV, 1 => _MD_AM_AUTOACTV, 2 => _MD_AM_ADMINACTV));
+ $actv_group_select = new XoopsFormSelectGroup(_MD_AM_ACTVGROUP.'<br />', 'activation_group', false, $xoopsConfig['activation_group'], 1, false);
+ $actv_tray = new XoopsFormElementTray(_MD_AM_ACTVTYPE, '<br /><br />');
+ $actv_tray->addElement($actv_select);
+ $actv_tray->addElement($actv_group_select);
+
$sdelete_radio = new XoopsFormRadioYN(_MD_AM_SELFDELETE, "self_delete", $xoopsConfig['self_delete'], _MD_AM_YES,_MD_AM_NO);
$loading_radio = new XoopsFormRadioYN(_MD_AM_LOADINGIMG, "display_loading_img", $xoopsConfig['display_loading_img'], _MD_AM_YES,_MD_AM_NO);
***************
*** 97,100 ****
--- 105,109 ----
$form->addElement($allowimage_radio);
$form->addElement($newuser_tray);
+ $form->addElement($actv_tray);
$form->addElement($sdelete_radio);
$form->addElement($loading_radio);
***************
*** 121,125 ****
}
! function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
global $xoopsConfig, $HTTP_COOKIE_VARS;
if (!xoopsfwrite()) {
--- 130,134 ----
}
! function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
global $xoopsConfig, $HTTP_COOKIE_VARS;
if (!xoopsfwrite()) {
***************
*** 193,196 ****
--- 202,210 ----
// "._MD_AM_ALLOWIMAGE." (1="._MD_AM_YES." 0="._MD_AM_NO.")
\$xoopsConfig['allow_image'] = ".intval($allow_image).";
+
+ // "._MD_AM_ACTVTYPE." (0="._MD_AM_AUTOACTV." 1="._MD_AM_USERACTV." 2="._MD_AM_ADMINACTV.")
+ \$xoopsConfig['activation_type'] = ".intval($activation_type).";
+ // "._MD_AM_ACTVGROUP."
+ \$xoopsConfig['activation_group'] = ".intval($activation_group).";
// "._MD_AM_NEWUNOTIFY." (1="._MD_AM_YES." 0="._MD_AM_NO.")
Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php 23 Aug 2002 04:18:04 -0000 1.3
--- main.php 5 Sep 2002 11:10:57 -0000 1.4
***************
*** 29,33 ****
}
}
! save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
break;
case "default":
--- 29,33 ----
}
}
! save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
break;
case "default":
|
