Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_board.php,1.34,1.35 admin_userauth.php,1.24,1.25 admin_forumauth.php,1.13,1.14 admin_groupauth.php,1.20,1.21 admin_mass_email.php,1.7,1.8 index.php,1.23,1.24
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:06:04
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16695/admin
Modified Files:
admin_board.php admin_userauth.php admin_forumauth.php
admin_groupauth.php admin_mass_email.php index.php
Log Message:
Various admin lang and other fixes ... this will break other things I'm sure, only submit bug reports for recently commited files
Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** admin_board.php 2001/11/15 18:38:23 1.34
--- admin_board.php 2001/11/19 19:06:01 1.35
***************
*** 56,73 ****
}
! if($HTTP_POST_VARS['submit'])
{
! message_die(GENERAL_MESSAGE, $lang['Config_updated']);
}
}
$style_select = style_select($new['default_style'], 'default_style', "../templates");
-
- $admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates");
-
$lang_select = language_select($new['default_lang'], 'default_lang', "../language");
-
$timezone_select = tz_select($new['board_timezone'], 'board_timezone');
$html_tags = $new['allow_html_tags'];
--- 56,77 ----
}
! if( isset($HTTP_POST_VARS['submit']) )
{
! $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_config'], "<a href=\"" . append_sid("admin_board.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
}
}
$style_select = style_select($new['default_style'], 'default_style', "../templates");
$lang_select = language_select($new['default_lang'], 'default_lang', "../language");
$timezone_select = tz_select($new['board_timezone'], 'board_timezone');
+ $disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";
+ $disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : "";
+
+ $cookie_secure_yes = ( $new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+ $cookie_secure_no = ( !$new['cookie_secure'] ) ? "checked=\"checked\"" : "";
+
$html_tags = $new['allow_html_tags'];
***************
*** 130,134 ****
--- 134,147 ----
"L_SITE_NAME" => $lang['Site_name'],
"L_SITE_DESCRIPTION" => $lang['Site_desc'],
+ "L_DISABLE_BOARD" => $lang['Board_disable'],
+ "L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'],
"L_ACCT_ACTIVATION" => $lang['Acct_activation'],
+ "L_COOKIE_SETTINGS" => $lang['Cookie_settings'],
+ "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'],
+ "L_COOKIE_NAME" => $lang['Cookie_name'],
+ "L_COOKIE_DOMAIN" => $lang['Cookie_domain'],
+ "L_COOKIE_PATH" => $lang['Cookie_path'],
+ "L_SESSION_LENGTH" => $lang['Session_length'],
+ "L_COOKIE_SECURE" => $lang['Cookie_secure'],
"L_PRIVATE_MESSAGING" => $lang['Private_Messaging'],
"L_INBOX_LIMIT" => $lang['Inbox_limits'],
***************
*** 190,196 ****
"L_SMTP_SERVER" => $lang['SMTP_server'],
"L_SUBMIT" => $lang['Submit'],
"SITENAME" => $new['sitename'],
! "SITE_DESCRIPTION" => $new['site_desc'],
"ACTIVATION_NONE" => USER_ACTIVATION_NONE,
"ACTIVATION_NONE_CHECKED" => $activation_none,
--- 203,212 ----
"L_SMTP_SERVER" => $lang['SMTP_server'],
"L_SUBMIT" => $lang['Submit'],
+ "L_RESET" => $lang['Reset'],
"SITENAME" => $new['sitename'],
! "SITE_DESCRIPTION" => $new['site_desc'],
! "S_DISABLE_BOARD_YES" => $disable_board_yes,
! "S_DISABLE_BOARD_NO" => $disable_board_no,
"ACTIVATION_NONE" => USER_ACTIVATION_NONE,
"ACTIVATION_NONE_CHECKED" => $activation_none,
***************
*** 217,220 ****
--- 233,242 ----
"SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'],
"SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'],
+ "COOKIE_NAME" => $new['cookie_name'],
+ "COOKIE_DOMAIN" => $new['cookie_domain'],
+ "COOKIE_PATH" => $new['cookie_path'],
+ "SESSION_LENGTH" => $new['session_length'],
+ "S_COOKIE_SECURE_ENABLED" => $cookie_secure_yes,
+ "S_COOKIE_SECURE_DISABLED" => $cookie_secure_no,
"GZIP_YES" => $gzip_yes,
"GZIP_NO" => $gzip_no,
***************
*** 263,265 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 285,287 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** admin_userauth.php 2001/10/17 00:42:37 1.24
--- admin_userauth.php 2001/11/19 19:06:01 1.25
***************
*** 532,536 ****
// Any warnings?
//
! $warning_list = "";
while( list($forum_id, $group_ary) = each($warning_mod_grpid) )
{
--- 532,536 ----
// Any warnings?
//
! $warning_list_mod = "";
while( list($forum_id, $group_ary) = each($warning_mod_grpid) )
{
***************
*** 539,547 ****
if(!empty($valid_auth_mod_sql[$forum_id]))
{
! $warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_moderator_status'] . " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
}
}
}
while( list($forum_id, $group_ary) = each($warning_prv_grpid) )
{
--- 539,548 ----
if(!empty($valid_auth_mod_sql[$forum_id]))
{
! $warning_list_mod .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_mod_grpname[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
}
}
}
+ $warning_list_acl = "";
while( list($forum_id, $group_ary) = each($warning_prv_grpid) )
{
***************
*** 550,576 ****
if( !empty($valid_auth_prv_sql[$forum_id]) )
{
! $warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
}
}
}
! if( $warning_list != "" )
{
! $warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
!
! include('page_header_admin.'.$phpEx);
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['Conflict_warning'],
! "MESSAGE_TEXT" => $warning_list)
! );
}
else
{
! header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
}
}
--- 551,580 ----
if( !empty($valid_auth_prv_sql[$forum_id]) )
{
! $warning_list_acl .= "<br /><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
}
}
}
! $warning_list = "";
! if( $warning_list_mod != "" )
{
! $warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
! }
! if( $warning_list_acl != "" )
! {
! $warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
! }
! if( $warning_list != "" )
! {
! $message = $warning_list . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
}
else
{
! $message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_userauth'], "<a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
}
}
***************
*** 850,854 ****
$t_username .= $userinf[0]['username'];
! $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected=\"selected\">' . $lang['User'] . '</option></select>';
for($i = 0; $i < count($userinf); $i++)
--- 854,858 ----
$t_username .= $userinf[0]['username'];
! $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected=\"selected\">' . $lang['Auth_Admin'] . '</option><option value="user">' . $lang['Auth_User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Auth_Admin'] . '</option><option value="user" selected=\"selected\">' . $lang['Auth_User'] . '</option></select>';
for($i = 0; $i < count($userinf); $i++)
***************
*** 907,923 ****
$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
$template->assign_vars(array(
"USERNAME" => $t_username,
! "USER_GROUP_MEMBERSHIPS" => $lang['This_user_is'] . " " . $s_user_type . " " . $lang['and_belongs_groups'] . ": " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Username'],
"L_USER_OR_GROUP" => $lang['User'],
! "L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
! "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
! "L_RESET_CHANGES" => $lang['Reset_changes'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
--- 911,930 ----
$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
+ $template->assign_block_vars("switch_user_auth", array());
+
$template->assign_vars(array(
"USERNAME" => $t_username,
! "USER_LEVEL" => $lang['User_Level'] . " : " . $s_user_type,
! "USER_GROUP_MEMBERSHIPS" => $lang['Group_memberships'] . " : " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Username'],
"L_USER_OR_GROUP" => $lang['User'],
! "L_AUTH_TITLE" => $lang['Auth_Control_User'],
"L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
***************
*** 959,966 ****
$template->assign_vars(array(
! "L_USER_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
"L_USER_EXPLAIN" => $lang['User_auth_explain'],
! "L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
"L_FIND_USERNAME" => $lang['Find_username'],
--- 966,973 ----
$template->assign_vars(array(
! "L_USER_TITLE" => $lang['Auth_Control_User'],
"L_USER_EXPLAIN" => $lang['User_auth_explain'],
! "L_USER_SELECT" => $lang['Select_a_User'],
! "L_LOOK_UP" => $lang['Look_up_User'],
"L_FIND_USERNAME" => $lang['Find_username'],
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_forumauth.php 2001/10/14 15:46:53 1.13
--- admin_forumauth.php 2001/11/19 19:06:01 1.14
***************
*** 202,209 ****
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Forum'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Forum'],
"S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
--- 202,209 ----
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a_Forum'],
! "L_LOOK_UP" => $lang['Look_up_Forum'],
"S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
***************
*** 329,336 ****
"FORUM_NAME" => $forum_name,
! "L_AUTH_TITLE" => $lang['Forum'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
! "L_RESET_CHANGES" => $lang['Reset_changes'],
"U_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
--- 329,336 ----
"FORUM_NAME" => $forum_name,
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
"U_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
Index: admin_groupauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groupauth.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_groupauth.php 2001/10/15 12:13:26 1.20
--- admin_groupauth.php 2001/11/19 19:06:01 1.21
***************
*** 456,501 ****
// Any warnings?
//
! $warning_list = "";
while( list($forum_id, $user_ary) = each($warning_mod_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
! if(!empty($valid_auth_mod_sql[$forum_id]))
{
! $warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a></b> " . $lang['has_moderator_status'] . " <b>" . $warning_mod_frmname[$forum_id][$i] . "</b><br />";
}
}
}
while( list($forum_id, $user_ary) = each($warning_prv_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
! if(!empty($valid_auth_prv_sql[$forum_id]))
{
! $warning_list .= "<b><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a></b> " . $lang['has_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b><br />";
}
}
}
! if($warning_list != "")
{
! $warning_list = "<br />" . $lang['Conflict_message_groupauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] ." <a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">" . $lang['HERE'] . "</a> " . $lang['return_group_auth_admin'] . "<br />";
!
! include('page_header_admin.'.$phpEx);
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['Conflict_warning'],
! "MESSAGE_TEXT" => $warning_list)
! );
}
else
{
! header("Location: " . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id", true));
}
--- 456,505 ----
// Any warnings?
//
! $warning_list_mod = "";
while( list($forum_id, $user_ary) = each($warning_mod_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
! echo $user_ary[$i];
! if( !empty($valid_auth_mod_sql[$forum_id]) )
{
! $warning_list_mod .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_mod_username[$forum_id][$i] . "</a> -> " . $warning_mod_frmname[$forum_id][$i];
}
}
}
+ $warning_list_acl = "";
while( list($forum_id, $user_ary) = each($warning_prv_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
! if( !empty($valid_auth_prv_sql[$forum_id]) )
{
! $warning_list_acl .= "<br /><a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=" . $user_ary[$i]) . "\">" . $warning_prv_username[$forum_id][$i] . "</a> -> " . $warning_prv_frmname[$forum_id][$i];
}
}
}
! $warning_list = "";
! if( $warning_list_mod != "" )
{
! $warning_list .= $lang['Conflict_mod_groupauth'] . "<br />" . $warning_list_mod;
! }
! if( $warning_list_acl != "" )
! {
! $warning_list .= $lang['Conflict_access_groupauth'] . "<br />" . $warning_list_acl;
! }
! if( $warning_list != "" )
! {
! $message = $warning_list . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
}
else
{
+ $message = $lang['Auth_updated'] . "<br /><br />" . sprintf($lang['Click_return_groupauth'], "<a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
}
***************
*** 734,741 ****
$row_class = ( !($i%2) ) ? "row2" : "row1";
! $row_color = "#" . ( ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'] );
$template->assign_block_vars("forums", array(
! "ROW_COLOR" => $row_color,
"ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_access[$i]['forum_name'],
--- 738,745 ----
$row_class = ( !($i%2) ) ? "row2" : "row1";
! $row_color = ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'];
$template->assign_block_vars("forums", array(
! "ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_access[$i]['forum_name'],
***************
*** 819,834 ****
$u_switch_mode = '<a href="' . append_sid($switch_mode) . '">' . $switch_mode_text . '</a>';
$template->assign_vars(array(
"USERNAME" => $t_groupname,
! "USER_GROUP_MEMBERSHIPS" => $lang['Group_has_members'] . ": " . $t_usergroup_list,
!
"L_USER_OR_GROUPNAME" => $lang['Group_name'],
! "L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
! "L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
! "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
! "L_RESET_CHANGES" => $lang['Reset_changes'],
"U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"),
--- 823,839 ----
$u_switch_mode = '<a href="' . append_sid($switch_mode) . '">' . $switch_mode_text . '</a>';
+ $template->assign_block_vars("switch_group_auth", array());
+
$template->assign_vars(array(
"USERNAME" => $t_groupname,
! "GROUP_MEMBERSHIP" => $lang['Usergroup_members'] . ": " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Group_name'],
! "L_AUTH_TITLE" => $lang['Auth_Control_Group'],
! "L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
"U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"),
***************
*** 868,875 ****
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Group'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
--- 873,880 ----
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Auth_Control_Group'],
"L_AUTH_EXPLAIN" => $lang['Group_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a_Group'],
! "L_LOOK_UP" => $lang['Look_up_Group'],
"S_AUTH_ACTION" => append_sid("admin_groupauth.$phpEx"),
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_mass_email.php 2001/11/09 08:57:37 1.7
--- admin_mass_email.php 2001/11/19 19:06:01 1.8
***************
*** 40,61 ****
require('pagestart.inc');
-
- //
- // Set VERBOSE to 1 for debugging info..
//
- if(DEBUG)
- {
- define("VERBOSE", 1);
- }
- else
- {
- define("VERBOSE", 0);
- }
-
- //
// Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
// allowed.
//
! @set_time_limit(600);
//
--- 40,48 ----
require('pagestart.inc');
//
// Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
// allowed.
//
! @set_time_limit(1200);
//
***************
*** 65,123 ****
$f_msg = 'e_msg';
! if(isset($HTTP_POST_VARS['submit']))
{
! $group_id = $HTTP_POST_VARS[POST_GROUPS_URL];
! if($group_id != -1)
{
! $sql = 'SELECT u.user_email
! FROM '.USERS_TABLE.' u, '.USER_GROUP_TABLE.' g
! WHERE u.user_id = g.user_id AND g.group_id = '.$group_id;
}
else
{
! $sql = 'SELECT user_email FROM '.USERS_TABLE;
}
! if(!$g_result = $db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
}
! $g_list = $db->sql_fetchrowset($g_result);
! $email_headers = "From: " . $board_config['board_email'] . "\r\n";
! $msg = stripslashes($HTTP_POST_VARS["$f_msg"]);
! $email_headers .= 'bcc: ';
! for($i = 0;$i < count($g_list); $i++)
{
! if($i != 0)
{
! $email_headers.= ' ,';
}
! $email_headers .= $g_list[$i]['user_email'];
}
! mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
! $notice = $lang['Messages'].' '.$lang['Sent'].'!';
}
! //Else, or if they already sent a message
! $sql = "SELECT group_id, group_name FROM ".GROUPS_TABLE.' WHERE group_single_user <> 1';
$g_result = $db->sql_query($sql);
$group_list = $db->sql_fetchrowset($g_result);
! $select_list = '<SELECT name = "'.POST_GROUPS_URL.'">';
! $select_list .= '<OPTION value = "-1">'.$lang['All'].'</OPTION>';
for($i = 0;$i < count($group_list); $i++)
{
! $select_list .= "<OPTION value = \"".$group_list[$i]['group_id'];
! $select_list .= "\">".$group_list[$i]['group_name']."</OPTION>";
}
! $select_list .= "</SELECT>";
include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
! "body" => "admin/user_email.tpl")
);
--- 52,153 ----
$f_msg = 'e_msg';
! if( isset($HTTP_POST_VARS['submit']) )
{
! $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
!
! if( $group_id != -1 )
{
! $sql = "SELECT u.user_email
! FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " g
! WHERE u.user_id = g.user_id
! AND g.group_id = $group_id";
}
else
{
! $sql = "SELECT user_email
! FROM " . USERS_TABLE;
}
!
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
}
! $email_list = $db->sql_fetchrowset($g_result);
! $subject = stripslashes($HTTP_POST_VARS["$f_title"]);
! $message = stripslashes($HTTP_POST_VARS["$f_msg"]);
! include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! $emailer = new emailer($board_config['smtp_delivery']);
!
! $email_headers = "From: " . $board_config['board_email'] . "\n";
!
! $bcc_list = "";
! for($i = 0; $i < count($email_list); $i++)
{
! if( $bcc_list != "" )
{
! $bcc_list .= ", ";
}
! $bcc_list .= $email_list[$i]['user_email'];
}
+ $email_headers .= "Bcc: $bcc_list\n";
! $email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
! $email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
! $email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! $email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! $email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
!
! $emailer->use_template("admin_send_email");
! $emailer->email_address($board_config['board_email']);
! $emailer->set_subject($subject);
! $emailer->extra_headers($email_headers);
!
! $emailer->assign_vars(array(
! "SITENAME" => $board_config['sitename'],
! "BOARD_EMAIL" => $board_config['board_email'],
! "MESSAGE" => $message)
! );
! $emailer->send();
! $emailer->reset();
!
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
! );
!
! $message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
!
}
!
! //
! // Initial selection
! //
! $sql = "SELECT group_id, group_name
! FROM ".GROUPS_TABLE . "
! WHERE group_single_user <> 1";
$g_result = $db->sql_query($sql);
$group_list = $db->sql_fetchrowset($g_result);
! $select_list = '<select name = "' . POST_GROUPS_URL . '">';
! $select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
for($i = 0;$i < count($group_list); $i++)
{
! $select_list .= "<option value = \"" . $group_list[$i]['group_id'];
! $select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
}
! $select_list .= "</select>";
+ //
+ // Generate page
+ //
include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
! "body" => "admin/user_email_body.tpl")
);
***************
*** 126,130 ****
"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
"L_COMPOSE" => $lang['Compose'],
! "L_GROUP_SELECT" => $lang['Group'],
"L_EMAIL_SUBJECT" => $lang['Subject'],
"L_EMAIL_MSG" => $lang['Message'],
--- 156,160 ----
"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
"L_COMPOSE" => $lang['Compose'],
! "L_RECIPIENTS" => $lang['Recipients'],
"L_EMAIL_SUBJECT" => $lang['Subject'],
"L_EMAIL_MSG" => $lang['Message'],
***************
*** 141,143 ****
--- 171,174 ----
include('page_footer_admin.'.$phpEx);
+
?>
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** index.php 2001/11/03 22:39:37 1.23
--- index.php 2001/11/19 19:06:01 1.24
***************
*** 58,62 ****
"U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"),
! "L_FORUM_INDEX" => $lang['Forum_Index'],
"L_ADMIN_INDEX" => $lang['Admin_Index'],
"L_PREVIEW_FORUM" => $lang['Preview_forum'])
--- 58,62 ----
"U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"),
! "L_FORUM_INDEX" => $lang['Main_index'],
"L_ADMIN_INDEX" => $lang['Admin_Index'],
"L_PREVIEW_FORUM" => $lang['Preview_forum'])
|
