Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 16:00:07
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv16947/templates/subSilver
Modified Files:
overall_header.tpl
Log Message:
PM popup and icon are finally in place
Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/overall_header.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** overall_header.tpl 2001/11/21 15:56:12 1.8
--- overall_header.tpl 2001/11/21 16:00:04 1.9
***************
*** 209,213 ****
if( new_pm_flag )
{
! window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=200,resizable=yes,WIDTH=400');;
}
//-->
--- 209,213 ----
if( new_pm_flag )
{
! window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');;
}
//-->
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 16:00:07
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv16947/includes
Modified Files:
page_header.php
Log Message:
PM popup and icon are finally in place
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** page_header.php 2001/11/21 15:56:12 1.69
--- page_header.php 2001/11/21 16:00:04 1.70
***************
*** 348,359 ****
$template->assign_block_vars("switch_user_logged_out", array());
- if( $userdata['user_popup_pm'] )
- {
- $template->assign_block_vars("switch_enable_pm_popup", array());
- }
}
else
{
$template->assign_block_vars("switch_user_logged_in", array());
}
--- 348,361 ----
$template->assign_block_vars("switch_user_logged_out", array());
}
else
{
$template->assign_block_vars("switch_user_logged_in", array());
+
+ if( $userdata['user_popup_pm'] )
+ {
+ $template->assign_block_vars("switch_enable_pm_popup", array());
+ }
+
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 15:56:16
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv15794
Modified Files:
privmsg.php
Log Message:
PM popup and icon are finally in place
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** privmsg.php 2001/11/19 23:56:00 1.52
--- privmsg.php 2001/11/21 15:56:12 1.53
***************
*** 119,124 ****
// Start main
//
! if( $mode == "read" )
{
if( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
--- 119,163 ----
// Start main
//
! if( $mode == "newpm" )
{
+ $gen_simple_header = TRUE;
+
+ $page_title = $lang['Private_Messaging'];
+ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+ $template->set_filenames(array(
+ "body" => "privmsgs_popup.tpl")
+ );
+
+ if( $userdata['session_logged_in'] )
+ {
+ if( $userdata['user_new_privmsg'] )
+ {
+ $l_new_message = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['You_new_pm'] : $lang['You_new_pms'];
+ }
+ else
+ {
+ $l_new_message = $lang['You_no_new_pm'];
+ }
+
+ $l_new_message .= "<br /><br />" . sprintf($lang['Click_view_privmsg'], "<a href=\"" . append_sid("privmsg.".$phpEx."?folder=inbox") . "\" onClick=\"jump_to_inbox();return false;\" target=\"_new\">", "</a>");
+ }
+ else
+ {
+ $l_new_message = $lang['Login_check_pm'];
+ }
+
+ $template->assign_vars(array(
+ "L_CLOSE_WINDOW" => $lang['Close_window'],
+ "L_MESSAGE" => $l_new_message)
+ );
+
+ $template->pparse("body");
+
+ include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+
+ }
+ else if( $mode == "read" )
+ {
if( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
***************
*** 932,936 ****
if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql);
}
--- 971,975 ----
if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_MESSAGE, $lang['No_such_user']);
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 15:56:16
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv15794/templates/subSilver
Modified Files:
subSilver.cfg overall_header.tpl
Added Files:
privmsgs_popup.tpl
Log Message:
PM popup and icon are finally in place
--- NEW FILE ---
<script language="javascript" type="text/javascript">
<!--
function jump_to_inbox()
{
opener.document.location.href = "{U_PRIVATEMSGS}";
window.close();
}
//-->
</script>
<table width="100%" border="0" cellspacing="0" cellpadding="10">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
<tr>
<td valign="top" class="row1" align="center"><br /><span class="gen">{L_MESSAGE}</span><br /><br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
</tr>
</table>
</td>
</tr>
</table>
Index: subSilver.cfg
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/subSilver.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** subSilver.cfg 2001/11/04 14:11:25 1.4
--- subSilver.cfg 2001/11/21 15:56:12 1.5
***************
*** 72,75 ****
--- 72,77 ----
$images['pm_quotemsg'] = "templates/subSilver/images/icon_quote.gif";
$images['pm_editmsg'] = "templates/subSilver/images/icon_edit.gif";
+ $images['pm_new_msg'] = "";
+ $images['pm_no_new_msg'] = "";
$images['topic_watch'] = "";
Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/overall_header.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** overall_header.tpl 2001/11/03 15:15:05 1.7
--- overall_header.tpl 2001/11/21 15:56:12 1.8
***************
*** 5,9 ****
<html>
<head>
! <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
{META}
--- 5,9 ----
<html>
<head>
! <meta http-equiv="Content-Type" content="text/html" />
<meta http-equiv="Content-Style-Type" content="text/css" />
{META}
***************
*** 202,205 ****
--- 202,217 ----
-->
</style>
+ <!-- BEGIN switch_enable_pm_popup -->
+ <script language="Javascript" type="text/javascript">
+ <!--
+ var new_pm_flag = {PRIVATE_MESSAGE_NEW_FLAG};
+
+ if( new_pm_flag )
+ {
+ window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=200,resizable=yes,WIDTH=400');;
+ }
+ //-->
+ </script>
+ <!-- END switch_enable_pm_popup -->
</head>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 15:56:16
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv15794/includes
Modified Files:
page_header.php
Log Message:
PM popup and icon are finally in place
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** page_header.php 2001/11/21 13:02:37 1.68
--- page_header.php 2001/11/21 15:56:12 1.69
***************
*** 174,181 ****
--- 174,183 ----
$s_privmsg_new = true;
+ $icon_pm = $images['pm_new_msg'];
}
else
{
$s_privmsg_new = 0;
+ $icon_pm = $images['pm_no_new_msg'];
}
}
***************
*** 185,188 ****
--- 187,191 ----
$s_privmsg_new = 0;
+ $icon_pm = $images['pm_no_new_msg'];
}
***************
*** 220,223 ****
--- 223,241 ----
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
+ "PRIVMSG_IMG" => $icon_pm,
+ "FORUM_IMG" => $images['forum'],
+ "FORUM_NEW_IMG" => $images['forum_new'],
+ "FORUM_LOCKED_IMG" => $images['forum_locked'],
+ "FOLDER_IMG" => $images['folder'],
+ "FOLDER_NEW_IMG" => $images['folder_new'],
+ "FOLDER_HOT_IMG" => $images['folder_hot'],
+ "FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
+ "FOLDER_LOCKED_IMG" => $images['folder_locked'],
+ "FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
+ "FOLDER_STICKY_IMG" => $images['folder_sticky'],
+ "FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
+ "FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
+ "FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
+
"L_USERNAME" => $lang['Username'],
"L_PASSWORD" => $lang['Password'],
***************
*** 261,265 ****
"U_REGISTER" => append_sid("profile.".$phpEx."?mode=register"),
"U_PROFILE" => append_sid("profile.".$phpEx."?mode=editprofile"),
! "U_PRIVATEMSGS" => append_sid("privmsg.".$phpEx."?folder=inbox"),
"U_SEARCH" => append_sid("search.".$phpEx),
"U_MEMBERLIST" => append_sid("memberlist.".$phpEx),
--- 279,284 ----
"U_REGISTER" => append_sid("profile.".$phpEx."?mode=register"),
"U_PROFILE" => append_sid("profile.".$phpEx."?mode=editprofile"),
! "U_PRIVATEMSGS" => append_sid("privmsg.".$phpEx."?folder=inbox"),
! "U_PRIVATEMSGS_POPUP" => append_sid("privmsg.".$phpEx."?mode=newpm"),
"U_SEARCH" => append_sid("search.".$phpEx),
"U_MEMBERLIST" => append_sid("memberlist.".$phpEx),
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 15:56:16
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv15794/language/lang_english Modified Files: lang_main.php Log Message: PM popup and icon are finally in place Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -r1.48 -r1.49 *** lang_main.php 2001/11/21 13:02:36 1.48 --- lang_main.php 2001/11/21 15:56:12 1.49 *************** *** 364,367 **** --- 364,370 ---- $lang['Unread_pm'] = "You have %d unread message"; $lang['No_unread_pm'] = "You have no unread messages"; + $lang['You_new_pm'] = "A new private message is waiting for you in your Inbox"; + $lang['You_new_pms'] = "New private messages are waiting for you in your Inbox"; + $lang['You_no_new_pm'] = "No new private messages are waiting for you"; $lang['Inbox'] = "Inbox"; *************** *** 421,424 **** --- 424,428 ---- $lang['Savebox_size'] = "Your Savebox is %d%% full"; + $lang['Click_view_privmsg'] = "Click %sHere%s to visit your Inbox"; // |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:07:00
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO/images In directory usw-pr-cvs1:/tmp/cvs-serv2438/templates/PSO/images Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:07:00
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin In directory usw-pr-cvs1:/tmp/cvs-serv2438/templates/PSO/admin Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:07:00
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO In directory usw-pr-cvs1:/tmp/cvs-serv2438/templates/PSO Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:07:00
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv2438/language/lang_english Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:07:00
|
Update of /cvsroot/phpbb/phpBB2/language In directory usw-pr-cvs1:/tmp/cvs-serv2438/language Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:59
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english/email In directory usw-pr-cvs1:/tmp/cvs-serv2438/language/lang_english/email Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:59
|
Update of /cvsroot/phpbb/phpBB2/templates In directory usw-pr-cvs1:/tmp/cvs-serv2438/templates Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:59
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv2438/includes Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:58
|
Update of /cvsroot/phpbb/phpBB2/images In directory usw-pr-cvs1:/tmp/cvs-serv2438/images Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:58
|
Update of /cvsroot/phpbb/phpBB2/db/schemas In directory usw-pr-cvs1:/tmp/cvs-serv2438/db/schemas Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:06:57
|
Update of /cvsroot/phpbb/phpBB2/db In directory usw-pr-cvs1:/tmp/cvs-serv2438/db Added Files: index.htm Log Message: Add blank indexes to stop nosey people being, erm, nosey --- NEW FILE --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1499/templates/subSilver/admin
Modified Files:
user_edit_body.tpl
Log Message:
Added pop-up control for PM's to profile
Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_edit_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** user_edit_body.tpl 2001/11/21 03:10:10 1.5
--- user_edit_body.tpl 2001/11/21 13:02:36 1.6
***************
*** 4,7 ****
--- 4,9 ----
<p>{L_USER_EXPLAIN}</p>
+ {ERROR_BOX}
+
<form action="{S_PROFILE_ACTION}" method="post"><table width="98%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
***************
*** 133,136 ****
--- 135,146 ----
<span class="gen">{L_YES}</span>
<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} />
+ <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_POPUP_ON_PRIVMSG}:</span></td>
+ <td class="row2">
+ <input type="radio" name="popup_pm" value="1" {POPUP_PM_YES} />
+ <span class="gen">{L_YES}</span>
+ <input type="radio" name="popup_pm" value="0" {POPUP_PM_NO} />
<span class="gen">{L_NO}</span></td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv1499/includes
Modified Files:
page_header.php
Log Message:
Added pop-up control for PM's to profile
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** page_header.php 2001/11/20 02:24:41 1.67
--- page_header.php 2001/11/21 13:02:37 1.68
***************
*** 328,331 ****
--- 328,336 ----
{
$template->assign_block_vars("switch_user_logged_out", array());
+
+ if( $userdata['user_popup_pm'] )
+ {
+ $template->assign_block_vars("switch_enable_pm_popup", array());
+ }
}
else
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv1499 Modified Files: profile.php Log Message: Added pop-up control for PM's to profile Index: profile.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/profile.php,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -r1.137 -r1.138 *** profile.php 2001/11/19 23:56:00 1.137 --- profile.php 2001/11/21 13:02:36 1.138 *************** *** 499,502 **** --- 499,503 ---- $notifyreply = (isset($HTTP_POST_VARS['notifyreply'])) ? ( ($HTTP_POST_VARS['notifyreply']) ? TRUE : 0 ) : 0; $notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? ( ($HTTP_POST_VARS['notifypm']) ? TRUE : 0 ) : TRUE; + $popuppm = (isset($HTTP_POST_VARS['popup_pm'])) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE; $attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : 0; *************** *** 983,987 **** $sql = "UPDATE " . USERS_TABLE . " ! SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_style = $user_style, user_active = $user_active, user_actkey = '$user_actkey'" . $avatar_sql . " WHERE user_id = $user_id"; --- 984,988 ---- $sql = "UPDATE " . USERS_TABLE . " ! SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_style = $user_style, user_active = $user_active, user_actkey = '$user_actkey'" . $avatar_sql . " WHERE user_id = $user_id"; *************** *** 1056,1061 **** // Get current date // ! $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) ! VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, "; if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1) --- 1057,1062 ---- // Get current date // ! $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) ! VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, "; if( $board_config['require_activation'] ==USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa == 1) *************** *** 1239,1242 **** --- 1240,1244 ---- $viewemail = $userdata['user_viewemail']; $notifypm = $userdata['user_notify_pm']; + $popuppm = $userdata['user_popup_pm']; $notifyreply = $userdata['user_notify']; $attachsig = $userdata['user_attachsig']; *************** *** 1375,1378 **** --- 1377,1381 ---- $s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />'; $s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />'; + $s_hidden_vars .= '<input type="hidden" name="popup_pm" value="' . $popuppm . '" />'; $s_hidden_vars .= '<input type="hidden" name="notifyreply" value="' . $notifyreply . '" />'; $s_hidden_vars .= '<input type="hidden" name="attachsig" value="' . $attachsig . '" />'; *************** *** 1515,1518 **** --- 1518,1523 ---- "NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "", "NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "", + "POPUP_PM_YES" => ($popuppm) ? "checked=\"checked\"" : "", + "POPUP_PM_NO" => (!$popuppm) ? "checked=\"checked\"" : "", "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "", "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "", *************** *** 1581,1584 **** --- 1586,1591 ---- "L_NOTIFY_ON_REPLY_EXPLAIN" => $lang['Always_notify_explain'], "L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'], + "L_POPUP_ON_PRIVMSG" => $lang['Popup_on_privmsg'], + "L_POPUP_ON_PRIVMSG_EXPLAIN" => $lang['Popup_on_privmsg_explain'], "L_PREFERENCES" => $lang['Preferences'], "L_PUBLIC_VIEW_EMAIL" => $lang['Public_view_email'], |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv1499/language/lang_english Modified Files: lang_main.php Log Message: Added pop-up control for PM's to profile Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -r1.47 -r1.48 *** lang_main.php 2001/11/20 00:12:27 1.47 --- lang_main.php 2001/11/21 13:02:36 1.48 *************** *** 504,508 **** $lang['Current_Image'] = "Current Image"; ! $lang['Notify_on_privmsg'] = "Notify on Private Message"; $lang['Hide_user'] = "Hide your online status"; --- 504,510 ---- $lang['Current_Image'] = "Current Image"; ! $lang['Notify_on_privmsg'] = "Notify on new Private Message"; ! $lang['Popup_on_privmsg'] = "Pop up window on new Private Message"; ! $lang['Popup_on_privmsg_explain'] = "Some templates may open a new window to inform you when new private messages arrive"; $lang['Hide_user'] = "Hide your online status"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1499/admin
Modified Files:
admin_users.php
Log Message:
Added pop-up control for PM's to profile
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** admin_users.php 2001/11/21 03:10:10 1.31
--- admin_users.php 2001/11/21 13:02:36 1.32
***************
*** 31,44 ****
//
// Load default header
- // We need to tell the pagestart file not to load page headers
- // because of the use of META tags.
//
-
$phpbb_root_dir = "./../";
! $no_page_header = TRUE;
require('pagestart.inc');
include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
include($phpbb_root_dir . 'includes/post.'.$phpEx);
if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
--- 31,44 ----
//
// Load default header
//
$phpbb_root_dir = "./../";
!
require('pagestart.inc');
include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
include($phpbb_root_dir . 'includes/post.'.$phpEx);
+ //
+ //
+ //
if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
***************
*** 128,198 ****
// Begin program
//
! if( $mode == "searchuser" )
! {
! //
! // Remove this later
! //
! exit;
! }
! else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
{
! include('page_header_admin.' . $phpEx);
//
! // Let's find out a little about them...
//
! if( isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) )
{
! $user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! $this_userdata = get_userdata_from_id($user_id);
! }
! else
! {
! $this_userdata = get_userdata($HTTP_POST_VARS['username']);
}
//
! // Now parse and display it as a template
//
! $user_id = $this_userdata['user_id'];
! $username = $this_userdata['username'];
! $email = $this_userdata['user_email'];
! $password = "";
! $password_confirm = "";
!
! $icq = $this_userdata['user_icq'];
! $aim = $this_userdata['user_aim'];
! $msn = $this_userdata['user_msnm'];
! $yim = $this_userdata['user_yim'];
!
! $website = $this_userdata['user_website'];
! $location = $this_userdata['user_from'];
! $occupation = $this_userdata['user_occ'];
! $interests = $this_userdata['user_interests'];
! $signature = $this_userdata['user_sig'];
!
! $viewemail = $this_userdata['user_viewemail'];
! $notifypm = $this_userdata['user_notify_pm'];
! $attachsig = $this_userdata['user_attachsig'];
! $allowhtml = $this_userdata['user_allowhtml'];
! $allowbbcode = $this_userdata['user_allowbbcode'];
! $allowsmilies = $this_userdata['user_allowsmile'];
! $allowviewonline = $this_userdata['user_allow_viewonline'];
!
! $user_avatar = $this_userdata['user_avatar'];
! $user_avatar_type = $this_userdata['user_avatar_type'];
! $user_style = $this_userdata['user_style'];
! $user_lang = $this_userdata['user_lang'];
! $user_timezone = $this_userdata['user_timezone'];
! $user_dateformat = $this_userdata['user_dateformat'];
!
! $user_status = $this_userdata['user_active'];
! $user_allowavatar = $this_userdata['user_allowavatar'];
! $user_allowpm = $this_userdata['user_allow_pm'];
!
! $COPPA = false;
! $html_status = ($userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
! $bbcode_status = ($userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
! $smilies_status = ($userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
--- 128,391 ----
// Begin program
//
! if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
{
!
//
! // Ok, the profile has been modified and submitted, let's update
//
! if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
{
! $user_id = intval($HTTP_POST_VARS['id']);
!
! $username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
! $email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
!
! $password = (!empty($HTTP_POST_VARS['password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password']))) : "";
! $password_confirm = (!empty($HTTP_POST_VARS['password_confirm'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password_confirm']))) : "";
!
! $icq = (!empty($HTTP_POST_VARS['icq'])) ? trim(strip_tags($HTTP_POST_VARS['icq'])) : "";
! $aim = (!empty($HTTP_POST_VARS['aim'])) ? trim(strip_tags($HTTP_POST_VARS['aim'])) : "";
! $msn = (!empty($HTTP_POST_VARS['msn'])) ? trim(strip_tags($HTTP_POST_VARS['msn'])) : "";
! $yim = (!empty($HTTP_POST_VARS['yim'])) ? trim(strip_tags($HTTP_POST_VARS['yim'])) : "";
!
! $website = (!empty($HTTP_POST_VARS['website'])) ? trim(strip_tags($HTTP_POST_VARS['website'])) : "";
! $location = (!empty($HTTP_POST_VARS['location'])) ? trim(strip_tags($HTTP_POST_VARS['location'])) : "";
! $occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
! $interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : "";
!
! validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
!
! $viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? intval($HTTP_POST_VARS['viewemail']) : 0;
! $allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : 1 ) : 1;
! $notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? intval($HTTP_POST_VARS['notifypm']) : 1;
! $popuppm = (isset($HTTP_POST_VARS['popup_pm'])) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE;
! $attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? intval($HTTP_POST_VARS['attachsig']) : 0;
!
! $allowhtml = (isset($HTTP_POST_VARS['allowhtml'])) ? intval($HTTP_POST_VARS['allowhtml']) : $board_config['allow_html'];
! $allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? intval($HTTP_POST_VARS['allowbbcode']) : $board_config['allow_bbcode'];
! $allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? intval($HTTP_POST_VARS['allowsmilies']) : $board_config['allow_smilies'];
!
! $user_style = ($HTTP_POST_VARS['style']) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
! $user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
! $user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
! $user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
! $user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
!
! $user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
! $user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
! $user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! $user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
!
! if( isset($HTTP_POST_VARS['submit']) )
! {
! $error = FALSE;
! $passwd_sql = "";
! }
! else
! {
! $error = TRUE;
! $passwd_sql = "";
! }
!
! if( !empty($password) && !empty($password_confirm) )
! {
! // Awww, the user wants to change their password, isn't that cute..
! if($password != $password_confirm)
! {
! $error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
! }
! else
! {
! $password = md5($password);
! $passwd_sql = "user_password = '$password', ";
! }
! }
! else if( $password && !$password_confirm )
! {
! $error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
! }
! else if( !$password && $password_confirm )
! {
! $error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
! }
!
! if( $signature != "" )
! {
! $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
! $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
! }
!
! if( isset($HTTP_POST_VARS['avatardel']) )
! {
! if( $user_avatar_type == USER_AVATAR_UPLOAD )
! {
! if( @file_exists("./../" . $board_config['avatar_path'] . "/" . $user_avatar) )
! {
! @unlink("./../" . $board_config['avatar_path'] . "/" . $user_avatar);
! }
! }
! $avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
! }
!
! if( !$error )
! {
! if( $HTTP_POST_VARS['deleteuser'] )
! {
! $sql = "UPDATE " . POSTS_TABLE . "
! SET poster_id = '-1', post_username = '$username'
! WHERE poster_id = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_poster = '-1'
! WHERE topic_poster = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . USER_GROUP_TABLE . "
! WHERE user_id = $user_id";
! $result = @$db->sql_query($sql);
!
! $message = $lang['User_deleted'];
! }
! else
! {
! $error = TRUE;
! }
! }
! else
! {
! $error = TRUE;
! }
! }
! else
! {
! $error = TRUE;
! }
!
! if( $error == TRUE )
! {
! $error_msg .= $lang['Admin_user_fail'];
! }
! }
! else
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
! WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $message .= $lang['Admin_user_updated'];
! }
! else
! {
! $error = TRUE;
! $error_msg .= $lang['Admin_user_fail'];
! }
! }
!
! $message .= "<br /><br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . append_sid("admin_users.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
! }
! else
! {
! $template->set_filenames(array(
! "reg_header" => "error_body.tpl")
! );
! $template->assign_vars(array(
! "ERROR_MESSAGE" => $error_msg)
! );
! $template->assign_var_from_handle("ERROR_BOX", "reg_header");
!
! $username = stripslashes($username);
! $email = stripslashes($email);
! $password = "";
! $password_confirm = "";
!
! $icq = stripslashes($icq);
! $aim = stripslashes($aim);
! $msn = stripslashes($msn);
! $yim = stripslashes($yim);
!
! $website = stripslashes($website);
! $location = stripslashes($location);
! $occupation = stripslashes($occupation);
! $interests = stripslashes($interests);
! $signature = stripslashes($signature);
!
! $user_lang = stripslashes($user_lang);
! $user_dateformat = stripslashes($user_dateformat);
! }
}
//
! // Let's find out a little about them...
//
! if( !isset($HTTP_POST_VARS['submit']) && $mode != "save" )
! {
! if( isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) )
! {
! $user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! $this_userdata = get_userdata_from_id($user_id);
! }
! else
! {
! $this_userdata = get_userdata($HTTP_POST_VARS['username']);
! }
!
! //
! // Now parse and display it as a template
! //
! $user_id = $this_userdata['user_id'];
! $username = $this_userdata['username'];
! $email = $this_userdata['user_email'];
! $password = "";
! $password_confirm = "";
!
! $icq = $this_userdata['user_icq'];
! $aim = $this_userdata['user_aim'];
! $msn = $this_userdata['user_msnm'];
! $yim = $this_userdata['user_yim'];
!
! $website = $this_userdata['user_website'];
! $location = $this_userdata['user_from'];
! $occupation = $this_userdata['user_occ'];
! $interests = $this_userdata['user_interests'];
! $signature = $this_userdata['user_sig'];
!
! $viewemail = $this_userdata['user_viewemail'];
! $notifypm = $this_userdata['user_notify_pm'];
! $popuppm = $userdata['user_popup_pm'];
! $attachsig = $this_userdata['user_attachsig'];
! $allowhtml = $this_userdata['user_allowhtml'];
! $allowbbcode = $this_userdata['user_allowbbcode'];
! $allowsmilies = $this_userdata['user_allowsmile'];
! $allowviewonline = $this_userdata['user_allow_viewonline'];
!
! $user_avatar = $this_userdata['user_avatar'];
! $user_avatar_type = $this_userdata['user_avatar_type'];
! $user_style = $this_userdata['user_style'];
! $user_lang = $this_userdata['user_lang'];
! $user_timezone = $this_userdata['user_timezone'];
! $user_dateformat = $this_userdata['user_dateformat'];
!
! $user_status = $this_userdata['user_active'];
! $user_allowavatar = $this_userdata['user_allowavatar'];
! $user_allowpm = $this_userdata['user_allow_pm'];
!
! $COPPA = false;
! $html_status = ($this_userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
! $bbcode_status = ($this_userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
! $smilies_status = ($this_userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
! }
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
***************
*** 248,254 ****
$template->assign_vars(array(
- "L_USER_TITLE" => $lang['User'] . " " . $lang['User_admin'],
- "L_USER_EXPLAIN" => $lang['User_admin_explain'],
-
"USERNAME" => $username,
"EMAIL" => $email,
--- 441,444 ----
***************
*** 268,271 ****
--- 458,463 ----
"NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "",
"NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "",
+ "POPUP_PM_YES" => ($popuppm) ? "checked=\"checked\"" : "",
+ "POPUP_PM_NO" => (!$popuppm) ? "checked=\"checked\"" : "",
"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "",
"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "",
***************
*** 289,292 ****
--- 481,486 ----
"RANK_SELECT_BOX" => $rank_select_box,
+ "L_USER_TITLE" => $lang['User_admin'],
+ "L_USER_EXPLAIN" => $lang['User_admin_explain'],
"L_PASSWORD_IF_CHANGED" => $lang['password_if_changed'],
"L_PASSWORD_CONFIRM_IF_CHANGED" => $lang['password_confirm_if_changed'],
***************
*** 328,331 ****
--- 522,526 ----
"L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
+ "L_POPUP_ON_PRIVMSG" => $lang['Popup_on_privmsg'],
"L_PREFERENCES" => $lang['Preferences'],
"L_PUBLIC_VIEW_EMAIL" => $lang['Public_view_email'],
***************
*** 350,535 ****
$template->pparse("body");
- }
- else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
- {
- //
- // Ok, the profile has been modified and submitted, let's update
- //
-
- //
- // First let's declare our "Return Address"
- //
- $return_address = append_sid("admin_users." . $phpEx);
-
- $user_id = intval($HTTP_POST_VARS['id']);
-
- $username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
- $email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
-
- $password = (!empty($HTTP_POST_VARS['password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password']))) : "";
- $password_confirm = (!empty($HTTP_POST_VARS['password_confirm'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password_confirm']))) : "";
-
- $icq = (!empty($HTTP_POST_VARS['icq'])) ? trim(strip_tags($HTTP_POST_VARS['icq'])) : "";
- $aim = (!empty($HTTP_POST_VARS['aim'])) ? trim(strip_tags($HTTP_POST_VARS['aim'])) : "";
- $msn = (!empty($HTTP_POST_VARS['msn'])) ? trim(strip_tags($HTTP_POST_VARS['msn'])) : "";
- $yim = (!empty($HTTP_POST_VARS['yim'])) ? trim(strip_tags($HTTP_POST_VARS['yim'])) : "";
-
- $website = (!empty($HTTP_POST_VARS['website'])) ? trim(strip_tags($HTTP_POST_VARS['website'])) : "";
- $location = (!empty($HTTP_POST_VARS['location'])) ? trim(strip_tags($HTTP_POST_VARS['location'])) : "";
- $occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
- $interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
- $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : "";
-
- validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
-
- $viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? intval($HTTP_POST_VARS['viewemail']) : 0;
- $allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : 1 ) : 1;
- $notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? intval($HTTP_POST_VARS['notifypm']) : 1;
- $attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? intval($HTTP_POST_VARS['attachsig']) : 0;
-
- $allowhtml = (isset($HTTP_POST_VARS['allowhtml'])) ? intval($HTTP_POST_VARS['allowhtml']) : $board_config['allow_html'];
- $allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? intval($HTTP_POST_VARS['allowbbcode']) : $board_config['allow_bbcode'];
- $allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? intval($HTTP_POST_VARS['allowsmilies']) : $board_config['allow_smilies'];
-
- $user_style = ($HTTP_POST_VARS['style']) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
- $user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
- $user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
- $user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
- $user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
-
- $user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
- $user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
- $user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
- $user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
-
- if(isset($HTTP_POST_VARS['submit']))
- {
- $error = FALSE;
- $passwd_sql = "";
- }
- else
- {
- $error = TRUE;
- $passwd_sql = "";
- }
-
- if(!empty($password) && !empty($password_confirm))
- {
- // Awww, the user wants to change their password, isn't that cute..
- if($password != $password_confirm)
- {
- $error = TRUE;
- $error_msg .= $lang['Password_mismatch'];
- }
- else
- {
- $password = md5($password);
- $passwd_sql = "user_password = '$password', ";
- }
- }
- else if($password && !$password_confirm)
- {
- $error = TRUE;
- $error_msg .= $lang['Password_mismatch'];
- }
- else if(!$password && $password_confirm)
- {
- $error = TRUE;
- $error_msg .= $lang['Password_mismatch'];
- }
-
- if( $signature != "" )
- {
- $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
- $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
- }
-
- if( isset($HTTP_POST_VARS['avatardel']) )
- {
- if( $user_avatar_type == USER_AVATAR_UPLOAD )
- {
- if( file_exists("./../" . $board_config['avatar_path'] . "/" . $user_avatar) )
- {
- @unlink("./../" . $board_config['avatar_path'] . "/" . $user_avatar);
- }
- }
- $avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
- }
-
- if(!$error)
- {
- if( $HTTP_POST_VARS['deleteuser'] )
- {
- $sql = "UPDATE " . POSTS_TABLE . "
- SET poster_id = '-1', post_username = '$username'
- WHERE poster_id = $user_id";
- if( $result = $db->sql_query($sql) )
- {
- $sql = "UPDATE " . TOPICS_TABLE . "
- SET topic_poster = '-1'
- WHERE topic_poster = $user_id";
- if( $result = $db->sql_query($sql) )
- {
- $sql = "DELETE FROM " . USERS_TABLE . "
- WHERE user_id = $user_id";
- if( $result = $db->sql_query($sql) )
- {
- $sql = "DELETE FROM " . USER_GROUP_TABLE . "
- WHERE user_id = $user_id";
- $result = @$db->sql_query($sql);
- $message = $lang['User_deleted'];
- }
- else
- {
- $error = TRUE;
- }
- }
- else
- {
- $error = TRUE;
- }
- }
- else
- {
- $error = TRUE;
- }
-
- if( $error == TRUE )
- {
- $error_msg .= $lang['Admin_user_fail'];
- }
- }
- else
- {
- $sql = "UPDATE " . USERS_TABLE . "
- SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
- WHERE user_id = $user_id";
- if( $result = $db->sql_query($sql) )
- {
- $message .= $lang['Admin_user_updated'];
- }
- else
- {
- $error = TRUE;
- $error_msg .= $lang['Admin_user_fail'];
- }
- }
- $template->assign_vars(array(
- "META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
- );
- message_die(GENERAL_MESSAGE, $message . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
- }
- else
- {
- $template->assign_vars(array(
- "META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
- );
- message_die(GENERAL_ERROR, $error_msg . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
- }
}
else
{
- include('page_header_admin.' . $phpEx);
//
// Default user selection box
--- 545,552 ----
***************
*** 556,562 ****
$template->assign_vars(array(
! "L_USER_TITLE" => $lang['User'] . " " . $lang['User_admin'],
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
! "L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
"L_LOOK_UP" => $lang['Look_up_user'],
"L_FIND_USERNAME" => $lang['Find_username'],
--- 573,579 ----
$template->assign_vars(array(
! "L_USER_TITLE" => $lang['User_admin'],
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
! "L_USER_SELECT" => $lang['Select_a_User'],
"L_LOOK_UP" => $lang['Look_up_user'],
"L_FIND_USERNAME" => $lang['Find_username'],
|
|
From: Paul S. O. <ps...@us...> - 2001-11-21 13:02:40
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv1499/templates/subSilver
Modified Files:
profile_add_body.tpl
Log Message:
Added pop-up control for PM's to profile
Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_add_body.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** profile_add_body.tpl 2001/11/18 14:01:35 1.9
--- profile_add_body.tpl 2001/11/21 13:02:36 1.10
***************
*** 154,157 ****
--- 154,165 ----
</tr>
<tr>
+ <td class="row1"><span class="gen">{L_POPUP_ON_PRIVMSG}:</span><br /><span class="gensmall">{L_POPUP_ON_PRIVMSG_EXPLAIN}</span></td>
+ <td class="row2">
+ <input type="radio" name="popup_pm" value="1" {POPUP_PM_YES} />
+ <span class="gen">{L_YES}</span>
+ <input type="radio" name="popup_pm" value="0" {POPUP_PM_NO} />
+ <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
<td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
<td class="row2">
|
|
From: Doug K. <dou...@us...> - 2001-11-21 03:10:12
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22754/templates/subSilver/admin
Modified Files:
group_edit_body.tpl user_edit_body.tpl user_email_body.tpl
Log Message:
Now showing: A ton of bug fixes and a complete overhaul of my admin code...
Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_edit_body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** group_edit_body.tpl 2001/11/03 19:17:06 1.6
--- group_edit_body.tpl 2001/11/21 03:10:10 1.7
***************
*** 25,29 ****
--- 25,36 ----
<td class="row2" width="62%">{S_SELECT_MODERATORS}</td>
</tr>
+
<tr>
+ <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
+ <td class="row2" width="62%">
+ <input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN}</td>
+ </tr>
+ <!-- BEGIN group_edit -->
+ <tr>
<td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span>
<br />
***************
*** 34,42 ****
</tr>
<tr>
- <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
- <td class="row2" width="62%">
- <input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN}</td>
- </tr>
- <tr>
<td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
<td class="row2" width="62%">
--- 41,44 ----
***************
*** 44,47 ****
--- 46,50 ----
{L_GROUP_DELETE_CHECK}</td>
</tr>
+ <!-- END group_edit -->
<tr>
<td class="catBottom" colspan="2" align="center"><span class="cattitle">
Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_edit_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** user_edit_body.tpl 2001/10/15 02:58:50 1.4
--- user_edit_body.tpl 2001/11/21 03:10:10 1.5
***************
*** 98,104 ****
<span class="gensmall">{L_SIGNATURE_EXPLAIN}<br />
<br />
! {L_HTML_IS} <u>{HTML_STATUS}</u><br />
! {L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />
! {L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
<td class="row2">
<textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea>
--- 98,104 ----
<span class="gensmall">{L_SIGNATURE_EXPLAIN}<br />
<br />
! {HTML_STATUS}<br />
! {BBCODE_STATUS}<br />
! {SMILIES_STATUS}</span></td>
<td class="row2">
<textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea>
Index: user_email_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_email_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** user_email_body.tpl 2001/11/19 19:06:01 1.1
--- user_email_body.tpl 2001/11/21 03:10:10 1.2
***************
*** 14,18 ****
<tr>
<td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! <td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td>
</tr>
<tr>
--- 14,18 ----
<tr>
<td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
! <td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td>
</tr>
<tr>
|
|
From: Doug K. <dou...@us...> - 2001-11-21 03:10:12
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22754/admin
Modified Files:
admin_groups.php admin_ranks.php admin_users.php index.php
page_footer_admin.php
Log Message:
Now showing: A ton of bug fixes and a complete overhaul of my admin code...
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** admin_groups.php 2001/11/09 08:57:37 1.14
--- admin_groups.php 2001/11/21 03:10:09 1.15
***************
*** 33,36 ****
--- 33,37 ----
//
$phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
require('pagestart.inc');
***************
*** 49,52 ****
--- 50,59 ----
// Ok they are editing a group or creating a new group
//
+ include('page_header_admin.' . $phpEx);
+
+ $template->set_filenames(array(
+ "body" => "admin/group_edit_body.tpl")
+ );
+
if ( isset($HTTP_POST_VARS['edit']) )
{
***************
*** 69,72 ****
--- 76,80 ----
$mode = "editgroup";
+ $template->assign_block_vars("group_edit", array());
}
***************
*** 110,117 ****
$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
- $template->set_filenames(array(
- "body" => "admin/group_edit_body.tpl")
- );
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
--- 118,123 ----
$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
+
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
***************
*** 120,124 ****
"GROUP_DESCRIPTION" => $group_info['group_description'],
! "L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
"L_GROUP_NAME" => $lang['group_name'],
--- 126,130 ----
"GROUP_DESCRIPTION" => $group_info['group_description'],
! "L_GROUP_TITLE" => $lang['Group_administration'],
"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
"L_GROUP_NAME" => $lang['group_name'],
***************
*** 229,234 ****
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
!
! message_die(GENERAL_MESSAGE, $lang['Updated_group']);
}
else if( $mode == "newgroup" )
--- 235,246 ----
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
!
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
! );
!
! $message = $lang['Updated_group'];
! $message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
}
else if( $mode == "newgroup" )
***************
*** 251,255 ****
}
! message_die(GENERAL_MESSAGE, $lang['Added_new_group']);
}
--- 263,273 ----
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
! );
!
! $message = $lang['Added_new_group'];
! $message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
}
***************
*** 262,265 ****
--- 280,285 ----
else
{
+ include('page_header_admin.' . $phpEx);
+
$sql = "SELECT group_id, group_name
FROM " . GROUPS_TABLE . "
***************
*** 281,288 ****
$template->assign_vars(array(
! "L_GROUP_TITLE" => $lang['Group'] . " " . $lang['Admin'],
"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
! "L_GROUP_SELECT" => $lang['Select_a'] . " " . $lang['Group'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['Group'],
"L_CREATE_NEW_GROUP" => $lang['New_group'],
--- 301,308 ----
$template->assign_vars(array(
! "L_GROUP_TITLE" => $lang['Group_administration'],
"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
! "L_GROUP_SELECT" => $lang['Select_group'],
! "L_LOOK_UP" => $lang['Look_up_group'],
"L_CREATE_NEW_GROUP" => $lang['New_group'],
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin_ranks.php 2001/10/19 23:17:15 1.3
--- admin_ranks.php 2001/11/21 03:10:10 1.4
***************
*** 32,35 ****
--- 32,36 ----
//
$phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
require('pagestart.inc');
***************
*** 66,69 ****
--- 67,71 ----
// They want to add a new rank, show the form.
//
+ include('page_header_admin.' . $phpEx);
$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
***************
*** 194,198 ****
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message .= "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_ranks.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_rank_admin'];
message_die(GENERAL_MESSAGE, $message);
--- 196,200 ----
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
***************
*** 226,230 ****
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message = $lang['Rank_removed'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_ranks.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_rank_admin'];
message_die(GENERAL_MESSAGE, $message);
--- 228,233 ----
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_ranks.$phpEx") . '">')
);
! $message = $lang['Rank_removed'];
! $message .= "<br />" . sprintf($lang['return_rank_admin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
***************
*** 243,247 ****
// They didn't feel like giving us any information. Oh, too bad, we'll just display the
// list then...
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
--- 246,251 ----
// They didn't feel like giving us any information. Oh, too bad, we'll just display the
// list then...
! include('page_header_admin.' . $phpEx);
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
***************
*** 310,314 ****
// Show the default page
//
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
--- 314,319 ----
// Show the default page
//
! include('page_header_admin.' . $phpEx);
!
$template->set_filenames(array(
"body" => "admin/ranks_list_body.tpl")
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin_users.php 2001/10/16 15:44:26 1.30
--- admin_users.php 2001/11/21 03:10:10 1.31
***************
*** 31,36 ****
--- 31,40 ----
//
// Load default header
+ // We need to tell the pagestart file not to load page headers
+ // because of the use of META tags.
//
+
$phpbb_root_dir = "./../";
+ $no_page_header = TRUE;
require('pagestart.inc');
include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
***************
*** 133,136 ****
--- 137,141 ----
else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
{
+ include('page_header_admin.' . $phpEx);
//
// Let's find out a little about them...
***************
*** 187,193 ****
$COPPA = false;
! $html_status = ($board_config['allow_html']) ? $lang['ON'] : $lang['OFF'];
! $bbcode_status = ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF'];
! $smilies_status = ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF'];
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
--- 192,198 ----
$COPPA = false;
! $html_status = ($userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
! $bbcode_status = ($userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
! $smilies_status = ($userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
***************
*** 232,241 ****
$rank_id = $rank_rows[$i]['rank_id'];
! $selected = ( $this_userdata['user_rank'] == $i + 1 ) ? "selected=\"selected\"" : "";
! $rank_select_box .= "<option value=\"" . $rank_id . "\"$selected>" . $rank . "</option>";
}
$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
!
$template->set_filenames(array(
"body" => "admin/user_edit_body.tpl")
--- 237,246 ----
$rank_id = $rank_rows[$i]['rank_id'];
! $selected = ( $this_userdata['user_rank'] == $rank_id ) ? "selected=\"selected\"" : "";
! $rank_select_box .= "<option value=\"" . $rank_id . "\" " . $selected . ">" . $rank . "</option>";
}
$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
!
$template->set_filenames(array(
"body" => "admin/user_edit_body.tpl")
***************
*** 276,282 ****
"STYLE_SELECT" => style_select($user_style, 'style'),
"DATE_FORMAT" => $user_dateformat,
- "HTML_STATUS" => $html_status,
- "BBCODE_STATUS" => $bbcode_status,
- "SMILIES_STATUS" => $smilies_status,
"ALLOW_PM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "",
"ALLOW_PM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "",
--- 281,284 ----
***************
*** 324,328 ****
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'],
"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
"L_PREFERENCES" => $lang['Preferences'],
--- 326,330 ----
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
"L_PREFERENCES" => $lang['Preferences'],
***************
*** 335,341 ****
"L_EMAIL_ADDRESS" => $lang['Email_address'],
! "L_HTML_IS" => $lang['HTML'] . " " . $lang['is'],
! "L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'],
! "L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'],
"L_DELETE_USER" => $lang['User_delete'],
--- 337,343 ----
"L_EMAIL_ADDRESS" => $lang['Email_address'],
! "HTML_STATUS" => $html_status,
! "BBCODE_STATUS" => $bbcode_status,
! "SMILIES_STATUS" => $smilies_status,
"L_DELETE_USER" => $lang['User_delete'],
***************
*** 354,357 ****
--- 356,365 ----
// Ok, the profile has been modified and submitted, let's update
//
+
+ //
+ // First let's declare our "Return Address"
+ //
+ $return_address = append_sid("admin_users." . $phpEx);
+
$user_id = intval($HTTP_POST_VARS['id']);
***************
*** 400,403 ****
--- 408,416 ----
$passwd_sql = "";
}
+ else
+ {
+ $error = TRUE;
+ $passwd_sql = "";
+ }
if(!empty($password) && !empty($password_confirm))
***************
*** 407,411 ****
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
else
--- 420,424 ----
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
else
***************
*** 418,427 ****
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
else if(!$password && $password_confirm)
{
$error = TRUE;
! $error_msg = $lang['Password_mismatch'];
}
--- 431,440 ----
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
else if(!$password && $password_confirm)
{
$error = TRUE;
! $error_msg .= $lang['Password_mismatch'];
}
***************
*** 466,478 ****
$result = @$db->sql_query($sql);
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
!
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! "MESSAGE_TEXT" => $lang['User_deleted'])
! );
! $template->pparse("body");
}
else
--- 479,483 ----
$result = @$db->sql_query($sql);
! $message = $lang['User_deleted'];
}
else
***************
*** 493,505 ****
if( $error == TRUE )
{
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
!
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! "MESSAGE_TEXT" => "Could not update user table")
! );
! $template->pparse("body");
}
}
--- 498,502 ----
if( $error == TRUE )
{
! $error_msg .= $lang['Admin_user_fail'];
}
}
***************
*** 511,553 ****
if( $result = $db->sql_query($sql) )
{
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
!
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! "MESSAGE_TEXT" => $lang['Profile_updated'])
! );
! $template->pparse("body");
}
else
{
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
!
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! "MESSAGE_TEXT" => "Error updating user profile")
! );
! $template->pparse("body");
}
}
}
else
{
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
-
$template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! "MESSAGE_TEXT" => $error_msg)
);
! $template->pparse("body");
}
}
else
{
//
// Default user selection box
--- 508,535 ----
if( $result = $db->sql_query($sql) )
{
! $message .= $lang['Admin_user_updated'];
}
else
{
! $error = TRUE;
! $error_msg .= $lang['Admin_user_fail'];
}
}
+ $template->assign_vars(array(
+ "META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
+ );
+ message_die(GENERAL_MESSAGE, $message . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
}
else
{
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . $return_address . '">')
);
! message_die(GENERAL_ERROR, $error_msg . "<br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . $return_address . "\">", "</a>"), $lang['User_admin']);
}
}
else
{
+ include('page_header_admin.' . $phpEx);
//
// Default user selection box
***************
*** 577,581 ****
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
! "L_LOOK_UP" => $lang['Look_up'] . " " . $lang['User'],
"L_FIND_USERNAME" => $lang['Find_username'],
--- 559,563 ----
"L_USER_EXPLAIN" => $lang['User_admin_explain'],
"L_USER_SELECT" => $lang['Select_a'] . " " . $lang['User'],
! "L_LOOK_UP" => $lang['Look_up_user'],
"L_FIND_USERNAME" => $lang['Find_username'],
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** index.php 2001/11/19 19:06:01 1.24
--- index.php 2001/11/21 03:10:10 1.25
***************
*** 399,403 ****
"LOCATION" => $location,
"IP_ADDRESS" => $ip_address,
! "U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id']))
);
}
--- 399,403 ----
"LOCATION" => $location,
"IP_ADDRESS" => $ip_address,
! "U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id'] . "&mode=edit"))
);
}
Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_footer_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** page_footer_admin.php 2001/10/14 15:46:53 1.5
--- page_footer_admin.php 2001/11/21 03:10:10 1.6
***************
*** 31,35 ****
$template->assign_vars(array(
! "PHPBB_VERSION" => "2.0 beta-1")
);
--- 31,35 ----
$template->assign_vars(array(
! "PHPBB_VERSION" => "2.0 CVS")
);
|
7 messages has been excluded from this view by a project administrator.
