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-20 02:21:24
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6185
Added Files:
board_config_body.tpl styles_addnew_body.tpl
styles_edit_body.tpl styles_exporter.tpl styles_list_body.tpl
Log Message:
Loads'a updates, thanks mainly to 'The Black Pit', everyone buy him something nice ... or just send money to 'Black Pit', c/o P. Owen, London ...
--- NEW FILE ---
<br clear="all" />
<h1>{L_CONFIGURATION_TITLE}</h1>
<p>{L_CONFIGURATION_EXPLAIN}</p>
<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center">
<tr>
<td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_SITE_NAME}:</span></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_ACCT_ACTIVATION}:</span></td>
<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
</tr>
<tr>
<td class="row1"><span class="gen">Flood Interval:</span><br /><span class="gensmall">Number of seconds a user must wait between posts</span></td>
<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Topics Per Page:</span></td>
<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Posts Per Page:</span></td>
<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Hot Threshold:</span></td>
<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Default Style:</span></td>
<td class="row2">{STYLE_SELECT}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Override user style:</span><br /><span class="gensmall">Replaces users style with the default</span></td>
<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES} <input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Default Language:</span></td>
<td class="row2">{LANG_SELECT}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Date Format:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">System Timezone:</span></td>
<td class="row2">{TIMEZONE_SELECT}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Enable GZip Compression:</span></td>
<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES} <input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Enable Forum Pruning:</span></td>
<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES} <input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow HTML:</span></td>
<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow BBCode:</span></td>
<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow Smilies:</span></td>
<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES} <input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Smilies Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td>
<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow Signatures:</span></td>
<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES} <input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Maximum signature length:</span><br /><span class="gensmall">Number of characters allowed</span></td>
<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow Name Change:</span></td>
<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES} <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Inbox limit:</span></td>
<td class="row2"><input type="text" size="5" maxlength="5" name="max_inbox_privmsgs" value="{INBOX_PRIVMSGS}"> messages</td>
</tr>
<tr>
<td class="row1"><span class="gen">Sentbox limit:</span></td>
<td class="row2"><input type="text" size="5" maxlength="5" name="max_sentbox_privmsgs" value="{SENTBOX_PRIVMSGS}"> messages</td>
</tr>
<tr>
<td class="row1"><span class="gen">Savebox limit:</span></td>
<td class="row2"><input type="text" size="5" maxlength="5" name="max_savebox_privmsgs" value="{SAVEBOX_PRIVMSGS}"> messages</td>
</tr>
<tr>
<td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow local gallery avatars:</span></td>
<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES} <input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow remote avatars:</span><br /><span class="gensmall">Avatars linked from another website</span></td>
<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES} <input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Allow avatar uploading:</span></td>
<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES} <input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">Max. Avatar File Size:</span><br /><span class="gensmall">For uploaded avatar files</span></td>
<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
</tr>
<tr>
<td class="row1"><span class="gen">Max. Avatar Size:</span><br /><span class="gensmall">(height x width)</span>
</td>
<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Avatar Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td>
<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td>
</tr>
<tr>
<td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">Admin Email Address:</span></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Email Signature:</span><br /><span class="gensmall">This text will be attached to all emails the board sends</span></td>
<td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td>
</tr>
<tr>
<td class="row1"><span class="gen">Use SMTP for delivery:</span><br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td>
<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES}> {L_YES} <input type="radio" name="smtp_delivery" value="0" {SMTP_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1"><span class="gen">SMTP Server:</span></td>
<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50"></td>
</tr>
<tr>
<td class="cat" colspan="2"><span class="cattitle">COPPA Settings</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">FAX Number:</span></td>
<td class="row2"><input type="text" name="coppa_fax" value="{COPPA_FAX}" size="25" maxlength="50"></td>
</tr>
<tr>
<td class="row1"><span class="gen">Mailing Address:</span><br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td>
<td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings">
</td>
</tr>
</table></form>
<br clear="all">
--- NEW FILE ---
<h1>{L_STYLES_TITLE}</h1>
<P>{L_STYLES_ADD_TEXT}</p>
<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thCornerL">{L_STYLE}</th>
<th class="thTop">{L_TEMPLATE}</th>
<th class="thCornerR">{L_ACTION}</th>
</tr>
<!-- BEGIN styles -->
<tr>
<td class="{styles.ROW_CLASS}">{styles.STYLE_NAME}</td>
<td class="{styles.ROW_CLASS}">{styles.TEMPLATE_NAME}</td>
<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_INSTALL}">{L_INSTALL}</a></td>
</tr>
<!-- END styles -->
</table></form>
--- NEW FILE ---
<h1>{L_THEMES_TITLE}</h1>
<p>{L_THEMES_EXPLAIN}</p>
<form action="{S_THEME_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="3">{L_THEME_SETTINGS}</th>
</tr>
<tr>
<td class="row1">{L_THEME_NAME}:</td>
<td class="row2" colspan="2"><input type="text" size="25" maxlength="100" name="style_name" value="{THEME_NAME}"></td>
</tr>
<tr>
<td class="row1">{L_TEMPLATE}:</td>
<td class="row2" colspan="2">{S_TEMPLATE_SELECT}</td>
</tr>
<tr>
<td class="cattitle">{L_THEME_ELEMENT}</td>
<td class="cattitle">{L_VALUE}</td>
<td class="cattitle">{L_SIMPLE_NAME}</td>
</tr>
<tr>
<td class="row1">{L_STYLESHEET}:<br /><span class="gensmall">Filename for CSS stylesheet to use for this theme.</span></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="head_stylesheet" value="{HEAD_STYLESHEET}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BACKGROUND_IMAGE}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_background" value="{BODY_BACKGROUND}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BACKGROUND_COLOR}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_bgcolor" value="{BODY_BGCOLOR}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BODY_LINK}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_link" value="{BODY_LINK}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BODY_VLINK}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_vlink" value="{BODY_VLINK}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BODY_ALINK}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_alink" value="{BODY_ALINK}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_BODY_HLINK}:</td>
<td class="row2" ><input type="text" size="25" maxlength="100" name="body_hlink" value="{BODY_HLINK}"></td>
<td class="row2"> </td>
</tr>
<tr>
<td class="row1">{L_TR_COLOR1}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color1" value="{TR_COLOR1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color1_name" value="{TR_COLOR1_NAME}">
</tr>
<tr>
<td class="row1">{L_TR_COLOR2}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color2" value="{TR_COLOR2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color2_name" value="{TR_COLOR2_NAME}">
</tr>
<tr>
<td class="row1">{L_TR_COLOR3}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color3" value="{TR_COLOR3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color3_name" value="{TR_COLOR3_NAME}">
</tr>
<tr>
<td class="row1">{L_TR_CLASS1}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class1" value="{TR_CLASS1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class1_name" value="{TR_CLASS1_NAME}">
</tr>
<tr>
<td class="row1">{L_TR_CLASS2}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class2" value="{TR_CLASS2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class2_name" value="{TR_CLASS2_NAME}">
</tr>
<tr>
<td class="row1">{L_TR_CLASS3}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class3" value="{TR_CLASS3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class3_name" value="{TR_CLASS3_NAME}">
</tr>
<tr>
<td class="row1">{L_TH_COLOR1}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="th_color1" value="{TH_COLOR1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_color1_name" value="{TH_COLOR1_NAME}">
</tr>
<tr>
<td class="row1">{L_TH_COLOR2}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="th_color2" value="{TH_COLOR2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_color2_name" value="{TH_COLOR2_NAME}">
</tr>
<tr>
<td class="row1">{L_TH_COLOR3}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="th_color3" value="{TH_COLOR3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_color3_name" value="{TH_COLOR3_NAME}">
</tr>
<tr>
<td class="row1">{L_TH_CLASS1}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="th_class1" value="{TH_CLASS1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_class1_name" value="{TH_CLASS1_NAME}">
</tr>
<tr>
<td class="row1">{L_TH_CLASS2}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="th_class2" value="{TH_CLASS2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_class2_name" value="{TH_CLASS2_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_CLASS3}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="th_class3" value="{TD_CLASS3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="th_class3_name" value="{TD_CLASS3_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_COLOR1}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="td_color1" value="{TD_COLOR1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_color1_name" value="{TD_COLOR1_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_COLOR2}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="td_color2" value="{TD_COLOR2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_color2_name" value="{TD_COLOR2_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_COLOR3}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="td_color3" value="{TD_COLOR3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_color3_name" value="{TD_COLOR3_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_CLASS1}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="td_class1" value="{TD_CLASS1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_class1_name" value="{TD_CLASS1_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_CLASS2}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="td_class2" value="{TD_CLASS2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_class2_name" value="{TD_CLASS2_NAME}">
</tr>
<tr>
<td class="row1">{L_TD_CLASS3}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="td_class3" value="{TD_CLASS3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="td_class3_name" value="{TD_CLASS3_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTFACE_1}:</td>
<td class="row2"><input type="text" size="25" maxlength="50" name="fontface1" value="{FONTFACE1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontface1_name" value="{FONTFACE1_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTFACE_2}:</td>
<td class="row2"><input type="text" size="25" maxlength="50" name="fontface2" value="{FONTFACE2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontface2_name" value="{FONTFACE2_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTFACE_3}:</td>
<td class="row2"><input type="text" size="25" maxlength="50" name="fontface3" value="{FONTFACE3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontface3_name" value="{FONTFACE3_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTSIZE_1}:</td>
<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize1" value="{FONTSIZE1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize1_name" value="{FONTSIZE1_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTSIZE_2}:</td>
<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize2" value="{FONTSIZE2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize2_name" value="{FONTSIZE2_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTSIZE_3}:</td>
<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize3" value="{FONTSIZE3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize3_name" value="{FONTSIZE3_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTCOLOR_1}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor1" value="{FONTCOLOR1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTCOLOR_2}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor2" value="{FONTCOLOR2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
</tr>
<tr>
<td class="row1">{L_FONTCOLOR_3}:</td>
<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor3" value="{FONTCOLOR3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
</tr>
<tr>
<td class="row1">{L_SPAN_CLASS_1}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="span_class1" value="{SPAN_CLASS1}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="span_class1_name" value="{SPAN_CLASS1_NAME}">
</tr>
<tr>
<td class="row1">{L_SPAN_CLASS_2}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="span_class2" value="{SPAN_CLASS2}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
</tr>
<tr>
<td class="row1">{L_SPAN_CLASS_3}:</td>
<td class="row2"><input type="text" size="25" maxlength="25" name="span_class3" value="{SPAN_CLASS3}"></td>
<td class="row2"><input type="text" size="25" maxlength="100" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
</tr>
<tr>
<td class="catBottom" colspan="3" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" />
</td>
</tr>
</table></form>
<br clear="all">
--- NEW FILE ---
<h1>{L_STYLE_EXPORTER}</h1>
<p>{L_EXPORTER_EXPLAIN}</p>
<form method="post" action="{S_EXPORTER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" align="center">{L_TEMPLATE_SELECT}</th>
</tr>
<tr>
<td class="row1" align="center">{S_TEMPLATE_SELECT} <input type="submit" name="edit" value="{L_SUBMIT}" class="mainoption" /> </td>
</tr>
</table></form>
--- NEW FILE ---
<h1>{L_STYLES_TITLE}</h1>
<P>{L_STYLES_TEXT}</p>
<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thCornerL">{L_STYLE}</th>
<th class="thTop">{L_TEMPLATE}</th>
<th class="thTop">{L_EDIT}</th>
<th colspan="2" class="thCornerR">{L_DELETE}</th>
</tr>
<!-- BEGIN styles -->
<tr>
<td class="{styles.ROW_CLASS}">{styles.STYLE_NAME}</td>
<td class="{styles.ROW_CLASS}">{styles.TEMPLATE_NAME}</td>
<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_EDIT}">{L_EDIT}</a></td>
<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_DELETE}">{L_DELETE}</a></td>
</tr>
<!-- END styles -->
</table></form>
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO
In directory usw-pr-cvs1:/tmp/cvs-serv5978
Modified Files:
bbcode.tpl groupcp_info_body.tpl index_body.tpl jumpbox.tpl
overall_header.tpl posting_body.tpl posting_preview.tpl
search_body.tpl search_results_posts.tpl
search_results_topics.tpl viewforum_body.tpl
viewtopic_body.tpl
Added Files:
faq_body.tpl groupcp_pending_info.tpl posting_topic_review.tpl
profile_avatar_gallery.tpl profile_send_email.tpl
profile_send_pass.tpl search_username.tpl simple_footer.tpl
simple_header.tpl
Log Message:
Loads'a updates, thanks mainly to 'The Black Pit', everyone buy him something nice ... or just send money to 'Black Pit', c/o P. Owen, London ...
--- NEW FILE ---
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
<td class="cat" align="center"><span class="cattitle">{L_FAQ}</span></td>
</tr>
<tr>
<td align="left" valign="top" class="row1"><table cellspacing="3" cellpadding="0" border="0">
<tr>
<td> </td>
</tr>
<!-- BEGIN faq_block_link -->
<!-- BEGIN faq_row_link -->
<tr>
<td><span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}">{faq_block_link.faq_row_link.FAQ_LINK}</a></span></td>
</tr>
<!-- END faq_row_link -->
<tr>
<td> </td>
</tr>
<!-- END faq_block_link -->
</table></td>
</tr>
<tr>
<td height="2" class="cat"><img src="images/spacer.gif" height="2" /></td>
</tr>
<!-- BEGIN faq_block -->
<!-- BEGIN faq_row -->
<tr>
<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="gen"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><br /><span class="gensmall">{faq_block.faq_row.FAQ_ANSWER}</span></td>
</tr>
<!-- END faq_row -->
<tr>
<td class="cat" height="25"><span class="gen">{faq_block.BLOCK_TITLE}</span></td>
</tr>
<!-- END faq_block -->
</table></td>
</tr>
</table>
<br clear="all" />
<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td><span class="gensmall"><b>{S_TIMEZONE}</b></td>
<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{JUMPBOX}</span></td>
</tr>
</table>
--- NEW FILE ---
<br clear="all" />
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th class="thCornerL" height="25">{L_PM}</th>
<th class="thTop">{L_USERNAME}</th>
<th class="thTop">{L_POSTS}</th>
<th class="thTop">{L_FROM}</th>
<th class="thTop">{L_EMAIL}</th>
<th class="thTop">{L_WEBSITE}</th>
<th class="thCornerR">{L_SELECT}</th>
</tr>
<tr>
<td class="catSides" colspan="8" height="28"><span class="cattitle">{L_PENDING_MEMBERS}</span></td>
</tr>
<!-- BEGIN pending_members_row -->
<tr>
<td class="{pending_members_row.ROW_CLASS}" align="center"> {pending_members_row.PM_IMG}
</td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen"><a href="{pending_members_row.U_VIEWPROFILE}" class="gen">{pending_members_row.USERNAME}</a></span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.POSTS}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.FROM}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.EMAIL_IMG}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.WWW_IMG}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gensmall"> <input type="checkbox" name="pending_members[]" value="{pending_members_row.USER_ID}" /></span></td>
</tr>
<!-- END pending_members_row -->
<tr>
<td class="cat" colspan="8" align="right"><span class="cattitle">
<input type="submit" name="approve" value="{L_APPROVE_SELECTED}" class="mainoption" />
<input type="submit" name="deny" value="{L_DENY_SELECTED}" class="liteoption" />
</span></td>
</tr>
</table>
--- NEW FILE ---
<!-- BEGIN switch_inline_mode -->
<table width="90%" border="0" cellpadding="0" cellspacing="1" align="center">
<tr>
<td class="cat" height="30" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
</tr>
<tr>
<td><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}">
<!-- END switch_inline_mode -->
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
<th width="160"><table width="160" cellspacing="0" cellpadding="0" border="0">
<tr>
<td align="center"><span class="gensmall"><b>{L_AUTHOR}</b></span></td>
</tr>
</table></th>
<th width="100%"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td align="center"><span class="gensmall"><b>{L_MESSAGE}</b></span></td>
</tr>
</table></th>
</tr>
</table></td>
</tr>
<tr>
<td><img src="images/spacer.gif" height="4" /></td>
</tr>
</table>
<!-- BEGIN postrow -->
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
<tr bgcolor="{postrow.ROW_COLOR}">
<td width="180" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><table width="180" cellspacing="0" cellpadding="0" border="0">
<tr>
<td valign="top"><span class="gen"><b>{postrow.POSTER_NAME}</b></span></td>
</tr>
</table></td>
<td width="100%" valign="top"><table width="100%" cellspacing="1" cellpadding="0" border="0">
<tr>
<td valign="top"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="gensmall">{L_POSTED}: {postrow.POST_DATE} {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
<td align="right" valign="middle" nowrap="nowrap"> {postrow.EDIT_IMG} {postrow.QUOTE_IMG} </td>
</tr>
<tr>
<td colspan="2"><hr /></td>
</tr>
</table></td>
</tr>
<tr>
<td width="100%" height="100%" valign="top"><span class="gen">{postrow.MESSAGE}</span></td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
<tr>
<td><img src="images/spacer.gif" height="2" /></td>
</tr>
</table>
<!-- END postrow -->
<!-- BEGIN switch_inline_mode -->
</iframe></td>
</tr>
</table>
<!-- END switch_inline_mode -->
--- NEW FILE ---
<form action="{S_PROFILE_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
</table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th>
</tr>
<tr>
<td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}: <select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select> <input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td>
</tr>
<!-- BEGIN avatar_row -->
<tr>
<!-- BEGIN avatar_column -->
<td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" /></td>
<!-- END avatar_column -->
</tr>
<tr>
<!-- BEGIN avatar_option_column -->
<td class="row2" align="center"><input type="radio" name="avatarselect" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
<!-- END avatar_option_column -->
</tr>
<!-- END avatar_row -->
<tr>
<td class="catBottom" colspan="{S_COLSPAN}" align="center" height="28">{S_HIDDEN_FIELDS}
<input type="submit" name="submitavatar" value="{L_SELECT_AVATAR}" class="mainoption" />
<input type="submit" name="cancelavatar" value="{L_RETURN_PROFILE}" class="liteoption" />
</td>
</tr>
</table>
</form>
--- NEW FILE ---
<!-- Spell checker option part 1: You must sign up for free at www.spellchecker.net to use this option -->
<!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
<!-- Remember to uncomment the spellchecker button near the end of this template -->
<!-- script type="text/javascript" language="javascript" src=spellcheck/spch.js></script -->
<!-- End spellchecker option -->
<script language="JavaScript" type="text/javascript">
<!--
function checkForm(formObj) {
formErrors = false;
if (formObj.message.value.length < 2) {
formErrors = "You must enter a message!";
}
else if ( formObj.subject.value.length < 2)
{
formErrors = "You must enter a subject!";
}
if (formErrors) {
alert(formErrors);
return false;
}
}
//-->
</script>
<form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)">
{ERROR_BOX}
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
</table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th class="thHead" colspan="2" height="25"><b>{L_SEND_EMAIL_MSG}</b></th>
</tr>
<tr>
<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
</tr>
<tr>
<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
<td class="row2" width="78%"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span> </td>
</tr>
<tr>
<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
<td class="row2"><span class="gen"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
</tr>
<tr>
<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
<tr>
<td><input type="checkbox" name="cc_email" value="1" checked="checked" /></td>
<td><span class="gen">{L_CC_EMAIL}</span></td>
</tr>
</table></td>
</tr>
<tr>
<td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}
<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
<!-- Remember to uncomment the link to the javascript file at the top of this template -->
<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
<!-- End spellchecker option -->
<input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table></form>
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
<td valign="top" align="right">{JUMPBOX}</td>
</tr>
</table>
--- NEW FILE ---
<form action="{S_PROFILE_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
</table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th class="thHead" colspan="2" height="25" valign="middle">{L_SEND_PASSWORD}</th>
</tr>
<tr>
<td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
</tr>
<tr>
<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
<td class="row2">
<input type="text" class="post" style="width: 200px" name="username" size="25" maxlength="40" value="{USERNAME}" />
</td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
<td class="row2">
<input type="text" class="post" style="width: 200px" name="email" size="25" maxlength="255" value="{EMAIL}" />
</td>
</tr>
<tr>
<td class="catBottom" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
<input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
</td>
</tr>
</table>
</form>
--- NEW FILE ---
<script language="javascript" type="text/javascript">
<!--
function refresh_username(selected_username)
{
opener.document.forms['post'].username.value = selected_username;
}
//-->
</script>
<form method="post" name="search" action="{S_SEARCH_ACTION}">
<table width="100%" border="0" cellspacing="0" cellpadding="10">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
<tr>
<th class="thHead" height="25">{L_SEARCH_USERNAME}</th>
</tr>
<tr>
<td valign="top" class="row1"><span class="genmed"><br />
<input type="text" name="search_author" value="{AUTHOR}" class="post" />
<input type="submit" name="search" value="{L_SEARCH}" class="liteoption" />
</span><br />
<span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
<!-- BEGIN switch_select_name -->
<span class="genmed">{L_UPDATE_USERNAME}<br />
<select name="author_list">{S_AUTHOR_OPTIONS}
</select>
<input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" />
</span><br />
<!-- END switch_select_name -->
<br />
<span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
</tr>
</table>
</td>
</tr>
</table>
</form>
--- NEW FILE ---
<br clear="all" />
<div align="center"><span class="gensmall">
<!--
Please note that the following copyright notice
MUST be displayed on each and every page output
by phpBB. You may alter the font, colour etc. but
you CANNOT remove it, nor change it so that it be,
to all intents and purposes, invisible. You may ADD
your own notice to it should you have altered the
code but you may not replace it. The hyperlink must
also remain intact. These conditions are part of the
licence this software is released under. See the
LICENCE and README files for more information.
The phpBB Group : 2001
// -->
Powered by phpBB {PHPBB_VERSION} © 2001 <a href="http://www.phpbb.com/" target="_phpbb">phpBB Group</a></span></div>
</body>
</html>
--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!-- ?xml version="1.0" encoding="UTF-8"? -->
<!--DOCTYPE PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd" -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
{META}
<title>{SITENAME} -+- {PAGE_TITLE}</title>
<style type="text/css">
<!--
BODY {background-color:{T_BODY_BGCOLOR}; color:{T_BODY_TEXT}; scrollbar-base-color:{T_TH_COLOR2}; scrollbar-arrow-color:{T_TH_COLOR1}; margin:0px;}
P {font-family:{T_FONTFACE1};font-size:10pt}
TH {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE2};font-size:8pt;font-weight:normal}
TH.secondary {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE1};font-size:10pt;font-weight:normal;text-align:left}
TD.tablebg {background-color:{T_TH_COLOR1}}
TD.cat {background-color:{T_TH_COLOR2};font-family:{T_FONTFACE1};font-size:12pt}
TD.row1 {background-color:{T_TD_COLOR1}}
TD.row2 {background-color:{T_TD_COLOR2}}
SPAN.title {font-family:Impact,sans-serif;font-size:36pt}
SPAN.cattitle {font-family:{T_FONTFACE1};font-size:12pt;font-weight:bold}
SPAN.gen {font-family:{T_FONTFACE1};font-size:10pt}
SPAN.gensmall {font-family:{T_FONTFACE1};font-size:8pt}
SPAN.courier {font-family:{T_FONTFACE3};font-size:10pt}
SELECT {font-family:Verdana;font-size:8pt}
INPUT {font-family:Verdana;font-size:8pt}
SELECT.small {font-family:"Courier New",courier;font-size:8pt;width:140px}
INPUT.text {font-family:"Courier New",courier;font-size:8pt;}
A.forumlinks {font-weight:bold}
A {text-decoration:none}
A:hover {text-decoration:underline}
//-->
</style>
</head>
<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}" marginheight="0" marginwidth="0" topmargin="0" leftmargin="0">
Index: bbcode.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/bbcode.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bbcode.tpl 2001/10/24 22:52:24 1.3
--- bbcode.tpl 2001/11/20 02:20:24 1.4
***************
*** 1,7 ****
- // bbcode.tpl -- bbcode replacement templates.
-
<!-- BEGIN ulist_open -->
<ul>
<!-- END ulist_open -->
<!-- BEGIN ulist_close -->
</ul>
--- 1,6 ----
<!-- BEGIN ulist_open -->
<ul>
<!-- END ulist_open -->
+
<!-- BEGIN ulist_close -->
</ul>
***************
*** 12,15 ****
--- 11,15 ----
<ol type="{LIST_TYPE}">
<!-- END olist_open -->
+
<!-- BEGIN olist_close -->
</ol>
***************
*** 20,96 ****
<li>
<!-- END listitem -->
<!-- BEGIN quote_open -->
! <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
! <tr>
! <td><font size="-1">{L_QUOTE}</font><hr /></td>
! </tr>
! <tr>
! <td><font size="-1"><blockquote>
! <!-- END quote_open -->
! <!-- BEGIN quote_username_open -->
! <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
! <tr>
! <td><font size="-1">{USERNAME} {L_WROTE}:</font><hr /></td>
! </tr>
! <tr>
! <td><font size="-1"><blockquote>
! <!-- END quote_username_open -->
! <!-- BEGIN quote_close -->
! </blockquote></font></td>
! </tr>
<tr>
! <td><hr /></td>
</tr>
</table>
<!-- END quote_close -->
<!-- BEGIN code_open -->
! <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
! <tr>
! <td><font size="-1">{L_CODE}</font><hr /></td>
! </tr>
! <tr>
! <td><font size="-1"><pre>
! <!-- END code_open -->
! <!-- BEGIN code_close -->
! </pre></font></td>
</tr>
<tr>
! <td><hr /></td>
</tr>
</table>
<!-- END code_close -->
<!-- BEGIN b_open -->
! <b>
<!-- END b_open -->
<!-- BEGIN b_close -->
! </b>
<!-- END b_close -->
<!-- BEGIN u_open -->
! <u>
<!-- END u_open -->
<!-- BEGIN u_close -->
! </u>
<!-- END u_close -->
<!-- BEGIN i_open -->
! <i>
<!-- END i_open -->
<!-- BEGIN i_close -->
! </i>
<!-- END i_close -->
<!-- BEGIN color_open -->
! <span style="color:{COLOR}">
<!-- END color_open -->
<!-- BEGIN color_close -->
</span>
--- 20,93 ----
<li>
<!-- END listitem -->
+
+ <!-- BEGIN quote_username_open -->
+ </span>
+ <table width="90%" border="0" cellpadding="4" cellspacing="1" align="center">
+ <td><span class="gensmall"><b>{USERNAME} {L_WROTE}:</b></span><span class="gensmall"><!-- END quote_username_open -->
+
<!-- BEGIN quote_open -->
! </span>
!
! <table width="90%" cellpadding="3" cellspacing="1" border="0" align="center">
<tr>
! <td><span class="gensmall"><b>{L_QUOTE}:</b></span><span class="gensmall"><!-- END quote_open -->
!
! <!-- BEGIN quote_close --></span></td>
</tr>
</table>
+
+ <span class="gen">
<!-- END quote_close -->
<!-- BEGIN code_open -->
! </span>
! <table border="0" align="center" width="90%" cellpadding="3" cellspacing="1">
! <tr>
! <td><span class="gensmall"><b>{L_CODE}:</b></span></td>
</tr>
<tr>
! <td><pre><!-- END code_open -->
!
! <!-- BEGIN code_close --></pre></td>
</tr>
</table>
+ <span class="postbody">
<!-- END code_close -->
<!-- BEGIN b_open -->
! <span style="font-weight: bold">
<!-- END b_open -->
+
<!-- BEGIN b_close -->
! </span>
<!-- END b_close -->
<!-- BEGIN u_open -->
! <span style="text-decoration: underline">
<!-- END u_open -->
+
<!-- BEGIN u_close -->
! </span>
<!-- END u_close -->
<!-- BEGIN i_open -->
! <span style="font-style: italic">
<!-- END i_open -->
+
<!-- BEGIN i_close -->
! </span>
<!-- END i_close -->
<!-- BEGIN color_open -->
! <span style="color: {COLOR}">
<!-- END color_open -->
+
<!-- BEGIN color_close -->
</span>
***************
*** 99,109 ****
<!-- BEGIN size_open -->
! <span style="font-size:{SIZE}px; line-height:normal">
<!-- END size_open -->
<!-- BEGIN size_close -->
</span>
<!-- END size_close -->
-
<!-- BEGIN img -->
<img src="{URL}" border="0" />
--- 96,106 ----
<!-- BEGIN size_open -->
! <span style="font-size: {SIZE}; line-height: normal">
<!-- END size_open -->
+
<!-- BEGIN size_close -->
</span>
<!-- END size_close -->
<!-- BEGIN img -->
<img src="{URL}" border="0" />
***************
*** 112,120 ****
<!-- BEGIN url -->
! <a href="{URL}" target="_blank">{DESCRIPTION}</a>
<!-- END url -->
<!-- BEGIN email -->
! <a href="mailto:{EMAIL}">{EMAIL}</a>
<!-- END email -->
--- 109,117 ----
<!-- BEGIN url -->
! <a href="{URL}" target="_blank" class="postlink">{DESCRIPTION}</a>
<!-- END url -->
<!-- BEGIN email -->
! <a href="mailto:{EMAIL}">{EMAIL}</A>
<!-- END email -->
Index: groupcp_info_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/groupcp_info_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** groupcp_info_body.tpl 2001/10/06 04:44:47 1.5
--- groupcp_info_body.tpl 2001/11/20 02:20:24 1.6
***************
*** 1,148 ****
! <div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
! <tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
</tr>
- </table></div>
! <div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
! <tr><form method="POST" action="{S_GROUP_INFO_ACTION}">
! <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
! <tr>
! <td class="cat" colspan="2"><span class="cattitle">{L_GROUP_INFORMATION}</span></td>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td>
! <td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DESC}</span></td>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DETAILS}{S_HIDDEN_FIELDS}</span></td>
! </tr>
! </table></td>
! </form></tr>
! </table></div>
!
! <br clear="all">
!
! <form action="{S_PENDING_ACTION}" method="POST" name="post">
! {S_PENDING_HIDDEN_FIELDS}
! <table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
<tr>
! <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
! <tr>
! <td class="cat" colspan="7"><span class="cattitle">Group Moderator</span></td>
! </tr>
! <tr>
! <th width="8%"> </th>
! <th><b>{L_USERNAME}</b></td>
! <th width="8%"><b>{L_EMAIL}</b></td>
! <th><b>{L_FROM}</b></td>
! <th><b>{L_POSTS}</b></td>
! <th width="8%" colspan="2"><b>{L_WEBSITE}</b></td>
!
! </tr>
! <tr>
! <td class="row1" width="8%" align="center"> {MOD_PM_IMG} </td>
! <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}">{MOD_USERNAME}</a></span></td>
! <td class="row1" width="8%" align="center" valign="middle"> {MOD_EMAIL_IMG} </td>
! <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
! <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td>
! <td class="row1" width="8%" align="center" colspan="2"> {MOD_WWW_IMG} </a></td>
! </tr>
! <tr>
! <td class="cat" colspan="7"><span class="cattitle">Group Members</span></td>
! </tr>
! <tr>
! <th> </th>
! <th><b>{L_USERNAME}</b></td>
! <th><b>{L_EMAIL}</b></td>
! <th><b>{L_FROM}</b></td>
! <th><b>{L_POSTS}</b></td>
! <th><b>{L_WEBSITE}</b></td>
! <th width="10%">{L_SELECT}</th>
! </tr>
! <!-- BEGIN memberrow -->
! <tr>
! <td class="{memberrow.ROW_CLASS}" width="8%" align="center"> {memberrow.PM_IMG} </td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}">{memberrow.USERNAME}</a></span></td>
! <td class="{memberrow.ROW_CLASS}" width="8%" align="center" valign="middle"> {memberrow.EMAIL_IMG} </td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen">{memberrow.FROM}</span></td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen">{memberrow.POSTS}</span></td>
! <td class="{memberrow.ROW_CLASS}" width="8%" align="center"> {memberrow.WWW_IMG} </a></td>
! <td class="{memberrow.ROW_CLASS}" align="center">
! <!-- BEGIN memberselect -->
! <input type="checkbox" name="member[]" value="{memberrow.memberselect.USER_ID}" /> <span class="gen">{L_SELECT}</span>
! <!-- END memberselect -->
! </td>
! </tr>
! <!-- END memberrow -->
! <!-- BEGIN modoption -->
! <tr>
! <td class="cat" colspan="7" align="right"><span class="cattitle">
! <input type="submit" name="remove" value="{L_REMOVESELECTED}" class="mainoption" />
! </td>
! </tr>
! <!-- END modoption -->
! <!-- BEGIN pendingmembers -->
! <tr>
! <td class="cat" colspan="7"><span class="cattitle">Pending Members</span></td>
! </tr>
! <tr>
! <th>{L_PM}</th>
! <th><b>{L_USERNAME}</b></td>
! <th><b>{L_EMAIL}</b></td>
! <th><b>{L_FROM}</b></td>
! <th><b>{L_POSTS}</b></td>
! <th><b>{L_SELECT}</b></td>
! </tr>
! <!-- END pendingmembers -->
! <!-- BEGIN pendingmembersrow -->
! <tr>
! <td class="{pendingmembersrow.ROW_CLASS}" width="8%" align="center"> {pendingmembersrow.PM_IMG} </td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen"><a href="{pendingmembersrow.U_VIEWPROFILE}">{pendingmembersrow.USERNAME}</a></span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" width="8%" align="center" valign="middle"> {pendingmembersrow.EMAIL_IMG} </td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.FROM}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.POSTS}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" width="8%" align="center"><span class="gen"> {pendingmembersrow.SELECT} {L_SELECT} </span></td>
! </tr>
! <!-- END pendingmembersrow -->
! <!-- BEGIN pendingmembers -->
! <tr>
! <td class="cat" colspan="7" align="right"><span class="cattitle"><input type="submit" name="approve" value="{L_APPROVESELECTED}"> <input type="submit" name="deny" value="{L_DENYSELECTED}"></span></td>
! </tr>
! <!-- END pendingmembers -->
!
! <!-- BEGIN nomembers -->
! <tr>
! <td class="row1" colspan="7" align="center">{L_NO_MEMBERS}</td>
! </tr>
! <!-- END nomembers -->
! <tr>
! <td class="cat" colspan="7"><table width="100%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <td colspan="7"><span class="gen">
! <!-- BEGIN addmember -->
! <input type="text" class="post" name="username" maxlength="50" size="20" />
!
! <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
! <input type="submit" name="add" value="{L_ADDMEMBER}" />
! </span>
! <!-- END addmember -->
! </td>
! </tr>
! </table></td>
! </tr>
! </table></td>
</tr>
</table>
! </form>
! <table width="98%" cellspacing="2" border="0" align="center">
<tr>
! <td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
! <td align="right" valign="top" nowrap>{JUMPBOX}</td>
</tr>
</table>
--- 1,129 ----
!
! <form method="POST" action="{S_GROUP_INFO_ACTION}">
! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
! <tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
! </tr>
! </table>
!
! <table width="100%" cellpadding="4" cellspacing="1" border="0">
! <tr>
! <th colspan="7" class="thHead" height="25"><span class="cattitle">{L_GROUP_INFORMATION}</span></th>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td>
! <td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DESC}</span></td>
! </tr>
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DETAILS}
! <!-- BEGIN switch_subscribe_group_input -->
! <input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" />
! <!-- END switch_subscribe_group_input -->
! <!-- BEGIN switch_unsubscribe_group_input -->
! <input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" />
! <!-- END switch_unsubscribe_group_input -->
! </span></td>
! </tr>
! <!-- BEGIN switch_mod_option -->
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_STATUS}:</span></td>
! <td class="row2"><span class="gen"><span class="gen"><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} <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
! </tr>
! <!-- END switch_mod_option -->
! </table>
! {S_HIDDEN_FIELDS}
! </form>
!
! <form action="{S_PENDING_ACTION}" method="post" name="post">
! <table width="100%" cellpadding="4" cellspacing="1" border="0">
! <tr>
! <th class="thCornerL" height="25">{L_PM}</th>
! <th class="thTop">{L_USERNAME}</th>
! <th class="thTop">{L_POSTS}</th>
! <th class="thTop">{L_FROM}</th>
! <th class="thTop">{L_EMAIL}</th>
! <th class="thTop">{L_WEBSITE}</th>
! <th class="thCornerR">{L_SELECT}</th>
! </tr>
!
! <tr>
! <td colspan="8" height="28"><span class="cattitle">{L_GROUP_MODERATOR}</span></td>
! </tr>
!
! <tr>
! <td class="row1" align="center"> {MOD_PM_IMG} </td>
! <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}" class="gen">{MOD_USERNAME}</a></span></td>
! <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td>
! <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
! <td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td>
! <td class="row1" align="center">{MOD_WWW_IMG}</td>
! <td class="row1" align="center"> </td>
</tr>
! <tr>
! <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MEMBERS}</span></td>
! </tr>
!
! <!-- BEGIN member_row -->
! <tr>
! <td class="{member_row.ROW_CLASS}" align="center"> {member_row.PM_IMG} </td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"><a href="{member_row.U_VIEWPROFILE}" class="gen">{member_row.USERNAME}</a></span></td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen">{member_row.POSTS}</span></td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"> {member_row.FROM}
! </span></td>
! <td class="{member_row.ROW_CLASS}" align="center" valign="middle"><span class="gen">{member_row.EMAIL_IMG}</span></td>
! <td class="{member_row.ROW_CLASS}" align="center"> {member_row.WWW_IMG}</td>
! <td class="{member_row.ROW_CLASS}" align="center">
! <!-- BEGIN switch_mod_option -->
! <input type="checkbox" name="members[]" value="{member_row.USER_ID}" />
! <!-- END switch_mod_option -->
! </td>
! </tr>
! <!-- END member_row -->
!
! <!-- BEGIN switch_no_members -->
! <tr>
! <td class="row1" colspan="7" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
! </tr>
! <!-- END switch_no_members -->
!
! <!-- BEGIN switch_hidden_group -->
! <tr>
! <td class="row1" colspan="7" align="center"><span class="gen">{L_HIDDEN_MEMBERS}</span></td>
! </tr>
! <!-- END switch_hidden_group -->
!
! <!-- BEGIN switch_mod_option -->
<tr>
! <td class="cat" colspan="8" align="right"><span class="cattitle">
! <input type="submit" name="remove" value="{L_REMOVE_SELECTED}" class="mainoption" />
! </td>
</tr>
+ <!-- END switch_mod_option -->
</table>
!
! <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top">
! <!-- BEGIN switch_mod_option -->
! <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span>
! <!-- END switch_mod_option -->
! </td>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
+ </table>
+
+ {PENDING_USER_BOX}
+
+ {S_HIDDEN_FIELDS}</form>
+
+ <table width="100%" cellspacing="2" border="0" align="center">
+ <tr>
+ <td valign="top" align="right">{JUMPBOX}</td>
+ </tr>
</table>
Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/index_body.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** index_body.tpl 2001/09/17 00:41:53 1.21
--- index_body.tpl 2001/11/20 02:20:24 1.22
***************
*** 2,13 ****
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
! <td align="right"><span class="gensmall"><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></span></td>
</tr>
</table>
! <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
! <td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0">
<tr>
<th> </th>
--- 2,17 ----
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left" valign="bottom"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
! <td align="right"><span class="gensmall"><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a> :: <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a> ::
! <!-- BEGIN switch_user_logged_in -->
! <a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a>
! <!-- END switch_user_logged_in -->
! </span></td>
</tr>
</table>
! <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
! <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
<th> </th>
***************
*** 16,49 ****
<th> {L_POSTS} </th>
<th> {L_LASTPOST} </th>
- <th> {L_MODERATOR} </th>
</tr>
<!-- BEGIN catrow -->
<tr>
! <td class="cat" colspan="6"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b> </span></td>
</tr>
<!-- BEGIN forumrow -->
<tr>
<td class="row1" align="center" valign="middle" width="7%">{catrow.forumrow.FOLDER}</td>
! <td class="row2"><span class="gen"><a href="{catrow.forumrow.U_VIEWFORUM}">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
<td class="row1" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.TOPICS}</span></td>
<td class="row2" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.POSTS}</span></td>
<td class="row1" width="15%" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
- <td class="row2" width="5%" align="center" valign="middle"><span class="gensmall">{catrow.forumrow.MODERATORS}</span></td>
</tr>
<!-- END forumrow -->
<!-- END catrow -->
<tr>
! <td class="cat" colspan="6"><span class="cattitle"><b><a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a></b></span></td>
</tr>
<tr>
<td class="row1" width="7%" align="center" valign="middle"><img src="images/mailbox.gif" alt="{L_PRIVATEMSGS}" /></td>
! <td class="row2" colspan="5" align="left"><span class="gen">{PRIVATE_MESSAGE_INFO}</span></td>
</tr>
<tr>
! <td class="cat" colspan="6"><span class="cattitle"><b><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></b></span></td>
</tr>
<tr>
<td class="row1" width="7%" align="center" valign="middle"><img src="images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
! <td class="row2" colspan="5" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}</span><br /><span class="gen">{LOGGED_IN_USER_LIST}</span></td>
</tr>
</table></td>
--- 20,51 ----
<th> {L_POSTS} </th>
<th> {L_LASTPOST} </th>
</tr>
<!-- BEGIN catrow -->
<tr>
! <td class="cat" colspan="5" height="30"><span class="cattitle"><b><a class="forumlinks" href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b> </span></td>
</tr>
<!-- BEGIN forumrow -->
<tr>
<td class="row1" align="center" valign="middle" width="7%">{catrow.forumrow.FOLDER}</td>
! <td class="row2"><span class="gen"><a class="forumlinks" href="{catrow.forumrow.U_VIEWFORUM}">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}<br /><i>{L_MODERATOR}: </i> {catrow.forumrow.MODERATORS}</span></td>
<td class="row1" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.TOPICS}</span></td>
<td class="row2" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.POSTS}</span></td>
<td class="row1" width="15%" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
</tr>
<!-- END forumrow -->
<!-- END catrow -->
<tr>
! <td class="cat" colspan="5"><span class="cattitle"><b><a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a></b></span></td>
</tr>
<tr>
<td class="row1" width="7%" align="center" valign="middle"><img src="images/mailbox.gif" alt="{L_PRIVATEMSGS}" /></td>
! <td class="row2" colspan="4" align="left"><span class="gen">{PRIVATE_MESSAGE_INFO}</span></td>
</tr>
<tr>
! <td class="cat" colspan="5"><span class="cattitle"><b><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></b></span></td>
</tr>
<tr>
<td class="row1" width="7%" align="center" valign="middle"><img src="images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
! <td class="row2" colspan="4" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}</span><br /><span class="gen">{LOGGED_IN_USER_LIST}</span></td>
</tr>
</table></td>
***************
*** 57,71 ****
<td align="left" valign="top"><table cellspacing="0" border="0">
<tr>
<td width="20" align="center"><img src="images/folder_new.gif" alt="{L_NEWPOSTS}" /></td>
! <td><span class="gensmall">{L_NEWPOSTS}</span></td>
<td> </td>
<td width="20" align="center"><img src="images/folder.gif" alt="{L_NONEWPOSTS}" /></td>
! <td><span class="gensmall">{L_NONEWPOSTS}</span></td>
<td> </td>
<td width="20" align="center"><img src="images/folder_lock.gif" alt="{L_FORUM_LOCKED}" /></td>
<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
</tr>
- <tr>
- <td colspan="8"><br /><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_FORUMS_READ}</a></span></td>
</table></td>
<td align="right" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
--- 59,74 ----
<td align="left" valign="top"><table cellspacing="0" border="0">
<tr>
+ <td colspan="8"" valign="top"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_FORUMS_READ}</a></span><br /><br /></td>
+ </tr>
+ <tr>
<td width="20" align="center"><img src="images/folder_new.gif" alt="{L_NEWPOSTS}" /></td>
! <td><span class="gensmall">{L_NEW_POSTS}</span></td>
<td> </td>
<td width="20" align="center"><img src="images/folder.gif" alt="{L_NONEWPOSTS}" /></td>
! <td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
<td> </td>
<td width="20" align="center"><img src="images/folder_lock.gif" alt="{L_FORUM_LOCKED}" /></td>
<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
</tr>
</table></td>
<td align="right" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
Index: jumpbox.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/jumpbox.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** jumpbox.tpl 2001/09/07 12:32:47 1.4
--- jumpbox.tpl 2001/11/20 02:20:24 1.5
***************
*** 1,4 ****
! <form method="post" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
<tr>
<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}: {S_JUMPBOX_LIST} <input type="submit" value="{L_GO}" /></span></td>
--- 1,4 ----
! <form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
<tr>
<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}: {S_JUMPBOX_LIST} <input type="submit" value="{L_GO}" /></span></td>
Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/overall_header.tpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** overall_header.tpl 2001/10/01 23:58:09 1.20
--- overall_header.tpl 2001/11/20 02:20:24 1.21
***************
*** 26,30 ****
SPAN.gensmall {font-family:{T_FONTFACE1};font-size:8pt}
SPAN.courier {font-family:{T_FONTFACE3};font-size:10pt}
- SPAN.courier {font-family:{T_FONTFACE3};font-size:8pt}
SELECT {font-family:Verdana;font-size:8pt}
--- 26,29 ----
***************
*** 33,36 ****
--- 32,39 ----
INPUT.text {font-family:"Courier New",courier;font-size:8pt;}
+ A.forumlinks {font-weight:bold}
+ A {text-decoration:none}
+ A:hover {text-decoration:underline}
+
//-->
</style>
***************
*** 40,44 ****
<a name="top"></a>
! <form method="post" action="{S_LOGIN_ACTION}"><table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg" width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
--- 43,47 ----
<a name="top"></a>
! <form method="post" action="{S_LOGIN_ACTION}"><table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg" width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
***************
*** 46,51 ****
<td class="cat"><table width="100%" cellspacing="0" border="0">
<tr>
! <td><span class="title"><a href="{U_INDEX}">phpBB2</a></span><span class="gensmall"> : A forum that's free</span></td>
! <td align="right" valign="bottom"><span class="gensmall"><a href="http://www.phpbb.com/">Goto phpBB.com</a></span></td>
</tr>
</table></td>
--- 49,54 ----
<td class="cat"><table width="100%" cellspacing="0" border="0">
<tr>
! <td><span class="title"><a href="{U_INDEX}">{SITENAME}</a></span><span class="gensmall"> : {SITE_DESCRIPTION}</span></td>
! <td align="right" valign="bottom"><span class="gensmall"><a href="http://www.phpbb.com/">{SITENAME}</a></span></td>
</tr>
</table></td>
***************
*** 54,66 ****
<td class="row1"><table width="100%" cellspacing="0" cellpadding="4" border="0">
<tr>
! <td><span class="gensmall"><a href="{U_FAQ}">{L_FAQ}</a> | <a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a> | <a href="{U_REGISTER}">{L_REGISTER}</a> | <a href="{U_SEARCH}">{L_SEARCH}</a></span></td>
<td align="center"><span class="gensmall">{L_LAST_VISIT} {LAST_VISIT_DATE}</span></td>
<td align="right"><span class="gensmall"><a href="{U_PROFILE}">{L_PROFILE}</a> | <a href="{U_GROUP_CP}">{L_USERGROUPS}</a> | <a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></span></td>
</tr>
! <!-- BEGIN loginbox -->
<tr>
<td colspan="3" align="right" valign="bottom"><span class="gensmall">{L_USERNAME}: <input class="text" type="text" name="username" /> {L_PASSWORD}: <input type="password" name="password" /> {L_AUTO_LOGIN}</span>: <input class="text" type="checkbox" name="autologin" /> <input type="submit" name="submit" value="{L_LOGIN}" /> </td>
</tr>
! <!-- END loginbox -->
</table></td>
</tr>
--- 57,73 ----
<td class="row1"><table width="100%" cellspacing="0" cellpadding="4" border="0">
<tr>
! <td><span class="gensmall"><a href="{U_FAQ}">{L_FAQ}</a> | <a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a>
! <!-- BEGIN switch_user_logged_out -->
! | <a href="{U_REGISTER}">{L_REGISTER}</a>
! <!-- END switch_user_logged_out -->
! | <a href="{U_SEARCH}">{L_SEARCH}</a></span></td>
<td align="center"><span class="gensmall">{L_LAST_VISIT} {LAST_VISIT_DATE}</span></td>
<td align="right"><span class="gensmall"><a href="{U_PROFILE}">{L_PROFILE}</a> | <a href="{U_GROUP_CP}">{L_USERGROUPS}</a> | <a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></span></td>
</tr>
! <!-- BEGIN switch_user_logged_out -->
<tr>
<td colspan="3" align="right" valign="bottom"><span class="gensmall">{L_USERNAME}: <input class="text" type="text" name="username" /> {L_PASSWORD}: <input type="password" name="password" /> {L_AUTO_LOGIN}</span>: <input class="text" type="checkbox" name="autologin" /> <input type="submit" name="submit" value="{L_LOGIN}" /> </td>
</tr>
! <!-- END switch_user_logged_out -->
</table></td>
</tr>
Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/posting_body.tpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** posting_body.tpl 2001/10/01 23:58:09 1.18
--- posting_body.tpl 2001/11/20 02:20:24 1.19
***************
*** 1,5 ****
<!-- BEGIN privmsg_extensions -->
! <table width="85%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} {SENTBOX_IMG} {SENTBOX_LINK} {OUTBOX_IMG} {OUTBOX_LINK} {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td>
--- 1,5 ----
<!-- BEGIN privmsg_extensions -->
! <table width="90%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} {SENTBOX_IMG} {SENTBOX_LINK} {OUTBOX_IMG} {OUTBOX_LINK} {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td>
***************
*** 10,16 ****
<!-- END privmsg_extensions -->
! <form action="{S_POST_ACTION}" method="POST" name="post"><table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
</tr>
</table>
--- 10,16 ----
<!-- END privmsg_extensions -->
! <form action="{S_POST_ACTION}" method="post" name="post"><table width="90%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
</tr>
</table>
***************
*** 49,55 ****
</script>
! <table width="85%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
! <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
<tr>
<td class="cat" colspan="2"><span class="cattitle"><b>{L_POST_A}</b></span></td>
--- 49,59 ----
</script>
! {POST_PREVIEW_BOX}
!
! {ERROR_BOX}
!
! <table width="90%" cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
! <td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
<tr>
<td class="cat" colspan="2"><span class="cattitle"><b>{L_POST_A}</b></span></td>
***************
*** 73,77 ****
</tr>
<tr>
! <td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><br /><span class="gensmall">{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" valign="middle"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
--- 77,81 ----
</tr>
<tr>
! <td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
<td class="row2" valign="middle"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
***************
*** 84,88 ****
</tr>
<tr>
! <td><span class="courier"><textarea name="message" rows="12" cols="45" wrap="virtual" tabindex="2">{MESSAGE}</textarea></span></td>
</tr>
</table></td>
--- 88,92 ----
</tr>
<tr>
! <td><span class="courier"><textarea name="message" rows="12" cols="50" wrap="virtual" tabindex="2">{MESSAGE}</textarea></span></td>
</tr>
</table></td>
***************
*** 180,184 ****
</table></form>
! <table width="85%" cellspacing="2" border="0" align="center">
<tr>
<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
--- 184,188 ----
</table></form>
! <table width="90%" cellspacing="2" border="0" align="center">
<tr>
<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
***************
*** 186,187 ****
--- 190,193 ----
</tr>
</table>
+
+ {TOPIC_REVIEW_BOX}
Index: posting_preview.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/posting_preview.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** posting_preview.tpl 2001/09/25 00:59:24 1.5
--- posting_preview.tpl 2001/11/20 02:20:24 1.6
***************
*** 1,3 ****
! <table width="80%" border="0" cellpadding="1" cellspacing="0" align="center">
<tr>
<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
--- 1,4 ----
!
! <table width="90%" border="0" cellpadding="0" cellspacing="0" align="center">
<tr>
<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
Index: search_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/search_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search_body.tpl 2001/09/17 00:38:33 1.2
--- search_body.tpl 2001/11/20 02:20:24 1.3
***************
*** 1,54 ****
! <form action="{S_SEARCH_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
! <tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
! </tr>
! </table>
!
! <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
! <tr>
! <td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
! <tr>
! <td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_QUERY}</b></span></td>
! </tr>
! <tr>
! <td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
! <td class="row2" colspan="2" valign="top"><input type="text" name="search_keywords" size="60" /><br /><input type="radio" name="addterms" value="any" checked="checked" /><span class="gensmall">{L_SEARCH_ANY_TERMS}<br /><input type="radio" name="addterms" value="all" />{L_SEARCH_ALL_TERMS}</span></td>
! </tr>
! <tr>
! <td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>
! <td class="row2" colspan="2" valign="top"><input type="text" name="search_author" size="40" /></td>
! </tr>
! <tr>
! <td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_OPTIONS}</b></span></td>
! </tr>
! <tr>
! <td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td>
! <td class="row2"><select name="searchforum">{S_FORUM_OPTIONS}</select></td>
! <td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
! <td class="row2"><select name="charsreqd">{S_CHARACTER_OPTIONS}</select> <span class="gen">{L_CHARACTERS}</span></td>
! </tr>
! <tr>
! <td class="row1" align="right"><span class="gen">{L_CATEGORY}: </span></td>
! <td class="row2"><select name="searchcat">{S_CATEGORY_OPTIONS}</select></td>
! <td class="row1" align="right"><span class="gen">{L_SORT_BY}: </span></td>
! <td class="row2" valign="middle"><select name="sortby">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sortdir" value="ASC" /> <span class="gensmall">{L_SORT_ASCENDING}</span> <input type="radio" name="sortdir" value="DESC" checked="checked" /> <span class="gensmall">{L_SORT_DESCENDING}</span> </td>
! </tr>
! <tr>
! <td class="row1" align="right"><span class="gen">{L_DISPLAY_RESULTS}: </span></td>
! <td class="row2"><input type="radio" name="showresults" value="posts" checked="checked" /> <span class="gensmall">{L_POSTS}</span> <input type="radio" name="showresults" value="topics" /> <span class="gensmall">{L_TOPICS}</span> </td>
! <td class="row1" align="right"><span class="gen">{L_SEARCH_PREVIOUS}: </span></td>
! <td class="row2" valign="middle">{S_TIME_OPTIONS}</td>
! </tr>
! <tr>
! <td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SEARCH}" /></td>
! </tr>
! </table></td>
! </tr>
! </table></form>
!
! <table width="98%" border="0" align="center">
! <tr>
! <td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
! <td align="right" valign="top" nowrap>{JUMPBOX}</td>
</tr>
</table>
--- 1,90 ----
! <form action="{S_SEARCH_ACTION}" method="POST">
! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
! <tr>
! <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
+ </table>
+ <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline">
+ <tr>
+ <th class="thHead" colspan="4" height="25">{L_SEARCH_QUERY}</th>
+ </tr>
+ <tr>
+ <td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br />
+ <span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
+ <td class="row2" colspan="2" valign="top"><span class="genmed">
+ <input type="text" style="width: 300px" class="post" name="search_keywords" size="30" />
+ <br />
+ <input type="radio" name="addterms" value="any" checked />
+ {L_SEARCH_ANY_TERMS}<br />
+ <input type="radio" name="addterms" value="all" />
+ {L_SEARCH_ALL_TERMS}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br />
+ <span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>
+ <td class="row2" colspan="2" valign="middle"><span class="genmed">
+ <input type="text" style="width: 300px" class="post" name="search_author" size="30" />
+ </span> </td>
+ </tr>
+ <tr>
+ <th class="thHead" colspan="4" height="25">{L_SEARCH_OPTIONS}</th>
+ </tr>
+ <tr>
+ <td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td>
+ <td class="row2"><span class="genmed">
+ <select class="post" name="searchforum">{S_FORUM_OPTIONS}
+ </select>
+ </span></td>
+ <td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
+ <td class="row2"><span class="genmed">
+ <select class="post" name="charsreqd">{S_CHARACTER_OPTIONS}
+ </select>
+ {L_CHARACTERS}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" align="right"><span class="gen">{L_CATEGORY}: </span></td>
+ <td class="row2"><span class="genmed">
+ <select class="post" name="searchcat">{S_CATEGORY_OPTIONS}
+ </select>
+ </span></td>
+ <td class="row1" align="right"><span class="gen">{L_SORT_BY}: </span></td>
+ <td class="row2" valign="middle" nowrap="nowrap"><span class="genmed">
+ <select class="post" name="sortby">{S_SORT_OPTIONS}
+
+ </select>
+ <br />
+ <input type="radio" name="sortdir" value="ASC" />
+ {L_SORT_ASCENDING}<br />
+ <input type="radio" name="sortdir" value="DESC" checked />
+ {L_SORT_DESCENDING}</span> </td>
+ </tr>
+ <tr>
+ <td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}: </span></td>
+ <td class="row2" nowrap="nowrap">
+ <input type="radio" name="showresults" value="posts" />
+ <span class="genmed">{L_POSTS}
+ <input type="radio" name="showresults" value="topics" checked="checked" />
+ {L_TOPICS}</span></td>
+ <td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}: </span></td>
+ <td class="row2" valign="middle"><span class="genmed">
+ <select class="post" name="resultdays">{S_TIME_OPTIONS}
+ </select>
+ </span></td>
+ </tr>
+ <tr>
+ <td class="catBottom" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS}
+ <input class="liteoption" type="submit" value="{L_SEARCH}" />
+ </td>
+ </tr>
+ </table>
+ <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+ <tr>
+ <td align="right" valign="middle"><span class="gensmall">{S_TIMEZONE}</span></td>
+ </tr>
+ <...
[truncated message content] |
|
From: Paul S. O. <ps...@us...> - 2001-11-20 02:16:47
|
Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv5215/admin
Modified Files:
auth_select_body.tpl disallow_body.tpl group_edit_body.tpl
group_select_body.tpl index_navigate.tpl
Log Message:
Loads'a updates, thanks mainly to 'The Black Pit', everyone buy him something nice ... or just send money to 'Black Pit', c/o P. Owen, London ...
Index: auth_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/auth_select_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_select_body.tpl 2001/07/28 16:42:12 1.1
--- auth_select_body.tpl 2001/11/20 02:16:44 1.2
***************
*** 1,17 ****
- <br clear="all" />
-
<h1>{L_AUTH_TITLE}</h1>
<p>{L_AUTH_EXPLAIN}</p>
! <table cellspacing="1" cellpadding="4" border="0" align="center">
<tr>
! <td class="cat" align="center"><span class="cattitle"><b>{L_AUTH_SELECT}</b></span></td>
</tr>
! <tr><form method="get" action="{S_AUTH_ACTION}">
<td class="row1" align="center">{S_AUTH_SELECT} <input type="submit" value="{L_LOOK_UP}"> </td>
! </form></tr>
! </table>
!
! <br clear="all" />
--- 1,14 ----
<h1>{L_AUTH_TITLE}</h1>
<p>{L_AUTH_EXPLAIN}</p>
! <form method="post" action="{S_AUTH_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
<tr>
!
! <th align="center">{L_AUTH_SELECT}</th>
</tr>
! <tr>
<td class="row1" align="center">{S_AUTH_SELECT} <input type="submit" value="{L_LOOK_UP}"> </td>
! </tr>
! </table></form>
Index: disallow_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/disallow_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** disallow_body.tpl 2001/10/15 20:15:46 1.1
--- disallow_body.tpl 2001/11/20 02:16:44 1.2
***************
*** 12,16 ****
<tr>
<td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_DEL_EXPLAIN}</span></td>
! <td class="row2">{S_DISALLOW_SELECT} &nbps;<input type="submit" name="mode" value="{L_DELETE}" /></td>
</tr>
<tr>
--- 12,16 ----
<tr>
<td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_DEL_EXPLAIN}</span></td>
! <td class="row2">{S_DISALLOW_SELECT} <input type="submit" name="mode" value="{L_DELETE}" /></td>
</tr>
<tr>
Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/group_edit_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** group_edit_body.tpl 2001/10/15 00:38:30 1.3
--- group_edit_body.tpl 2001/11/20 02:16:44 1.4
***************
*** 1,49 ****
! <form action="{S_GROUP_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
! <tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
! </tr>
! </table>
! <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
! <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
! <tr>
! <td class="cat" colspan="2"><span class="cattitle"><b>{L_GROUP_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
! <td class="row2"><input type="text" name="group_name" size="35" maxlength="40" value="{S_GROUP_NAME}" /></td>
! </tr>
! <tr>
! <td class="row1"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
! <td class="row2"><textarea name="group_description" rows=5 cols=51>{S_GROUP_DESCRIPTION}</textarea></td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! <td class="row2">{S_GROUP_MODERATOR}</td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}:</span>
! <br />
! <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
! <td class="row2"><input type="checkbox" name="delete_old_moderator" value="1" /> {L_YES}</td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
! <td class="row2"><input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN} <input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED}</td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
! <td class="row2"><input type="checkbox" name="deletegroup" value="1">{L_GROUP_DELETE_CHECK}</td>
! </tr>
! <tr>
! <td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" /> <input type="reset" value="{L_RESET}" /></span></td>
! </tr>
! </table></td>
</tr>
!
! <input type="hidden" name="mode" value="{S_GROUP_MODE}" />
! <input type="hidden" name="updategroup" value="update" />
! <input type="hidden" name="group_id" value="{GROUP_ID}" />
! </table></form>
\ No newline at end of file
--- 1,53 ----
! <h1>{L_GROUP_TITLE}</h1>
! <form action="{S_GROUP_ACTION}" method="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
! <tr>
! <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th>
! </tr>
<tr>
! <td class="row1" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
</tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
! <td class="row2" width="62%">
! <input type="text" name="group_name" size="35" maxlength="40" value="{GROUP_NAME}" />
! </td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
! <td class="row2" width="62%">
! <textarea name="group_description" rows=5 cols=51>{GROUP_DESCRIPTION}</textarea>
! </td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
! <td class="row2" width="62%">{S_SELECT_MODERATORS}</td>
! </tr>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span>
! <br />
! <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
! <td class="row2" width="62%">
! <input type="checkbox" name="delete_old_moderator" value="1">
! {L_YES}</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>
! <tr>
! <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
! <td class="row2" width="62%">
! <input type="checkbox" name="group_delete" value="1">
! {L_GROUP_DELETE_CHECK}</td>
! </tr>
! <tr>
! <td class="catBottom" colspan="2" align="center"><span class="cattitle">
! <input type="submit" name="group_update" value="{L_SUBMIT}" class="mainoption" />
!
! <input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
! </span></td>
! </tr>
! </table>{S_HIDDEN_FIELDS}</form>
Index: group_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/group_select_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** group_select_body.tpl 2001/09/06 01:44:55 1.3
--- group_select_body.tpl 2001/11/20 02:16:44 1.4
***************
*** 1,20 ****
- <br clear="all" />
-
<h1>{L_GROUP_TITLE}</h1>
<p>{L_GROUP_EXPLAIN}</p>
! <table cellspacing="1" cellpadding="4" border="0" align="center">
<tr>
! <td class="cat" align="center"><span class="cattitle"><b>{L_GROUP_SELECT}</b></span></td>
</tr>
- <tr><form method="post" action="{S_GROUP_ACTION}"><input type="hidden" name="mode" value="editgroup">
- <td class="row1" align="center">{S_GROUP_SELECT} <input type="submit" value="{L_LOOK_UP}"> </td>
- </form></tr>
<tr>
! <td class="row2" align="center"><a href="admin_groups.php?mode=newgroup">{L_GROUP_NEW}</a></td>
</tr>
! </table>
!
! <br clear="all" />
--- 1,17 ----
<h1>{L_GROUP_TITLE}</h1>
<p>{L_GROUP_EXPLAIN}</p>
! <form method="post" action="{S_GROUP_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
!
! <th class="thHead" align="center">{L_GROUP_SELECT}</th>
</tr>
<tr>
! <td class="row1" align="center">{S_GROUP_SELECT} <input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" /> </td>
</tr>
! <tr>
! <td class="catBottom" align="center"><input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td>
! </tr>
! </table></form>
Index: index_navigate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/index_navigate.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** index_navigate.tpl 2001/08/01 23:09:09 1.3
--- index_navigate.tpl 2001/11/20 02:16:44 1.4
***************
*** 1,20 ****
! <!-- a href="{U_BOARD_INDEX}" target="_top"><img src="../images/logo_medium.gif" border="0"/></a -->
! <div align="center"><font face="Impact,sans-serif" size="6"><a href="{U_BOARD_INDEX}" target="_top">phpBB2</a></font></div>
<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
<tr>
! <td ><a href="{U_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a></td>
</tr>
<!-- BEGIN catrow -->
<tr>
! <td class="cat" align="center"><span class="cattitle"><b>{catrow.CATNAME}</b></span></td>
</tr>
! <!-- BEGIN actionrow -->
<tr>
! <td><a href="{catrow.actionrow.FILE}" target="main">{catrow.actionrow.ACTIONNAME}</a></td>
</tr>
! <!-- END actionrow -->
! <!-- END catrow -->
</table>
--- 1,26 ----
! <!-- a href="{U_FORUM_INDEX}" target="_top"><img src="../images/logo_medium.gif" border="0"/></a -->
! <div align="center"><font face="Impact,sans-serif" size="6"><a href="{U_FORUM_INDEX}" target="_top">phpBB2</a></font></div>
<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
<tr>
! <td ><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></td>
</tr>
+ <tr>
+ <td ><a href="{U_FORUM_INDEX}" target="_top" class="genmed">{L_FORUM_INDEX}</a></td>
+ </tr>
+ <tr>
+ <td ><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></td>
+ </tr>
<!-- BEGIN catrow -->
<tr>
! <td class="cat" align="center"><span class="cattitle"><b>{catrow.ADMIN_CATEGORY}</b></span></td>
</tr>
! <!-- BEGIN modulerow -->
<tr>
! <td><a href="{catrow.modulerow.U_ADMIN_MODULE}" target="main">{catrow.modulerow.ADMIN_MODULE}</a></td>
</tr>
! <!-- END modulerow -->
! <!-- END catrow -->
</table>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-20 00:12:30
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv11832/language/lang_english Modified Files: lang_main.php Log Message: Minor update Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 23:56:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5868
Modified Files:
profile.php posting.php privmsg.php groupcp.php
Log Message:
Another attempt at getting universal compatibility with URI/paths ... I'm really beginning to dispise IIS ...
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** profile.php 2001/11/18 18:11:42 1.136
--- profile.php 2001/11/19 23:56:00 1.137
***************
*** 1000,1004 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
--- 1000,1004 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
***************
*** 1107,1111 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template($email_template);
--- 1107,1111 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$emailer->use_template($email_template);
***************
*** 1664,1668 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("user_activate_passwd");
--- 1664,1668 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$emailer->use_template("user_activate_passwd");
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -r1.100 -r1.101
*** posting.php 2001/11/18 18:11:42 1.100
--- posting.php 2001/11/19 23:56:00 1.101
***************
*** 1389,1393 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
for($i = 0; $i < count($email_set); $i++)
--- 1389,1393 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
for($i = 0; $i < count($email_set); $i++)
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** privmsg.php 2001/11/19 01:04:58 1.51
--- privmsg.php 2001/11/19 23:56:00 1.52
***************
*** 1014,1018 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
--- 1014,1018 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** groupcp.php 2001/11/19 14:12:08 1.25
--- groupcp.php 2001/11/19 23:56:00 1.26
***************
*** 172,176 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_request");
--- 172,176 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$emailer->use_template("group_request");
***************
*** 365,369 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_added");
--- 365,369 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$emailer->use_template("group_added");
***************
*** 478,482 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_approved");
--- 478,482 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
! $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
$emailer->use_template("group_approved");
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 23:39:27
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv676/admin
Modified Files:
admin_smilies.php
Log Message:
Yep, you guess it some more lang updates + cleanups
Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** admin_smilies.php 2001/11/17 05:39:22 1.14
--- admin_smilies.php 2001/11/19 23:39:24 1.15
***************
*** 39,48 ****
//
$phpbb_root_dir = "./../";
! if( $HTTP_GET_VARS['mode'] == 'export' && $HTTP_GET_VARS['send_file'] == 1 )
{
! $no_page_header = 1;
}
require('pagestart.inc');
! $delimeter = '=+:';
//
// Check to see what mode we should operate in.
--- 39,53 ----
//
$phpbb_root_dir = "./../";
!
! if( isset($HTTP_GET_VARS['export_pack']) )
{
! if ( $HTTP_GET_VARS['export_pack'] == "send" )
! {
! $no_page_header = true;
! }
}
require('pagestart.inc');
!
!
//
// Check to see what mode we should operate in.
***************
*** 57,60 ****
--- 62,67 ----
}
+ $delimeter = '=+:';
+
//
// Read a listing of uploaded smilies for use in the add or edit smliey code...
***************
*** 82,533 ****
// Select main mode
//
! switch($mode)
{
! case 'import':
//
! // Import a list a "Smiley Pack"
//
! $smile_pak = ( !empty($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak'];
! $clear_current = ( !empty($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current'];
! $replace_existing = ( ! empty($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace'];
! if ( !empty($smile_pak) )
{
! //
! // The user has already selected a smile_pak file.. Import it.
! //
! if( $clear_current == 'Y' )
{
! $sql = "DELETE FROM " . SMILIES_TABLE;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql);
! }
!
}
! else
{
! $sql = "SELECT code FROM ". SMILIES_TABLE;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't get current smilies", "", __LINE__, __FILE__, $sql);
! }
!
! $cur_smilies = $db->sql_fetchrowset($result);
! for( $i = 0; $i < count($cur_smilies); $i++ )
! {
! $k = $cur_smilies[$i]['code'];
! $smiles[$k] = 1;
! }
}
! $fcontents = @file($phpbb_root_path . $board_config['smilies_path'] . '/'. $smile_pak);
! if( empty($fcontents) )
{
! message_die(GENERAL_ERROR, "Couldn't read smiley pak file", "", __LINE__, __FILE__, $sql);
}
! for( $i = 0; $i < count($fcontents); $i++ )
{
! if( !get_magic_quotes_runtime() )
! {
! $fcontents[$i] = addslashes($fcontents[$i]);
! }
! $smile_data = explode($delimeter, trim($fcontents[$i]));
! for( $j = 2; $j < count($smile_data); $j++)
{
! $k = $smile_data[$j];
! if( $smiles[$k] == 1 )
{
! if( $replace_existing == 'Y' )
! {
! $sql = "UPDATE " . SMILIES_TABLE . "
! SET smile_url = '$smile_data[0]',
! emoticon = '$smile_data[1]'
! WHERE code = '$smile_data[$j]'";
!
! }
! else
! {
! $sql = '';
! }
}
else
{
! $sql = "INSERT INTO " . SMILIES_TABLE . " (
! code,
! smile_url,
! emoticon )
! VALUES(
! '$smile_data[$j]',
! '$smile_data[0]',
! '$smile_data[1]')";
!
}
! if( $sql != '' )
! {
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't update smilies!", "", __LINE__, __FILE__, $sql);
! }
}
}
}
- //
- // Ok the smilies have been imported do something...
- //
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
- $template->assign_vars(array(
- "MESSAGE_TITLE" => $lang['smiley_title'],
- "MESSAGE_TEXT" => $lang['smiley_import_success'])
- );
- $template->pparse("body");
-
}
! else
! {
! //
! // Display the script to get the smile_pak cfg file...
! //
! $smile_paks_select = "<SELECT NAME='smile_pak'><option value=''>".$lang['Select_pak']."</option>";
! while( list($key, $value) = each($smiley_paks) )
! {
! if ( !empty($value) )
! {
! $smile_paks_select .= "<option>".$value."</option>";
! }
! }
! $smile_paks_select .= "</select>";
! $replace_opt = "<input type='radio' name='replace' value='Y'> ".$lang['replace_existing'];
! $keep_opt = "<input type='radio' name='replace' value='N'> ".$lang['keep_existing'];
! $del_exist = "<input type='checkbox' name='clear_current' value='Y'>";
! $hidden_vars = "<input type='hidden' name='mode' value='import'>";
! $template->set_filenames(array(
! "body" => "admin/smile_import_body.tpl")
! );
! $template->assign_vars(array(
! "S_SMILEY_ACTION" => $PHPSELF,
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_import_inst'],
! "L_SMILEY_IMPORT" => $lang['smiley_import'],
! "L_SELECT_LBL" => $lang['choose_smile_pak'],
! "S_SMILE_SELECT" => $smile_paks_select,
! "L_IMPORT" => $lang['import'],
! "L_CONFLICTS" => $lang['smile_conflicts'],
! "S_REPLACE_OPT" => $replace_opt,
! "S_KEEP_OPT" => $keep_opt,
! "L_DEL_EXISTING" => $lang['del_existing_smileys'],
! "S_DEL_EXISTING" => $del_exist,
! "S_HIDDEN_FIELDS" => $hidden_vars)
! );
! $template->pparse("body");
! }
! break;
! case 'export':
//
! // Export our smiley config as a smiley pak...
//
! if ( $send_file == 1 )
! {
! $smile_pak = '';
! $sql = "SELECT * FROM " . SMILIES_TABLE;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
! }
!
! $resultset = $db->sql_fetchrowset($result);
! for($i = 0; $i < count($resultset); $i++ )
{
! $smile_pak .= $resultset[$i]['smile_url'] . $delimeter;
! $smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
! $smile_pak .= $resultset[$i]['code'] . "\n";
}
- header("Content-Type: text/x-delimtext; name=\"smiles.pak\"");
- header("Content-disposition: attachment; filename=smiles.pak");
- echo $smile_pak;
- exit;
}
$template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
);
$template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['smiley_title'],
! "MESSAGE_TEXT" => $lang['export_smiles'])
! );
! $template->pparse('body');
!
! break;
!
! case 'delete':
! //
! // Admin has selected to delete a smiley.
! //
! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! $sql = "DELETE FROM " . SMILIES_TABLE . "
! WHERE smilies_id = " . $smiley_id;
! $result = $db->sql_query($sql);
! if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
}
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['smiley_title'],
! "MESSAGE_TEXT" => $lang['smiley_del_success'])
! );
! $template->pparse("body");
! break;
! case 'edit':
! //
! // Admin has selected to edit a smiley.
! //
! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! $sql = "SELECT *
! FROM " . SMILIES_TABLE . "
! WHERE smilies_id = " . $smiley_id;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
! }
! $smile_data = $db->sql_fetchrow($result);
! $filename_list = "";
! for( $i = 0; $i < count($smiley_images); $i++ )
! {
! if( $smiley_images[$i] == $smile_data['smile_url'] )
! {
! $smiley_selected = "selected=\"selected\"";
! $smiley_edit_img = $smiley_images[$i];
! }
! else
! {
! $smiley_selected = "";
! }
! $filename_list .= '<option value="' . $smiley_images[$i] . '"' . $smiley_selected . '>' . $smiley_images[$i] . '</option>';
! }
! $template->set_filenames(array(
! "body" => "admin/smile_edit_body.tpl")
! );
! $s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />';
! $template->assign_vars(array(
! "SMILEY_CODE" => $smile_data['code'],
! "SMILEY_EMOTICON" => $smile_data['emoticon'],
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smile_desc'],
! "L_SMILEY_CODE" => $lang['smiley_code'],
! "L_SMILEY_URL" => $lang['smiley_url'],
! "L_SMILEY_EMOTION" => $lang['smiley_emot'],
! "L_SUBMIT" => $lang['Submit_changes'],
! "L_RESET" => $lang['Reset_changes'],
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_edit_img,
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_FILENAME_OPTIONS" => $filename_list,
! "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
! );
! $template->pparse("body");
! break;
! case "add":
! //
! // Admin has selected to add a smiley.
! //
! $template->set_filenames(array(
! "body" => "admin/smile_edit_body.tpl")
! );
! $filename_list = "";
! for( $i = 0; $i < count($smiley_images); $i++ )
! {
! $filename_list .= '<option value="' . $smiley_images[$i] . '">' . $smiley_images[$i] . '</option>';
! }
! $s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
! $template->assign_vars(array(
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
! "L_SMILEY_CODE" => $lang['smiley_code'],
! "L_SMILEY_URL" => $lang['smiley_url'],
! "L_SMILEY_EMOTION" => $lang['smiley_emot'],
! "L_SUBMIT" => $lang['Submit_changes'],
! "L_RESET" => $lang['Reset_changes'],
!
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_images[0],
!
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_FILENAME_OPTIONS" => $filename_list,
! "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
! );
! $template->pparse("body");
! break;
! case "save":
! //
! // Admin has submitted changes while editing a smiley.
! //
! //
! // Get the submitted data, being careful to ensure that we only
! // accept the data we are looking for.
! //
! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
! $smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
! //
! // Proceed with updating the smiley table.
! //
! $sql = "UPDATE " . SMILIES_TABLE . "
! SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion'
! WHERE smilies_id = $smile_id";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
! }
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['smiley_title'],
! "MESSAGE_TEXT" => $lang['smiley_edit_success'])
! );
! $template->pparse("body");
! break;
! case "savenew":
! //
! // Admin has submitted changes while adding a new smiley.
! //
! //
! // Get the submitted data being careful to ensure the the data
! // we recieve and process is only the data we are looking for.
! //
! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
! //
! // Save the data to the smiley table.
! //
! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! VALUES ('$smile_code', '$smile_url', '$smile_emotion')";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't insert new smiley", "", __LINE__, __FILE__, $sql);
! }
! $template->set_filenames(array(
! "body" => "admin/admin_message_body.tpl")
! );
! $template->assign_vars(array(
! "MESSAGE_TITLE" => $lang['smiley_title'],
! "MESSAGE_TEXT" => $lang['smiley_add_success'])
! );
! $template->pparse("body");
! break;
! default:
! //
! // This is the main display of the page before the admin has selected
! // any options.
! //
! $sql = "SELECT *
! FROM " . SMILIES_TABLE;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain smileys from database", "", __LINE__, __FILE__, $sql);
! }
! $smilies = $db->sql_fetchrowset($result);
! $template->set_filenames(array(
! "body" => "admin/smile_list_body.tpl")
! );
! $s_hidden_fields = '<input type="hidden" name="mode" value="add">';
! $s_import = '<a href="' . $PHPSELF . '?mode=import"><input type="button" value="'. $lang['import_smile_pack'] . '"></a>';
! $s_export = '<a href="' . $PHPSELF . '?mode=export"><input type="button" value="'. $lang['export_smile_pack'] . '"></a>';
! $template->assign_vars(array(
! "L_ACTION" => $lang['Action'],
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_TEXT" => $lang['smile_desc'],
! "L_DELETE" => $lang['Delete'],
! "L_EDIT" => $lang['Edit'],
! "L_SMILEY_ADD" => $lang['smile_add'],
! "L_CODE" => $lang['Code'],
! "L_EMOT" => $lang['Emotion'],
! "L_SMILE" => $lang['Smile'],
!
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_IMPORT" => $s_import,
! "S_EXPORT" => $s_export,
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"))
! );
! //
! // Loop throuh the rows of smilies setting block vars for the template.
! //
! for($i = 0; $i < count($smilies); $i++)
! {
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("smiles", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
!
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'],
! "CODE" => $smilies[$i]['code'],
! "EMOT" => $smilies[$i]['emoticon'],
!
! "U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&id=" . $smilies[$i]['smilies_id']),
! "U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&id=" . $smilies[$i]['smilies_id']))
! );
! }
! //
! // Spit out the page.
! //
! $template->pparse("body");
! break;
}
--- 89,518 ----
// Select main mode
//
! if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']) )
{
! //
! // Import a list a "Smiley Pack"
! //
! $smile_pak = ( isset($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak'];
! $clear_current = ( isset($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current'];
! $replace_existing = ( isset($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace'];
!
! if ( !empty($smile_pak) )
! {
//
! // The user has already selected a smile_pak file.. Import it.
//
! if( !empty($clear_current) )
{
! $sql = "DELETE
! FROM " . SMILIES_TABLE;
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql);
}
! }
! else
! {
! $sql = "SELECT code
! FROM ". SMILIES_TABLE;
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't get current smilies", "", __LINE__, __FILE__, $sql);
}
!
! $cur_smilies = $db->sql_fetchrowset($result);
!
! for( $i = 0; $i < count($cur_smilies); $i++ )
{
! $k = $cur_smilies[$i]['code'];
! $smiles[$k] = 1;
}
! }
!
! $fcontents = @file($phpbb_root_path . $board_config['smilies_path'] . '/'. $smile_pak);
!
! if( empty($fcontents) )
! {
! message_die(GENERAL_ERROR, "Couldn't read smiley pak file", "", __LINE__, __FILE__, $sql);
! }
!
! for( $i = 0; $i < count($fcontents); $i++ )
! {
! $smile_data = explode($delimeter, trim(addslashes($fcontents[$i])));
!
! for( $j = 2; $j < count($smile_data); $j++)
{
! $k = $smile_data[$j];
!
! if( $smiles[$k] == 1 )
{
! if( !empty($replace_existing) )
{
! $sql = "UPDATE " . SMILIES_TABLE . "
! SET smile_url = '$smile_data[0]',
! emoticon = '$smile_data[1]'
! WHERE code = '$smile_data[$j]'";
!
}
else
{
! $sql = '';
}
! }
! else
! {
! $sql = "INSERT INTO " . SMILIES_TABLE . " (
! code,
! smile_url,
! emoticon )
! VALUES(
! '$smile_data[$j]',
! '$smile_data[0]',
! '$smile_data[1]')";
!
! }
+ if( $sql != '' )
+ {
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(GENERAL_ERROR, "Couldn't update smilies!", "", __LINE__, __FILE__, $sql);
}
}
}
}
!
! $message = $lang['smiley_import_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$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
! {
//
! // Display the script to get the smile_pak cfg file...
//
! $smile_paks_select = "<select name='smile_pak'><option value=''>" . $lang['Select_pak'] . "</option>";
! while( list($key, $value) = @each($smiley_paks) )
! {
! if ( !empty($value) )
{
! $smile_paks_select .= "<option>" . $value . "</option>";
}
}
+ $smile_paks_select .= "</select>";
+
+ $hidden_vars = "<input type='hidden' name='mode' value='import'>";
+
$template->set_filenames(array(
! "body" => "admin/smile_import_body.tpl")
);
$template->assign_vars(array(
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_import_inst'],
! "L_SMILEY_IMPORT" => $lang['smiley_import'],
! "L_SELECT_LBL" => $lang['choose_smile_pak'],
! "L_IMPORT" => $lang['import'],
! "L_CONFLICTS" => $lang['smile_conflicts'],
! "L_DEL_EXISTING" => $lang['del_existing_smileys'],
! "L_REPLACE_EXISTING" => $lang['replace_existing'],
! "L_KEEP_EXISTING" => $lang['keep_existing'],
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
! "S_SMILE_SELECT" => $smile_paks_select,
! "S_HIDDEN_FIELDS" => $hidden_vars)
! );
! $template->pparse("body");
! }
! }
! else if( isset($HTTP_GET_VARS['export_pack']) )
! {
! //
! // Export our smiley config as a smiley pak...
! //
! if ( $HTTP_GET_VARS['export_pack'] == "send" )
! {
! $sql = "SELECT *
! FROM " . SMILIES_TABLE;
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
}
! $resultset = $db->sql_fetchrowset($result);
! $smile_pak = "";
! for($i = 0; $i < count($resultset); $i++ )
! {
! $smile_pak .= $resultset[$i]['smile_url'] . $delimeter;
! $smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
! $smile_pak .= $resultset[$i]['code'] . "\n";
! }
! header("Content-Type: text/x-delimtext; name=\"smiles.pak\"");
! header("Content-disposition: attachment; filename=smiles.pak");
! echo $smile_pak;
! exit;
! }
! $message = sprintf($lang['export_smiles'], "<a href=\"" . append_sid("admin_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$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 if( isset($HTTP_GET_VARS['add']) )
! {
! //
! // Admin has selected to add a smiley.
! //
!
! $template->set_filenames(array(
! "body" => "admin/smile_edit_body.tpl")
! );
!
! $filename_list = "";
! for( $i = 0; $i < count($smiley_images); $i++ )
! {
! $filename_list .= '<option value="' . $smiley_images[$i] . '">' . $smiley_images[$i] . '</option>';
! }
! $s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
! $template->assign_vars(array(
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
! "L_SMILEY_CODE" => $lang['smiley_code'],
! "L_SMILEY_URL" => $lang['smiley_url'],
! "L_SMILEY_EMOTION" => $lang['smiley_emot'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_images[0],
!
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_FILENAME_OPTIONS" => $filename_list,
! "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
! );
! $template->pparse("body");
! }
! else if ( $mode != "" )
! {
! switch( $mode )
! {
! case 'delete':
! //
! // Admin has selected to delete a smiley.
! //
! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! $sql = "DELETE FROM " . SMILIES_TABLE . "
! WHERE smilies_id = " . $smiley_id;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
! }
! $message = $lang['smiley_del_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
! break;
! case 'edit':
! //
! // Admin has selected to edit a smiley.
! //
! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! $sql = "SELECT *
! FROM " . SMILIES_TABLE . "
! WHERE smilies_id = " . $smiley_id;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
! }
! $smile_data = $db->sql_fetchrow($result);
! $filename_list = "";
! for( $i = 0; $i < count($smiley_images); $i++ )
! {
! if( $smiley_images[$i] == $smile_data['smile_url'] )
! {
! $smiley_selected = "selected=\"selected\"";
! $smiley_edit_img = $smiley_images[$i];
! }
! else
! {
! $smiley_selected = "";
! }
! $filename_list .= '<option value="' . $smiley_images[$i] . '"' . $smiley_selected . '>' . $smiley_images[$i] . '</option>';
! }
! $template->set_filenames(array(
! "body" => "admin/smile_edit_body.tpl")
! );
! $s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />';
! $template->assign_vars(array(
! "SMILEY_CODE" => $smile_data['code'],
! "SMILEY_EMOTICON" => $smile_data['emoticon'],
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smile_desc'],
! "L_SMILEY_CODE" => $lang['smiley_code'],
! "L_SMILEY_URL" => $lang['smiley_url'],
! "L_SMILEY_EMOTION" => $lang['smiley_emot'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_edit_img,
!
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_FILENAME_OPTIONS" => $filename_list,
! "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
! );
! $template->pparse("body");
! break;
! case "save":
! //
! // Admin has submitted changes while editing a smiley.
! //
! //
! // Get the submitted data, being careful to ensure that we only
! // accept the data we are looking for.
! //
! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
! $smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
! //
! // Proceed with updating the smiley table.
! //
! $sql = "UPDATE " . SMILIES_TABLE . "
! SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion'
! WHERE smilies_id = $smile_id";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
! }
! $message = $lang['smiley_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
! break;
! case "savenew":
! //
! // Admin has submitted changes while adding a new smiley.
! //
! //
! // Get the submitted data being careful to ensure the the data
! // we recieve and process is only the data we are looking for.
! //
! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
! //
! // Save the data to the smiley table.
! //
! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! VALUES ('$smile_code', '$smile_url', '$smile_emotion')";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't insert new smiley", "", __LINE__, __FILE__, $sql);
! }
! $message = $lang['smiley_add_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
! message_die(GENERAL_MESSAGE, $message);
! break;
! }
! }
! else
! {
! //
! // This is the main display of the page before the admin has selected
! // any options.
! //
! $sql = "SELECT *
! FROM " . SMILIES_TABLE;
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain smileys from database", "", __LINE__, __FILE__, $sql);
! }
! $smilies = $db->sql_fetchrowset($result);
!
! $template->set_filenames(array(
! "body" => "admin/smile_list_body.tpl")
! );
!
! $template->assign_vars(array(
! "L_ACTION" => $lang['Action'],
! "L_SMILEY_TITLE" => $lang['smiley_title'],
! "L_SMILEY_TEXT" => $lang['smile_desc'],
! "L_DELETE" => $lang['Delete'],
! "L_EDIT" => $lang['Edit'],
! "L_SMILEY_ADD" => $lang['smile_add'],
! "L_CODE" => $lang['Code'],
! "L_EMOT" => $lang['Emotion'],
! "L_SMILE" => $lang['Smile'],
! "L_IMPORT_PACK" => $lang['import_smile_pack'],
! "L_EXPORT_PACK" => $lang['export_smile_pack'],
!
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"))
! );
!
! //
! // Loop throuh the rows of smilies setting block vars for the template.
! //
! for($i = 0; $i < count($smilies); $i++)
! {
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars("smiles", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
!
! "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'],
! "CODE" => $smilies[$i]['code'],
! "EMOT" => $smilies[$i]['emoticon'],
!
! "U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&id=" . $smilies[$i]['smilies_id']),
! "U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&id=" . $smilies[$i]['smilies_id']))
! );
! }
!
! //
! // Spit out the page.
! //
! $template->pparse("body");
}
***************
*** 537,539 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 522,524 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 23:39:27
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv676/language/lang_english Modified Files: lang_admin.php Log Message: Yep, you guess it some more lang updates + cleanups Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** lang_admin.php 2001/11/19 21:57:50 1.5 --- lang_admin.php 2001/11/19 23:39:24 1.6 *************** *** 300,333 **** $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; // // Smiley Management // - $lang['smiley_return'] = "Return to smiley listing"; - $lang['smiley_del_success'] = "The smiley was successfully removed"; $lang['smiley_title'] = "Smiles Editing Utility"; $lang['smiley_code'] = "Smiley Code"; $lang['smiley_url'] = "Smiley Image File"; $lang['smiley_emot'] = "Smiley Emotion"; - $lang['smiley_add_success'] = "The smiley was successfully added"; - $lang['smiley_edit_success'] = "The smiley was successfully updated"; $lang['smile_add'] = "Add a new Smiley"; - $lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages."; - $lang['smiley_config'] = "Smiley Configuration"; $lang['Smile'] = "Smile"; $lang['Emotion'] = "Emotion"; ! $lang['Select_pak'] = "Select Pak File"; $lang['replace_existing'] = "Replace Existing Smiley"; $lang['keep_existing'] = "Keep Existing Smiley"; ! $lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the proper Smiley directory for your installation. Then select the correct information in this form to import the smiley pack."; $lang['smiley_import'] = "Smiley Pack Import"; ! $lang['choose_smile_pak'] = "Choose the correct Smile Pack .pak file"; $lang['import'] = "Import Smileys"; $lang['smile_conflicts'] = "What should be done in case of conflicts"; ! $lang['del_existing_smileys'] = "Delete all existing smileys before import"; $lang['import_smile_pack'] = "Import Smiley Pack"; $lang['export_smile_pack'] = "Create Smiley Pack"; ! $lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, <a href='admin_smilies.php?mode=export&send_file=1'>Click Here</a> to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension. Then create a zip file containing all of your smiley images plus this .pak configuration file."; ! $lang['smiley_import_success'] = "The smiley pack was imported successfully!"; // --- 300,336 ---- $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; + // // Smiley Management // $lang['smiley_title'] = "Smiles Editing Utility"; + $lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages."; + + $lang['smiley_config'] = "Smiley Configuration"; $lang['smiley_code'] = "Smiley Code"; $lang['smiley_url'] = "Smiley Image File"; $lang['smiley_emot'] = "Smiley Emotion"; $lang['smile_add'] = "Add a new Smiley"; $lang['Smile'] = "Smile"; $lang['Emotion'] = "Emotion"; ! ! $lang['Select_pak'] = "Select Pack (.pak) File"; $lang['replace_existing'] = "Replace Existing Smiley"; $lang['keep_existing'] = "Keep Existing Smiley"; ! $lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the appropriate Smiley directory for your installation. Then select the correct information in this form to import the smiley pack."; $lang['smiley_import'] = "Smiley Pack Import"; ! $lang['choose_smile_pak'] = "Choose a Smile Pack .pak file"; $lang['import'] = "Import Smileys"; $lang['smile_conflicts'] = "What should be done in case of conflicts"; ! $lang['del_existing_smileys'] = "Delete existing smileys before import"; $lang['import_smile_pack'] = "Import Smiley Pack"; $lang['export_smile_pack'] = "Create Smiley Pack"; ! $lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, click %sHere%s to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension. Then create a zip file containing all of your smiley images plus this .pak configuration file."; + $lang['smiley_add_success'] = "The Smiley was successfully added"; + $lang['smiley_edit_success'] = "The Smiley was successfully updated"; + $lang['smiley_import_success'] = "The Smiley Pack was imported successfully!"; + $lang['smiley_del_success'] = "The Smiley was successfully removed"; + $lang['Click_return_smileadmin'] = "Click %sHere%s to return to Smiley Administration"; // |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 23:39:27
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv676/templates/subSilver/admin
Modified Files:
smile_import_body.tpl smile_list_body.tpl
Log Message:
Yep, you guess it some more lang updates + cleanups
Index: smile_import_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/smile_import_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** smile_import_body.tpl 2001/11/07 21:44:07 1.1
--- smile_import_body.tpl 2001/11/19 23:39:24 1.2
***************
*** 13,25 ****
</tr>
<tr>
! <td class="row1">{L_CONFLICTS}</td>
! <td class="row1">{S_REPLACE_OPT}<br>{S_KEEP_OPT}</td>
</tr>
<tr>
! <td class="row2">{L_DEL_EXISTING}</td>
! <td class="row2">{S_DEL_EXISTING}</td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_IMPORT}" /></td>
</tr>
</table></form>
--- 13,24 ----
</tr>
<tr>
! <td class="row1">{L_DEL_EXISTING}</td>
! <td class="row1"><input type="checkbox" name="clear_current" value="1" /></td>
</tr>
<tr>
! <td class="row2" colspan="2" align="center">{L_CONFLICTS}<br /><input type="radio" name="replace" value="1" checked="checked"/> {L_REPLACE_EXISTING} <input type="radio" name="replace" value="0" /> {L_KEEP_EXISTING}</td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoption" name="import_pack" type="submit" value="{L_IMPORT}" /></td>
</tr>
</table></form>
Index: smile_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/smile_list_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** smile_list_body.tpl 2001/11/07 21:44:07 1.4
--- smile_list_body.tpl 2001/11/19 23:39:24 1.5
***************
*** 21,25 ****
<!-- END smiles -->
<tr>
! <td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SMILEY_ADD}" class="mainoption" />{S_IMPORT}{S_EXPORT}
</tr>
</table></form>
--- 21,25 ----
<!-- END smiles -->
<tr>
! <td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_SMILEY_ADD}" class="mainoption" /> <input class="liteoption" type="submit" name="import_pack" value="{L_IMPORT_PACK}"> <input class="liteoption" type="submit" name="export_pack" value="{L_EXPORT_PACK}"></td>
</tr>
</table></form>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 21:57:54
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv3124/language/lang_english Modified Files: lang_admin.php Log Message: More lang updates Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** lang_admin.php 2001/11/19 20:30:52 1.4 --- lang_admin.php 2001/11/19 21:57:50 1.5 *************** *** 278,281 **** --- 278,302 ---- $lang['Forum_edit_delete_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side"; + $lang['Move_contents'] = "Move all contents"; + $lang['Forum_delete'] = "Delete Forum"; + $lang['Forum_delete_explain'] = "The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained."; + + $lang['Forum_settings'] = "General Forum Settings"; + $lang['Forum_name'] = "Forum name"; + $lang['Forum_desc'] = "Description"; + $lang['Forum_status'] = "Forum status"; + $lang['Forum_pruning'] = "Auto-pruning"; + + $lang['Move_and_Delete'] = "Move and Delete"; + + $lang['Delete_all_posts'] = "Delete all posts"; + $lang['Nowhere_to_move'] = "Nowhere to move too"; + + $lang['Edit_Category'] = "Edit Category"; + $lang['Edit_Category_explain'] = "Use this form to modify a categories name."; + + $lang['Forums_updated'] = "Forum and Category information updated successfully"; + + $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; // |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 21:57:54
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv3124/templates/subSilver/admin
Modified Files:
forum_edit_body.tpl forum_delete_body.tpl
category_edit_body.tpl
Log Message:
More lang updates
Index: forum_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_edit_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** forum_edit_body.tpl 2001/10/14 15:55:50 1.3
--- forum_edit_body.tpl 2001/11/19 21:57:50 1.4
***************
*** 4,70 ****
<p>{L_FORUM_EXPLAIN}</p>
! <form action="{S_FORUM_ACTION}" method="POST">
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
! <th class="thHead" colspan="2">General Forum Settings</th>
</tr>
<tr>
! <td class="row1">Forum Name:</td>
! <td class="row2">
! <input type="text" size="25" name="forumname" value="{FORUMNAME}" class="post" />
! </td>
</tr>
<tr>
! <td class="row1">Description:</td>
! <td class="row2">
! <textarea rows="5" cols="45" wrap="virtual" name="forumdesc" class="post">{DESCRIPTION}</textarea>
! </td>
</tr>
<tr>
! <td class="row1">Category:</td>
! <td class="row2">
! <select name="cat_id">{S_CATLIST}</select>
! </td>
</tr>
<tr>
! <td class="row1">Forum Status:</td>
! <td class="row2">
! <select name="forumstatus">{S_STATUSLIST}</select>
! </td>
</tr>
<tr>
! <td class="row1">Auto Pruning:</td>
! <td class="row2">
! <table>
<tr>
<td align="right" valign="middle">{L_ENABLED}</td>
! <td align="left" valign="middle">
! <input type="checkbox" name="prune_enable" value="1" {S_PRUNE_ENABLED} />
! </td>
</tr>
<tr>
<td align="right" valign="middle">{L_PRUNE_DAYS}</td>
! <td align="left" valign="middle">
! <input type="text" name="prune_days" value="{S_PRUNE_DAYS}" size="5" class="post" />
! {L_DAYS}</td>
</tr>
<tr>
<td align="right" valign="middle">{L_PRUNE_FREQ}</td>
! <td align="left" valign="middle">
! <input type="text" name="prune_freq" value="{S_PRUNE_FREQ}" size="5" class="post" />
! {L_DAYS}</td>
</tr>
! </table>
! </td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">
! <input type="hidden" name="mode" value="{S_NEWMODE}" />
! <input type="hidden" name="forum_id" value="{S_FORUMID}" />
! <input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
! </td>
</tr>
</table>
</form>
! <br clear="all">
--- 4,50 ----
<p>{L_FORUM_EXPLAIN}</p>
! <form action="{S_FORUM_ACTION}" method="post">
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
! <th class="thHead" colspan="2">{L_FORUM_SETTINGS}</th>
</tr>
<tr>
! <td class="row1">{L_FORUM_NAME}</td>
! <td class="row2"><input type="text" size="25" name="forumname" value="{FORUM_NAME}" class="post" /></td>
</tr>
<tr>
! <td class="row1">{L_FORUM_DESCRIPTION}</td>
! <td class="row2"><textarea rows="5" cols="45" wrap="virtual" name="forumdesc" class="post">{DESCRIPTION}</textarea></td>
</tr>
<tr>
! <td class="row1">{L_CATEGORY}</td>
! <td class="row2"><select name="cat_id">{S_CAT_LIST}</select></td>
</tr>
<tr>
! <td class="row1">{L_FORUM_STATUS}</td>
! <td class="row2"><select name="forumstatus">{S_STATUS_LIST}</select></td>
</tr>
<tr>
! <td class="row1">{L_AUTO_PRUNE}</td>
! <td class="row2"><table cellspacing="0" cellpadding="1" border="0">
<tr>
<td align="right" valign="middle">{L_ENABLED}</td>
! <td align="left" valign="middle"><input type="checkbox" name="prune_enable" value="1" {S_PRUNE_ENABLED} /></td>
</tr>
<tr>
<td align="right" valign="middle">{L_PRUNE_DAYS}</td>
! <td align="left" valign="middle"> <input type="text" name="prune_days" value="{PRUNE_DAYS}" size="5" class="post" /> {L_DAYS}</td>
</tr>
<tr>
<td align="right" valign="middle">{L_PRUNE_FREQ}</td>
! <td align="left" valign="middle"> <input type="text" name="prune_freq" value="{PRUNE_FREQ}" size="5" class="post" /> {L_DAYS}</td>
</tr>
! </table></td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{S_SUBMIT_VALUE}" class="mainoption" /></td>
</tr>
</table>
</form>
! <br clear="all" />
Index: forum_delete_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/forum_delete_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** forum_delete_body.tpl 2001/10/14 15:55:50 1.3
--- forum_delete_body.tpl 2001/11/19 21:57:51 1.4
***************
*** 1,26 ****
! <h1>Delete</h1>
! <p>The form below will allow you to delete a forum/category and decide where you want to put all topics/forums inside that forum/category.</p>
! <form action="{S_FORUM_ACTION}" method="POST">
<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
! <th colspan="2" class="thHead">Delete</th>
</tr>
<tr>
! <td class="row1">Name:</td>
<td class="row1"><span class="row1">{NAME}</span></td>
</tr>
<tr>
! <td class="row1">Move everything to:</td>
! <td class="row1"> {S_SELECT_TO} </td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">
! <input type="hidden" name="mode" value="{S_NEWMODE}" />
! <input type="hidden" name="from_id" value="{S_FROM_ID}" />
! <input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
! </td>
</tr>
</table>
--- 1,22 ----
! <h1>{L_FORUM_DELETE}</h1>
! <p>{L_FORUM_DELETE_EXPLAIN}</p>
! <form action="{S_FORUM_ACTION}" method="post">
<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
! <th colspan="2" class="thHead">{L_FORUM_DELETE}</th>
</tr>
<tr>
! <td class="row1">{L_FORUM_NAME}</td>
<td class="row1"><span class="row1">{NAME}</span></td>
</tr>
<tr>
! <td class="row1">{L_MOVE_CONTENTS}</td>
! <td class="row1">{S_SELECT_TO}</td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{S_SUBMIT_VALUE}" class="mainoption" /></td>
</tr>
</table>
Index: category_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/category_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** category_edit_body.tpl 2001/10/09 13:37:48 1.2
--- category_edit_body.tpl 2001/11/19 21:57:51 1.3
***************
*** 1,28 ****
- <br />
! <h1>Edit Category</h1>
! <p>Use this form to modify a category.</p>
! <form action="{S_FORUM_ACTION}" method="POST">
<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
! <th class="thHead" colspan="2">Modify Category</th>
</tr>
<tr>
! <td class="row1">Category Name:</td>
! <td class="row2">
! <input type="text" size="25" name="cat_title" value="{CAT_TITLE}" />
! </td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">
! <input type="hidden" name="mode" value="{S_NEWMODE}" />
! <input type="hidden" name="cat_id" value="{S_CATID}" />
! <input type="submit" name="submit" value="{BUTTONVALUE}" class="mainoption" />
! </td>
</tr>
</table>
</form>
! <br clear="all">
--- 1,21 ----
! <h1>{L_EDIT_CATEGORY}</h1>
! <p>{L_EDIT_CATEGORY_EXPLAIN}</p>
! <form action="{S_FORUM_ACTION}" method="post">
<table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
! <th class="thHead" colspan="2">{L_EDIT_CATEGORY}</th>
</tr>
<tr>
! <td class="row1">{L_CATEGORY}</td>
! <td class="row2"><input type="text" size="25" name="cat_title" value="{CAT_TITLE}" /></td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{S_SUBMIT_VALUE}" class="mainoption" /></td>
</tr>
</table>
</form>
! <br clear="all" />
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 21:57:54
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv3124/admin
Modified Files:
admin_forums.php
Log Message:
More lang updates
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_forums.php 2001/10/30 23:44:39 1.25
--- admin_forums.php 2001/11/19 21:57:50 1.26
***************
*** 77,84 ****
$count = $count['total'];
-
$sql = "SELECT *
FROM $table
! WHERE $idfield = $id";
if( !$result = $db->sql_query($sql) )
{
--- 77,84 ----
$count = $count['total'];
$sql = "SELECT *
FROM $table
! WHERE $idfield = $id";
!
if( !$result = $db->sql_query($sql) )
{
***************
*** 290,305 ****
);
$template->assign_vars(array(
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! 'S_CATLIST' => $catlist,
! 'S_STATUSLIST' => $statuslist,
! 'S_FORUMID' => $forum_id,
! 'S_NEWMODE' => $newmode,
'S_PRUNE_ENABLED' => $prune_enabled,
- 'S_PRUNE_DAYS' => ( isset($pr_row['prune_days']) ) ? $pr_row['prune_days'] : 7,
- 'S_PRUNE_FREQ' => ( isset($pr_row['prune_freq']) ) ? $pr_row['prune_freq'] : 1,
"L_FORUM_TITLE" => $l_title,
"L_FORUM_EXPLAIN" => $lang['Forum_edit_delete_explain'],
'L_ENABLED' => $lang['Enabled'],
'L_PRUNE_DAYS' => $lang['prune_days'],
--- 290,311 ----
);
+ $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode .'" /><input type="hidden" name="forum_id" value="' . $forum_id . '" />';
+
$template->assign_vars(array(
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! 'S_SUBMIT_VALUE' => $buttonvalue,
! 'S_CAT_LIST' => $catlist,
! 'S_STATUS_LIST' => $statuslist,
'S_PRUNE_ENABLED' => $prune_enabled,
"L_FORUM_TITLE" => $l_title,
"L_FORUM_EXPLAIN" => $lang['Forum_edit_delete_explain'],
+ "L_FORUM_SETTINGS" => $lang['Forum_settings'],
+ "L_FORUM_NAME" => $lang['Forum_name'],
+ "L_CATEGORY" => $lang['Category'],
+ "L_FORUM_DESCRIPTION" => $lang['Forum_desc'],
+ "L_FORUM_STATUS" => $lang['Forum_status'],
+ "L_AUTO_PRUNE" => $lang['Forum_pruning'],
'L_ENABLED' => $lang['Enabled'],
'L_PRUNE_DAYS' => $lang['prune_days'],
***************
*** 307,313 ****
'L_DAYS' => $lang['days'],
! 'FORUMNAME' => $forumname,
! 'DESCRIPTION' => $forumdesc,
! 'BUTTONVALUE' => $buttonvalue)
);
$template->pparse("body");
--- 313,320 ----
'L_DAYS' => $lang['days'],
! 'PRUNE_DAYS' => ( isset($pr_row['prune_days']) ) ? $pr_row['prune_days'] : 7,
! 'PRUNE_FREQ' => ( isset($pr_row['prune_freq']) ) ? $pr_row['prune_freq'] : 1,
! 'FORUM_NAME' => $forumname,
! 'DESCRIPTION' => $forumdesc)
);
$template->pparse("body");
***************
*** 325,329 ****
$sql = "SELECT MAX(forum_order) AS max_order
FROM " . FORUMS_TABLE . "
! WHERE cat_id = " . $HTTP_POST_VARS['cat_id'];
if( !$result = $db->sql_query($sql) )
{
--- 332,336 ----
$sql = "SELECT MAX(forum_order) AS max_order
FROM " . FORUMS_TABLE . "
! WHERE cat_id = " . intval($HTTP_POST_VARS['cat_id']);
if( !$result = $db->sql_query($sql) )
{
***************
*** 371,387 ****
}
! $show_index = TRUE;
break;
case 'modforum':
// Modify a forum in the DB
! if( $HTTP_POST_VARS['prune_enable'] != 1)
{
! $HTTP_POST_VARS['prune_enable'] = 0;
}
$sql = "UPDATE " . FORUMS_TABLE . "
! SET forum_name = '" . $HTTP_POST_VARS['forumname'] . "', cat_id = " . $HTTP_POST_VARS['cat_id'] . ", forum_desc = '" . $HTTP_POST_VARS['forumdesc'] . "', forum_status = " . $HTTP_POST_VARS['forumstatus'] . ", prune_enable = " . $HTTP_POST_VARS['prune_enable'] . "
! WHERE forum_id = ".$HTTP_POST_VARS['forum_id'];
if( !$result = $db->sql_query($sql) )
{
--- 378,400 ----
}
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
!
break;
case 'modforum':
// Modify a forum in the DB
! if( isset($HTTP_POST_VARS['prune_enable']))
{
! if( $HTTP_POST_VARS['prune_enable'] != 1 )
! {
! $HTTP_POST_VARS['prune_enable'] = 0;
! }
}
$sql = "UPDATE " . FORUMS_TABLE . "
! SET forum_name = '" . $HTTP_POST_VARS['forumname'] . "', cat_id = " . intval($HTTP_POST_VARS['cat_id']) . ", forum_desc = '" . $HTTP_POST_VARS['forumdesc'] . "', forum_status = " . intval($HTTP_POST_VARS['forumstatus']) . ", prune_enable = " . intval($HTTP_POST_VARS['prune_enable']) . "
! WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
if( !$result = $db->sql_query($sql) )
{
***************
*** 398,402 ****
$sql = "SELECT *
FROM " . PRUNE_TABLE . "
! WHERE forum_id = " . $HTTP_POST_VARS['forum_id'];
if( !$result = $db->sql_query($sql) )
{
--- 411,415 ----
$sql = "SELECT *
FROM " . PRUNE_TABLE . "
! WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
if( !$result = $db->sql_query($sql) )
{
***************
*** 407,417 ****
{
$sql = "UPDATE " . PRUNE_TABLE . "
! SET prune_days = " . $HTTP_POST_VARS['prune_days'] . ", prune_freq = " . $HTTP_POST_VARS['prune_freq'] . "
! WHERE forum_id = " . $HTTP_POST_VARS['forum_id'];
}
else
{
$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! VALUES(" . $HTTP_POST_VARS['forum_id'] . ", " . $HTTP_POST_VARS['prune_days'] . ", " . $HTTP_POST_VARS['prune_freq'] . ")";
}
--- 420,430 ----
{
$sql = "UPDATE " . PRUNE_TABLE . "
! SET prune_days = " . intval($HTTP_POST_VARS['prune_days']) . ", prune_freq = " . intval($HTTP_POST_VARS['prune_freq']) . "
! WHERE forum_id = " . intval($HTTP_POST_VARS['forum_id']);
}
else
{
$sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq)
! VALUES(" . intval($HTTP_POST_VARS['forum_id']) . ", " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")";
}
***************
*** 421,425 ****
}
}
! $show_index = TRUE;
break;
--- 434,442 ----
}
}
!
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
!
break;
***************
*** 452,464 ****
}
! $show_index = TRUE;
break;
case 'editcat':
// Show form to edit a category
$newmode = 'modcat';
! $buttonvalue = 'Change';
- $cat_id = $HTTP_GET_VARS['cat_id'];
$row = get_info('category', $cat_id);
$cat_title = $row['cat_title'];
--- 469,487 ----
}
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
!
break;
case 'editcat':
+ //
// Show form to edit a category
+ //
$newmode = 'modcat';
! $buttonvalue = $lang['Update'];
!
! $cat_id = intval($HTTP_GET_VARS['cat_id']);
$row = get_info('category', $cat_id);
$cat_title = $row['cat_title'];
***************
*** 467,476 ****
"body" => "admin/category_edit_body.tpl")
);
$template->assign_vars(array(
! 'CAT_TITLE' => $cat_title,
! 'S_CATID' => $cat_id,
! 'S_NEWMODE' => $newmode,
! 'BUTTONVALUE' => $buttonvalue)
);
$template->pparse("body");
break;
--- 490,508 ----
"body" => "admin/category_edit_body.tpl")
);
+
+ $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="cat_id" value="' . $cat_id . '" />';
+
$template->assign_vars(array(
! "CAT_TITLE" => $cat_title,
!
! "L_EDIT_CATEGORY" => $lang['Edit_Category'],
! "L_EDIT_CATEGORY_EXPLAIN" => $lang['Edit_Category_explain'],
! "L_CATEGORY" => $lang['Category'],
!
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! 'S_SUBMIT_VALUE' => $buttonvalue,
! "S_FORUM_ACTION" => append_sid("admin_forums.$phpEx"))
);
+
$template->pparse("body");
break;
***************
*** 480,500 ****
$sql = "UPDATE " . CATEGORIES_TABLE . "
SET cat_title = '" . $HTTP_POST_VARS['cat_title'] . "'
! WHERE cat_id = " . $HTTP_POST_VARS['cat_id'];
if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't update forum information", "", __LINE__, __FILE__, $sql);
}
! $show_index = TRUE;
break;
case 'deleteforum':
// Show form to delete a forum
! $forum_id = $HTTP_GET_VARS['forum_id'];
$select_to = '<select name="to_id">';
! $select_to .= "<option value=\"-1\"$s>Delete all posts</option>\n";
$select_to .= get_list('forum', $forum_id, 0);
$select_to .= '</select>';
! $buttonvalue = "Move&Delete";
$newmode = 'movedelforum';
$foruminfo = get_info('forum', $forum_id);
$name = $foruminfo['forum_name'];
--- 512,540 ----
$sql = "UPDATE " . CATEGORIES_TABLE . "
SET cat_title = '" . $HTTP_POST_VARS['cat_title'] . "'
! WHERE cat_id = " . intval($HTTP_POST_VARS['cat_id']);
if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't update forum information", "", __LINE__, __FILE__, $sql);
}
!
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
!
break;
case 'deleteforum':
// Show form to delete a forum
! $forum_id = intval($HTTP_GET_VARS['forum_id']);
!
$select_to = '<select name="to_id">';
! $select_to .= "<option value=\"-1\"$s>" . $lang['Delete_all_posts'] . "</option>\n";
$select_to .= get_list('forum', $forum_id, 0);
$select_to .= '</select>';
!
! $buttonvalue = $lang['Move_and_Delete'];
!
$newmode = 'movedelforum';
+
$foruminfo = get_info('forum', $forum_id);
$name = $foruminfo['forum_name'];
***************
*** 503,514 ****
"body" => "admin/forum_delete_body.tpl")
);
$template->assign_vars(array(
! 'NAME' => $name,
! 'S_FORUM_ACTION' => $PHP_SELF,
! 'S_FROM_ID' => $forum_id,
'S_SELECT_TO' => $select_to,
! 'S_NEWMODE' => $newmode,
! 'BUTTONVALUE' => $buttonvalue)
);
$template->pparse("body");
break;
--- 543,562 ----
"body" => "admin/forum_delete_body.tpl")
);
+
+ $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="from_id" value="' . $forum_id . '" />';
+
$template->assign_vars(array(
! "NAME" => $name,
!
! "L_FORUM_DELETE" => $lang['Forum_delete'],
! "L_FORUM_DELETE_EXPLAIN" => $lang['Forum_delete_explain'],
! "L_MOVE_CONTENTS" => $lang['Move_contents'],
! "L_FORUM_NAME" => $lang['Forum_name'],
!
! 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
'S_SELECT_TO' => $select_to,
! 'S_SUBMIT_VALUE' => $buttonvalue)
);
+
$template->pparse("body");
break;
***************
*** 522,526 ****
$delete_old = intval($HTTP_POST_VARS['delete_old']);
-
// Either delete or move all posts in a forum
if($to_id == -1)
--- 570,573 ----
***************
*** 566,570 ****
}
! $show_index = TRUE;
break;
--- 613,619 ----
}
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
!
! message_die(GENERAL_MESSAGE, $message);
break;
***************
*** 576,580 ****
$cat_id = intval($HTTP_GET_VARS['cat_id']);
! $buttonvalue = "Move&Delete";
$newmode = 'movedelcat';
$catinfo = get_info('category', $cat_id);
--- 625,629 ----
$cat_id = intval($HTTP_GET_VARS['cat_id']);
! $buttonvalue = $lang['Move_and_Delete'];
$newmode = 'movedelcat';
$catinfo = get_info('category', $cat_id);
***************
*** 598,602 ****
else
{
! $select_to = 'Nowhere to move';
}
}
--- 647,651 ----
else
{
! $select_to = $lang['Nowhere_to_move'];
}
}
***************
*** 611,622 ****
"body" => "admin/forum_delete_body.tpl")
);
$template->assign_vars(array(
! 'NAME' => $name,
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
- 'S_FROM_ID' => $cat_id,
'S_SELECT_TO' => $select_to,
! 'S_NEWMODE' => $newmode,
! 'BUTTONVALUE' => $buttonvalue)
);
$template->pparse("body");
break;
--- 660,679 ----
"body" => "admin/forum_delete_body.tpl")
);
+
+ $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="from_id" value="' . $cat_id . '" />';
+
$template->assign_vars(array(
! "NAME" => $name,
!
! "L_FORUM_DELETE" => $lang['Forum_delete'],
! "L_FORUM_DELETE_EXPLAIN" => $lang['Forum_delete_explain'],
! "L_MOVE_CONTENTS" => $lang['Move_contents'],
! "L_FORUM_NAME" => $lang['Forum_name'],
!
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
'S_SELECT_TO' => $select_to,
! 'S_SUBMIT_VALUE' => $buttonvalue)
);
+
$template->pparse("body");
break;
***************
*** 659,664 ****
}
! $show_index = TRUE;
break;
--- 716,723 ----
}
! $message = $lang['Forums_updated'] . "<br /><br />" . sprintf($lang['Click_return_forumadmin'], "<a href=\"" . append_sid("admin_forums.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+ message_die(GENERAL_MESSAGE, $message);
+
break;
***************
*** 717,720 ****
--- 776,780 ----
break;
}
+
if ($show_index != TRUE)
{
***************
*** 763,826 ****
}
- if( !$total_forums = $db->sql_numrows($q_forums) )
- {
- $lang['No_forums'];
-
- $template->assign_block_vars("no_forums", array());
-
- }
-
$forum_rows = $db->sql_fetchrowset($q_forums);
! //
! // Okay, let's build the index
! //
! $gen_cat = array();
!
! for($i = 0; $i < $total_categories; $i++)
! {
! $cat_id = $category_rows[$i]['cat_id'];
!
! $template->assign_block_vars("catrow", array(
! "S_ADD_FORUM_SUBMIT" => "addforum[$cat_id]",
! "S_ADD_FORUM_NAME" => "forumname[$cat_id]",
!
! "CAT_ID" => $cat_id,
! "CAT_DESC" => $category_rows[$i]['cat_title'],
!
! "U_CAT_EDIT" => append_sid("admin_forums.$phpEx?mode=editcat&cat_id=$cat_id"),
! "U_CAT_DELETE" => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! "U_CAT_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! "U_CAT_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! "U_VIEWCAT" => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! );
! for($j = 0; $j < $total_forums; $j++)
{
! $forum_id = $forum_rows[$j]['forum_id'];
!
! if ($forum_rows[$j]['cat_id'] == $cat_id)
! {
! $template->assign_block_vars("catrow.forumrow", array(
! "FORUM_NAME" => $forum_rows[$j]['forum_name'],
! "FORUM_DESC" => $forum_rows[$j]['forum_desc'],
! "ROW_COLOR" => $row_color,
! "NUM_TOPICS" => $forum_rows[$j]['forum_topics'],
! "NUM_POSTS" => $forum_rows[$j]['forum_posts'],
!
! "U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']),
! "U_FORUM_EDIT" => append_sid("admin_forums.$phpEx?mode=editforum&forum_id=$forum_id"),
! "U_FORUM_DELETE" => append_sid("admin_forums.$phpEx?mode=deleteforum&forum_id=$forum_id"),
! "U_FORUM_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=forum_order&move=-15&forum_id=$forum_id"),
! "U_FORUM_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=forum_order&move=15&forum_id=$forum_id"),
! "U_FORUM_RESYNC" => append_sid("admin_forums.$phpEx?mode=forum_sync&forum_id=$forum_id"))
! );
! }// if ... forumid == catid
!
! } // for ... forums
! } // for ... categories
}// if ... total_categories
--- 823,882 ----
}
$forum_rows = $db->sql_fetchrowset($q_forums);
! if( $total_forums = $db->sql_numrows($q_forums) )
! {
! //
! // Okay, let's build the index
! //
! $gen_cat = array();
! for($i = 0; $i < $total_categories; $i++)
{
! $cat_id = $category_rows[$i]['cat_id'];
! $template->assign_block_vars("catrow", array(
! "S_ADD_FORUM_SUBMIT" => "addforum[$cat_id]",
! "S_ADD_FORUM_NAME" => "forumname[$cat_id]",
!
! "CAT_ID" => $cat_id,
! "CAT_DESC" => $category_rows[$i]['cat_title'],
!
! "U_CAT_EDIT" => append_sid("admin_forums.$phpEx?mode=editcat&cat_id=$cat_id"),
! "U_CAT_DELETE" => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! "U_CAT_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! "U_CAT_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! "U_VIEWCAT" => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! );
! for($j = 0; $j < $total_forums; $j++)
! {
! $forum_id = $forum_rows[$j]['forum_id'];
!
! if ($forum_rows[$j]['cat_id'] == $cat_id)
! {
!
! $template->assign_block_vars("catrow.forumrow", array(
! "FORUM_NAME" => $forum_rows[$j]['forum_name'],
! "FORUM_DESC" => $forum_rows[$j]['forum_desc'],
! "ROW_COLOR" => $row_color,
! "NUM_TOPICS" => $forum_rows[$j]['forum_topics'],
! "NUM_POSTS" => $forum_rows[$j]['forum_posts'],
!
! "U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']),
! "U_FORUM_EDIT" => append_sid("admin_forums.$phpEx?mode=editforum&forum_id=$forum_id"),
! "U_FORUM_DELETE" => append_sid("admin_forums.$phpEx?mode=deleteforum&forum_id=$forum_id"),
! "U_FORUM_MOVE_UP" => append_sid("admin_forums.$phpEx?mode=forum_order&move=-15&forum_id=$forum_id"),
! "U_FORUM_MOVE_DOWN" => append_sid("admin_forums.$phpEx?mode=forum_order&move=15&forum_id=$forum_id"),
! "U_FORUM_RESYNC" => append_sid("admin_forums.$phpEx?mode=forum_sync&forum_id=$forum_id"))
! );
!
! }// if ... forumid == catid
!
! } // for ... forums
!
! } // for ... categories
! }// if ... total_forums
}// if ... total_categories
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 20:38:47
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv10222/templates/subSilver/admin
Modified Files:
auth_forum_body.tpl
Log Message:
Lang related changes
Index: auth_forum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/auth_forum_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth_forum_body.tpl 2001/10/14 15:55:50 1.3
--- auth_forum_body.tpl 2001/11/19 20:38:44 1.4
***************
*** 23,29 ****
<tr>
<td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS}
! <input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" class="mainoption" />
! <input type="reset" value="{L_RESET_CHANGES}" name="reset" class="liteoption" />
</td>
</tr>
--- 23,29 ----
<tr>
<td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS}
! <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
! <input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
</td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 20:30:55
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv7407/templates/subSilver/admin
Modified Files:
board_config_body.tpl
Log Message:
Yet another missed option ... blimey, we've made this too configurable ... only kidding
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** board_config_body.tpl 2001/11/19 19:06:01 1.8
--- board_config_body.tpl 2001/11/19 20:30:52 1.9
***************
*** 10,18 ****
<tr>
<td class="row1">{L_SITE_NAME}</td>
! <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
</tr>
<tr>
<td class="row1">{L_SITE_DESCRIPTION}</td>
! <td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}"></td>
</tr>
<tr>
--- 10,18 ----
<tr>
<td class="row1">{L_SITE_NAME}</td>
! <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}" /></td>
</tr>
<tr>
<td class="row1">{L_SITE_DESCRIPTION}</td>
! <td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="{SITE_DESCRIPTION}" /></td>
</tr>
<tr>
***************
*** 30,46 ****
<tr>
<td class="row1">{L_FLOOD_INTERVAL} <br /><span class="gensmall">{L_FLOOD_INTERVAL_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
</tr>
<tr>
<td class="row1">{L_TOPICS_PER_PAGE}</td>
! <td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
</tr>
<tr>
<td class="row1">{L_POSTS_PER_PAGE}</td>
! <td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
</tr>
<tr>
<td class="row1">{L_HOT_THRESHOLD}</td>
! <td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
</tr>
<tr>
--- 30,46 ----
<tr>
<td class="row1">{L_FLOOD_INTERVAL} <br /><span class="gensmall">{L_FLOOD_INTERVAL_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}" /></td>
</tr>
<tr>
<td class="row1">{L_TOPICS_PER_PAGE}</td>
! <td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}" /></td>
</tr>
<tr>
<td class="row1">{L_POSTS_PER_PAGE}</td>
! <td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}" /></td>
</tr>
<tr>
<td class="row1">{L_HOT_THRESHOLD}</td>
! <td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}" /></td>
</tr>
<tr>
***************
*** 58,62 ****
<tr>
<td class="row1">{L_DATE_FORMAT}<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
! <td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
</tr>
<tr>
--- 58,62 ----
<tr>
<td class="row1">{L_DATE_FORMAT}<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
! <td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}" /></td>
</tr>
<tr>
***************
*** 80,96 ****
<tr>
<td class="row1">{L_COOKIE_NAME}</span></td>
! <td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}"></td>
</tr>
<tr>
<td class="row1">{L_COOKIE_DOMAIN}</span></td>
! <td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}"></td>
</tr>
<tr>
<td class="row1">{L_COOKIE_PATH}</span></td>
! <td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}"></td>
</tr>
<tr>
<td class="row1">{L_SESSION_LENGTH}</span></td>
! <td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}"></td>
</tr>
<tr>
--- 80,96 ----
<tr>
<td class="row1">{L_COOKIE_NAME}</span></td>
! <td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}" /></td>
</tr>
<tr>
<td class="row1">{L_COOKIE_DOMAIN}</span></td>
! <td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}" /></td>
</tr>
<tr>
<td class="row1">{L_COOKIE_PATH}</span></td>
! <td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}" /></td>
</tr>
<tr>
<td class="row1">{L_SESSION_LENGTH}</span></td>
! <td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}" /></td>
</tr>
<tr>
***************
*** 107,119 ****
<tr>
<td class="row1">{L_INBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}"></td>
</tr>
<tr>
<td class="row1">{L_SENTBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}"></td>
</tr>
<tr>
<td class="row1">{L_SAVEBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}"></td>
</tr>
<tr>
--- 107,119 ----
<tr>
<td class="row1">{L_INBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td>
</tr>
<tr>
<td class="row1">{L_SENTBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td>
</tr>
<tr>
<td class="row1">{L_SAVEBOX_LIMIT}</span></td>
! <td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td>
</tr>
<tr>
***************
*** 121,124 ****
--- 121,128 ----
</tr>
<tr>
+ <td class="row1">{L_MAX_POLL_OPTIONS}</td>
+ <td class="row2"><input type="text" name="max_poll_options" size="4" maxlength="4" value="{MAX_POLL_OPTIONS}" /></td>
+ </tr>
+ <tr>
<td class="row1">{L_ALLOW_HTML}</td>
<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES} /> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO} /> {L_NO}</td>
***************
*** 126,130 ****
<tr>
<td class="row1">{L_ALLOWED_TAGS}<br /><span class="gensmall">{L_ALLOWED_TAGS_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}"></td>
</tr>
<tr>
--- 130,134 ----
<tr>
<td class="row1">{L_ALLOWED_TAGS}<br /><span class="gensmall">{L_ALLOWED_TAGS_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}" /></td>
</tr>
<tr>
***************
*** 138,142 ****
<tr>
<td class="row1">{L_SMILIES_PATH} <br /><span class="gensmall">{L_SMILIES_PATH_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
</tr>
<tr>
--- 142,146 ----
<tr>
<td class="row1">{L_SMILIES_PATH} <br /><span class="gensmall">{L_SMILIES_PATH_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}" /></td>
</tr>
<tr>
***************
*** 146,150 ****
<tr>
<td class="row1">{L_MAX_SIG_LENGTH}<br /><span class="gensmall">{L_MAX_SIG_LENGTH_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
</tr>
<tr>
--- 150,154 ----
<tr>
<td class="row1">{L_MAX_SIG_LENGTH}<br /><span class="gensmall">{L_MAX_SIG_LENGTH_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}" /></td>
</tr>
<tr>
***************
*** 169,173 ****
<tr>
<td class="row1">{L_MAX_FILESIZE}<br /><span class="gensmall">{L_MAX_FILESIZE_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
</tr>
<tr>
--- 173,177 ----
<tr>
<td class="row1">{L_MAX_FILESIZE}<br /><span class="gensmall">{L_MAX_FILESIZE_EXPLAIN}</span></td>
! <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}" /> Bytes</td>
</tr>
<tr>
***************
*** 175,179 ****
<span class="gensmall">{L_MAX_AVATAR_SIZE_EXPLAIN}</span>
</td>
! <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
</tr>
<tr>
--- 179,183 ----
<span class="gensmall">{L_MAX_AVATAR_SIZE_EXPLAIN}</span>
</td>
! <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}" /> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
</tr>
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 20:30:55
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv7407/language/lang_english Modified Files: lang_admin.php Log Message: Yet another missed option ... blimey, we've made this too configurable ... only kidding Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** lang_admin.php 2001/11/19 19:06:01 1.3 --- lang_admin.php 2001/11/19 20:30:52 1.4 *************** *** 33,37 **** --- 33,40 ---- $lang['Not_available'] = "Not available"; + $lang['ON'] = "ON"; // This is for GZip compression + $lang['OFF'] = "OFF"; + // // DB Utils *************** *** 186,189 **** --- 189,193 ---- $lang['Abilities_settings'] = "User and Forum Basic Settings"; + $lang['Max_poll_options'] = "Max number of poll options"; $lang['Flood_Interval'] = "Flood Interval"; $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 20:30:55
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv7407/admin Modified Files: admin_board.php Log Message: Yet another missed option ... blimey, we've made this too configurable ... only kidding Index: admin_board.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** admin_board.php 2001/11/19 19:06:01 1.35 --- admin_board.php 2001/11/19 20:30:52 1.36 *************** *** 152,155 **** --- 152,156 ---- "L_DISABLED" => $lang['Disabled'], "L_ABILITIES_SETTINGS" => $lang['Abilities_settings'], + "L_MAX_POLL_OPTIONS" => $lang['Max_poll_options'], "L_FLOOD_INTERVAL" => $lang['Flood_Interval'], "L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'], *************** *** 217,220 **** --- 218,222 ---- "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, + "MAX_POLL_OPTIONS" => $new['max_poll_options'], "FLOOD_INTERVAL" => $new['flood_interval'], "TOPICS_PER_PAGE" => $new['topics_per_page'], |
|
From: Jonathan H. <the...@us...> - 2001-11-19 19:39:03
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24735
Modified Files:
admin_db_utilities.php
Log Message:
Change to use a temp file... Hopefully reduce memory usage on backup.
Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** admin_db_utilities.php 2001/11/13 21:17:32 1.28
--- admin_db_utilities.php 2001/11/19 19:39:00 1.29
***************
*** 631,637 ****
function output_table_content($content)
{
! global $backup_sql;
! $backup_sql .= $content . "\n";
return;
--- 631,638 ----
function output_table_content($content)
{
! global $tempfile;
! fwrite($tempfile, $content . "\n");
! //$backup_sql .= $content . "\n";
return;
***************
*** 776,780 ****
$backup_sql = "\n" . pg_get_sequences("\n", $backup_type);
}
!
for($i = 0; $i < count($tables); $i++)
{
--- 777,793 ----
$backup_sql = "\n" . pg_get_sequences("\n", $backup_type);
}
! //
! // Ok to save on some memory we're going to try writing all this stuff
! // to a tmpfile and sending it later...
! //
! $tempfile = tmpfile();
! if(!$tempfile)
! {
! //
! // Temp file creation failed... Do something here..
! //
! exit;
! }
! fwrite($tempfile, $backup_sql);
for($i = 0; $i < count($tables); $i++)
{
***************
*** 785,790 ****
if($backup_type != 'data')
{
! $backup_sql .= "#\n# TABLE: " . $table_prefix . $table_name . "\n#\n";
! $backup_sql .= $table_def_function($table_prefix . $table_name, "\n") . "\n";
}
--- 798,803 ----
if($backup_type != 'data')
{
! fwrite($tempfile, "#\n# TABLE: " . $table_prefix . $table_name . "\n#\n");
! fwrite($tempfile, $table_def_function($table_prefix . $table_name, "\n") . "\n");
}
***************
*** 794,797 ****
--- 807,819 ----
}
}
+
+ //
+ // Flush all output to the temp file and get it's size, then rewind the
+ // pointer to the beginning.
+ //
+
+ fflush($tempfile);
+ $temp_size = ftell($tempfile) + 1;
+ rewind($tempfile);
//
***************
*** 819,823 ****
header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
! echo gzencode($backup_sql);
}
else
--- 841,846 ----
header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
! //echo gzencode($backup_sql);
! echo gzencode(fread($tempfile, $temp_size));
}
else
***************
*** 826,830 ****
header("Content-disposition: attachment; filename=phpbb_db_backup.sql");
! echo $backup_sql;
}
--- 849,854 ----
header("Content-disposition: attachment; filename=phpbb_db_backup.sql");
! //echo $backup_sql;
! echo fread($tempfile, $temp_size);
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:07:14
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin In directory usw-pr-cvs1:/tmp/cvs-serv17098/templates/subSilver/admin Removed Files: user_unban_body.tpl Log Message: Not needed anymore --- user_unban_body.tpl DELETED --- |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:06:38
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16919/admin
Modified Files:
admin_user_ban.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_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_user_ban.php 2001/10/16 10:35:24 1.11
--- admin_user_ban.php 2001/11/19 19:06:35 1.12
***************
*** 24,29 ****
{
$filename = basename(__FILE__);
! $module['Users']['Ban'] = $filename . "?mode=ban";
! $module['Users']['Un-ban'] = $filename . "?mode=unban";
return;
--- 24,28 ----
{
$filename = basename(__FILE__);
! $module['Users']['Ban_Management'] = $filename;
return;
***************
*** 36,508 ****
require('pagestart.inc');
- if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
- {
- $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
- }
- else
- {
- $mode = "unban";
- }
-
//
// Start program
//
! if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
{
! if($HTTP_POST_VARS['bancontrol'] == "ban")
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
! $user_list = array();
! if(isset($HTTP_POST_VARS['user']))
{
! $user_list_temp = $HTTP_POST_VARS['user'];
!
! for($i = 0; $i < count($user_list_temp); $i++)
! {
! $user_list[] = trim($user_list_temp[$i]);
! }
}
! $ip_list = array();
! if(isset($HTTP_POST_VARS['ip']))
! {
! $ip_list_temp = explode(",", $HTTP_POST_VARS['ip']);
! for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
! //
! // Don't ask about all this, just don't ask ... !
! //
! $ip_1_counter = $ip_range_explode[1];
! $ip_1_end = $ip_range_explode[5];
! while($ip_1_counter <= $ip_1_end)
{
! $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
! $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
! if($ip_2_counter == 0 && $ip_2_end == 254)
{
! $ip_2_counter = 255;
! $ip_2_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
}
! while($ip_2_counter <= $ip_2_end)
{
! $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
! $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
! if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 255;
! $ip_3_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
}
! while($ip_3_counter <= $ip_3_end)
{
! $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
! $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
!
! if($ip_4_counter == 0 && $ip_4_end == 254)
! {
! $ip_4_counter = 255;
! $ip_4_fragment = 255;
!
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
! }
!
! while($ip_4_counter <= $ip_4_end)
! {
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
! $ip_4_counter++;
! }
! $ip_3_counter++;
}
! $ip_2_counter++;
}
! $ip_1_counter++;
}
}
! else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
! {
! $ip = gethostbynamel(trim($ip_list_temp[$i]));
! for($j = 0; $j < count($ip); $j++)
{
! if( !empty($ip[$j]) )
! {
! $ip_list[] = encode_ip($ip[$j]);
! }
}
- }
- else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
- {
- $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
}
}
}
! $email_list = array();
! if(isset($HTTP_POST_VARS['email']))
! {
! $email_list_temp = explode(",", $HTTP_POST_VARS['email']);
! for($i = 0; $i < count($email_list_temp); $i++)
{
! //
! // This ereg match is based on one by ph...@un...
! // contained in the annotated php manual at php.com (ereg
! // section)
! //
! if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
! {
! $email_list[] = trim($email_list_temp[$i]);
! }
}
}
! $sql = "SELECT *
! FROM " . BANLIST_TABLE;
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
! }
! $current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
! for($i = 0; $i < count($user_list); $i++)
{
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($user_list[$i] == $current_banlist[$j]['ban_userid'])
! {
! $in_banlist = true;
! }
}
! if(!$in_banlist)
! {
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
! VALUES ('" . $user_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
! }
}
}
! for($i = 0; $i < count($ip_list); $i++)
{
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
! {
! $in_banlist = true;
! }
}
! if(!$in_banlist)
{
! if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
! {
! $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
! }
! else
! {
! $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
! }
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
! VALUES ('" . $ip_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
! }
}
}
! //
! // Now we'll delete all entries from the
! // session table with any of the banned
! // user or IP info just entered into the
! // ban table ... this will force a session
! // initialisation resulting in an instant
! // ban
! //
! if($kill_session_sql != "")
{
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE $kill_session_sql";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
! }
}
! for($i = 0; $i < count($email_list); $i++)
{
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($email_list[$i] == $current_banlist[$j]['ban_email'])
! {
! $in_banlist = true;
! }
}
! if(!$in_banlist)
{
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! VALUES ('" . $email_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
! }
}
}
}
- else if($HTTP_POST_VARS['bancontrol'] == "unban")
- {
! $where_sql = "";
! if(isset($HTTP_POST_VARS['user']))
! {
! $user_list = $HTTP_POST_VARS['user'];
! for($i = 0; $i < count($user_list); $i++)
{
! if($user_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= " OR ";
! }
! $where_sql .= "ban_id = " . $user_list[$i];
}
}
}
! if(isset($HTTP_POST_VARS['ip']))
! {
! $ip_list = $HTTP_POST_VARS['ip'];
! for($i = 0; $i < count($ip_list); $i++)
{
! if($ip_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= " OR ";
! }
! $where_sql .= "ban_id = " . $ip_list[$i];
}
}
}
! if(isset($HTTP_POST_VARS['email']))
! {
! $email_list = $HTTP_POST_VARS['email'];
! for($i = 0; $i < count($email_list); $i++)
{
! if($email_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= " OR ";
! }
! $where_sql .= "ban_id = " . $email_list[$i];
}
}
}
! if($where_sql != "")
{
! $sql = "DELETE FROM " . BANLIST_TABLE . "
! WHERE $where_sql";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
! }
}
}
message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
}
else
{
- if( $mode == "ban" )
- {
- $userban_count = 0;
-
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- WHERE user_id <> " . ANONYMOUS . "
- ORDER BY username ASC";
- $u_result = $db->sql_query($sql);
- $user_list = $db->sql_fetchrowset($u_result);
-
- $select_userlist = "<option value=\"0\">Select a Username</option>";
- for($i = 0; $i < count($user_list); $i++)
- {
- $select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
- $userban_count++;
- }
- $select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist . "</select>";
! $template->set_filenames(array(
! "body" => "admin/user_ban_body.tpl")
! );
!
! $s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"ban\" />";
!
! $template->assign_vars(array(
! "L_BAN_TITLE" => $lang['Ban_control'],
! "L_BAN_EXPLAIN" => $lang['Ban_explain'],
! "L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
! "L_BAN_USER" => $lang['Ban_username'],
! "L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
! "L_BAN_IP" => $lang['Ban_IP'],
! "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
! "L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
! "L_BAN_EMAIL" => $lang['Ban_email'],
! "L_EMAIL_ADDRESS" => $lang['Email_address'],
! "L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "S_USERLIST_SELECT" => $select_userlist,
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
! );
! }
! else if( $mode == "unban" )
! {
! $userban_count = 0;
! $ipban_count = 0;
! $emailban_count = 0;
!
! $sql = "SELECT b.ban_id, u.user_id, u.username
! FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
! WHERE u.user_id = b.ban_userid
! AND b.ban_userid <> 0
! AND u.user_id <> " . ANONYMOUS . "
! ORDER BY u.user_id ASC";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_userlist = "";
! for($i = 0; $i < count($user_list); $i++)
! {
! $select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
! $userban_count++;
! }
! if($select_userlist == "")
! {
! $select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
! }
! else if($userban_count == 1)
! {
! $select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
! }
! $select_userlist = "<select name=\"user[]\"" . ( ($userban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" : ">" ) . $select_userlist;
! $select_userlist .= "</select>";
! $sql = "SELECT ban_id, ban_ip, ban_email
! FROM " . BANLIST_TABLE;
! $b_result = $db->sql_query($sql);
! $banlist = $db->sql_fetchrowset($b_result);
! $select_iplist = "";
! $select_emaillist = "";
! for($i = 0; $i < $db->sql_numrows($b_result); $i++)
! {
! $ban_id = $banlist[$i]['ban_id'];
! if( !empty($banlist[$i]['ban_ip']) )
! {
! $ban_ip = str_replace("255", "*", decode_ip($banlist[$i]['ban_ip']));
! $select_iplist .= "<option value=\"$ban_id\">$ban_ip</option>";
! $ipban_count++;
! }
! else if( !empty($banlist[$i]['ban_email']) )
! {
! $ban_email = $banlist[$i]['ban_email'];
! $select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
! $emailban_count++;
! }
! }
! if($select_iplist == "")
! {
! $select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
! }
! else if($ipban_count == 1)
! {
! $select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
! }
! if($select_emaillist == "")
{
! $select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
}
! else if($emailban_count == 1)
{
! $select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
}
!
! $select_iplist = "<select name=\"ip[]\"" . ( ($ipban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" : ">" ) . $select_iplist . "</select>";
! $select_emaillist = "<select name=\"email[]\"" . ( ($emailban_count > 1) ? "multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" : ">" ) . $select_emaillist . "</select>";
!
! $template->set_filenames(array(
! "body" => "admin/user_unban_body.tpl")
! );
!
! $s_hidden_fields = "<input type=\"hidden\" name=\"bancontrol\" value=\"unban\" />";
!
! $template->assign_vars(array(
! "L_BAN_TITLE" => $lang['Ban_control'],
! "L_BAN_EXPLAIN" => $lang['Ban_explain'],
! "L_BAN_USER" => $lang['Unban_username'],
! "L_BAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
! "L_BAN_IP" => $lang['Unban_IP'],
! "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
! "L_BAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
! "L_BAN_EMAIL" => $lang['Unban_email'],
! "L_EMAIL_ADDRESS" => $lang['Email_address'],
! "L_BAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "S_USERLIST_SELECT" => $select_userlist,
! "S_IPLIST_SELECT" => $select_iplist,
! "S_EMAILLIST_SELECT" => $select_emaillist,
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
! "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
! );
}
}
--- 35,474 ----
require('pagestart.inc');
//
// Start program
//
! if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
!
! $user_list = array();
! if(isset($HTTP_POST_VARS['ban_user']))
{
! $user_list_temp = $HTTP_POST_VARS['ban_user'];
! for($i = 0; $i < count($user_list_temp); $i++)
{
! $user_list[] = trim($user_list_temp[$i]);
}
+ }
! $ip_list = array();
! if(isset($HTTP_POST_VARS['ban_ip']))
! {
! $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
! for($i = 0; $i < count($ip_list_temp); $i++)
! {
! if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
! //
! // Don't ask about all this, just don't ask ... !
! //
! $ip_1_counter = $ip_range_explode[1];
! $ip_1_end = $ip_range_explode[5];
!
! while($ip_1_counter <= $ip_1_end)
{
! $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
! $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
!
! if($ip_2_counter == 0 && $ip_2_end == 254)
! {
! $ip_2_counter = 255;
! $ip_2_fragment = 255;
!
! $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
! }
! while($ip_2_counter <= $ip_2_end)
{
! $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
! $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
! if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 255;
! $ip_3_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
}
! while($ip_3_counter <= $ip_3_end)
{
! $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
! $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
! if($ip_4_counter == 0 && $ip_4_end == 254)
{
! $ip_4_counter = 255;
! $ip_4_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
}
! while($ip_4_counter <= $ip_4_end)
{
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
! $ip_4_counter++;
}
! $ip_3_counter++;
}
! $ip_2_counter++;
}
+ $ip_1_counter++;
}
! }
! else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
! {
! $ip = gethostbynamel(trim($ip_list_temp[$i]));
! for($j = 0; $j < count($ip); $j++)
! {
! if( !empty($ip[$j]) )
{
! $ip_list[] = encode_ip($ip[$j]);
}
}
}
+ else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
+ {
+ $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
+ }
}
+ }
! $email_list = array();
! if(isset($HTTP_POST_VARS['ban_mail']))
! {
! $email_list_temp = explode(",", $HTTP_POST_VARS['ban_mail']);
! for($i = 0; $i < count($email_list_temp); $i++)
! {
! //
! // This ereg match is based on one by ph...@un...
! // contained in the annotated php manual at php.com (ereg
! // section)
! //
! if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
{
! $email_list[] = trim($email_list_temp[$i]);
}
}
+ }
! $sql = "SELECT *
! FROM " . BANLIST_TABLE;
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
! }
! $current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
! for($i = 0; $i < count($user_list); $i++)
! {
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($user_list[$i] == $current_banlist[$j]['ban_userid'])
{
! $in_banlist = true;
}
+ }
! if(!$in_banlist)
! {
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
! VALUES ('" . $user_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
}
}
+ }
! for($i = 0; $i < count($ip_list); $i++)
! {
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
{
! $in_banlist = true;
}
+ }
! if(!$in_banlist)
! {
! if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
{
! $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
! }
! else
! {
! $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
! }
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
! VALUES ('" . $ip_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
}
}
+ }
! //
! // Now we'll delete all entries from the
! // session table with any of the banned
! // user or IP info just entered into the
! // ban table ... this will force a session
! // initialisation resulting in an instant
! // ban
! //
! if($kill_session_sql != "")
! {
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE $kill_session_sql";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
}
+ }
! for($i = 0; $i < count($email_list); $i++)
! {
! $in_banlist = false;
! for($j = 0; $j < count($current_banlist); $j++)
{
! if($email_list[$i] == $current_banlist[$j]['ban_email'])
{
! $in_banlist = true;
}
+ }
! if(!$in_banlist)
! {
! $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! VALUES ('" . $email_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
}
}
}
! $where_sql = "";
! if(isset($HTTP_POST_VARS['unban_user']))
! {
! $user_list = $HTTP_POST_VARS['unban_user'];
! for($i = 0; $i < count($user_list); $i++)
! {
! if($user_list[$i] != -1)
{
! if($where_sql != "")
{
! $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $user_list[$i];
}
}
+ }
! if(isset($HTTP_POST_VARS['unban_ip']))
! {
! $ip_list = $HTTP_POST_VARS['unban_ip'];
! for($i = 0; $i < count($ip_list); $i++)
! {
! if($ip_list[$i] != -1)
{
! if($where_sql != "")
{
! $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $ip_list[$i];
}
}
+ }
! if(isset($HTTP_POST_VARS['unban_email']))
! {
! $email_list = $HTTP_POST_VARS['unban_email'];
! for($i = 0; $i < count($email_list); $i++)
! {
! if($email_list[$i] != -1)
{
! if($where_sql != "")
{
! $where_sql .= " OR ";
}
+ $where_sql .= "ban_id = " . $email_list[$i];
}
}
+ }
! if($where_sql != "")
! {
! $sql = "DELETE FROM " . BANLIST_TABLE . "
! WHERE $where_sql";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
}
}
message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
+
}
else
{
! $template->set_filenames(array(
! "body" => "admin/user_ban_body.tpl")
! );
!
! $template->assign_vars(array(
! "L_BAN_TITLE" => $lang['Ban_control'],
! "L_BAN_EXPLAIN" => $lang['Ban_explain'],
! "L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
! "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
! "L_EMAIL_ADDRESS" => $lang['Email_address'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "S_BANLIST_ACTION" => append_sid("admin_user_ban.$phpEx"))
! );
!
! $userban_count = 0;
!
! $sql = "SELECT user_id, username
! FROM " . USERS_TABLE . "
! WHERE user_id <> " . ANONYMOUS . "
! ORDER BY username ASC";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_userlist = "";
! for($i = 0; $i < count($user_list); $i++)
! {
! $select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
! $userban_count++;
! }
! $select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist . "</select>";
! $template->assign_vars(array(
! "L_BAN_USER" => $lang['Ban_username'],
! "L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
! "L_BAN_IP" => $lang['Ban_IP'],
! "L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
! "L_BAN_EMAIL" => $lang['Ban_email'],
! "L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
!
! "S_BAN_USERLIST_SELECT" => $select_userlist)
! );
!
! $userban_count = 0;
! $ipban_count = 0;
! $emailban_count = 0;
!
! $sql = "SELECT b.ban_id, u.user_id, u.username
! FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
! WHERE u.user_id = b.ban_userid
! AND b.ban_userid <> 0
! AND u.user_id <> " . ANONYMOUS . "
! ORDER BY u.user_id ASC";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_userlist = "";
! for($i = 0; $i < count($user_list); $i++)
! {
! $select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
! $userban_count++;
! }
! if($select_userlist == "")
! {
! $select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
! }
! else if($userban_count == 1)
! {
! $select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
! }
! $select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist;
! $select_userlist .= "</select>";
! $sql = "SELECT ban_id, ban_ip, ban_email
! FROM " . BANLIST_TABLE;
! $b_result = $db->sql_query($sql);
! $banlist = $db->sql_fetchrowset($b_result);
! $select_iplist = "";
! $select_emaillist = "";
! for($i = 0; $i < $db->sql_numrows($b_result); $i++)
! {
! $ban_id = $banlist[$i]['ban_id'];
! if( !empty($banlist[$i]['ban_ip']) )
{
! $ban_ip = str_replace("255", "*", decode_ip($banlist[$i]['ban_ip']));
! $select_iplist .= "<option value=\"$ban_id\">$ban_ip</option>";
! $ipban_count++;
}
! else if( !empty($banlist[$i]['ban_email']) )
{
! $ban_email = $banlist[$i]['ban_email'];
! $select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
! $emailban_count++;
}
! }
+ if($select_iplist == "")
+ {
+ $select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
+ }
+ else if($ipban_count == 1)
+ {
+ $select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
+ }
+ if($select_emaillist == "")
+ {
+ $select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
}
+ else if($emailban_count == 1)
+ {
+ $select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
+ }
+
+ $select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" . $select_iplist . "</select>";
+ $select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" . $select_emaillist . "</select>";
+ $template->assign_vars(array(
+ "L_UNBAN_USER" => $lang['Unban_username'],
+ "L_UNBAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
+ "L_UNBAN_IP" => $lang['Unban_IP'],
+ "L_UNBAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
+ "L_UNBAN_EMAIL" => $lang['Unban_email'],
+ "L_UNBAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
+
+ "S_UNBAN_USERLIST_SELECT" => $select_userlist,
+ "S_UNBAN_IPLIST_SELECT" => $select_iplist,
+ "S_UNBAN_EMAILLIST_SELECT" => $select_emaillist,
+ "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
+ );
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:06:38
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16919/templates/subSilver/admin
Modified Files:
user_ban_body.tpl
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: user_ban_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_ban_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** user_ban_body.tpl 2001/10/14 15:55:50 1.3
--- user_ban_body.tpl 2001/11/19 19:06:35 1.4
***************
*** 4,42 ****
<p>{L_BAN_EXPLAIN}</p>
! <form method="post" action="{S_BAN_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_BAN_USER}</th>
</tr>
<tr>
! <td class="row1">{L_USERNAME}: <br />
! <span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
! <td class="row2">{S_USERLIST_SELECT}</td>
</tr>
<tr>
<th class="thHead" colspan="2">{L_BAN_IP}</th>
</tr>
<tr>
! <td class="row1">{L_IP_OR_HOSTNAME}: <br />
! <span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
! <td class="row2">
! <input type="text" name="ip" size="35" />
! </td>
</tr>
<tr>
<th class="thHead" colspan="2">{L_BAN_EMAIL}</th>
</tr>
<tr>
! <td class="row1">{L_EMAIL_ADDRESS}: <br />
! <span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
! <td class="row2">
! <input type="text" name="email" size="35" />
! </td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}
! <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
!
! <input type="reset" value="{L_RESET}" class="liteoption" />
! </td>
</tr>
</table></form>
--- 4,52 ----
<p>{L_BAN_EXPLAIN}</p>
! <form method="post" action="{S_BANLIST_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_BAN_USER}</th>
</tr>
<tr>
! <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
! <td class="row2">{S_BAN_USERLIST_SELECT}</td>
</tr>
<tr>
+ <th class="thHead" colspan="2">{L_UNBAN_USER}</th>
+ </tr>
+ <tr>
+ <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_UNBAN_USER_EXPLAIN}</span></td>
+ <td class="row2">{S_UNBAN_USERLIST_SELECT}</td>
+ </tr>
+ <tr>
<th class="thHead" colspan="2">{L_BAN_IP}</th>
</tr>
+ <tr>
+ <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="gensmall">{L_BAN_IP_EXPLAIN}</span></td>
+ <td class="row2"><input type="text" name="ban_ip" size="35" /></td>
+ </tr>
<tr>
! <th class="thHead" colspan="2">{L_UNBAN_IP}</th>
</tr>
<tr>
+ <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="gensmall">{L_UNBAN_IP_EXPLAIN}</span></td>
+ <td class="row2">{S_UNBAN_IPLIST_SELECT}</td>
+ </tr>
+ <tr>
<th class="thHead" colspan="2">{L_BAN_EMAIL}</th>
</tr>
+ <tr>
+ <td class="row1">{L_EMAIL_ADDRESS}: <br /><span class="gensmall">{L_BAN_EMAIL_EXPLAIN}</span></td>
+ <td class="row2"><input type="text" name="ban_email" size="35" /></td>
+ </tr>
+ <tr>
+ <th class="thHead" colspan="2">{L_UNBAN_EMAIL}</th>
+ </tr>
<tr>
! <td class="row1">{L_EMAIL_ADDRESS}: <br /><span class="gensmall">{L_UNBAN_EMAIL_EXPLAIN}</span></td>
! <td class="row2">{S_UNBAN_EMAILLIST_SELECT}</td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center"><input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /></td>
</tr>
</table></form>
|
|
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'])
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:06:04
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16695/templates/subSilver/admin
Modified Files:
board_config_body.tpl auth_ug_body.tpl
Added Files:
user_email_body.tpl
Log Message:
Various admin lang and other fixes ... this will break other things I'm sure, only submit bug reports for recently commited files
--- NEW FILE ---
<h1>{L_EMAIL_TITLE}</h1>
<p>{L_EMAIL_EXPLAIN}</p>
<form method="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_COMPOSE}</th>
</tr>
<tr>
<td class="row1" align="right"><b>{L_RECIPIENTS}</b></td>
<td class="row2" align="left">{S_GROUP_SELECT}</td>
</tr>
<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>
<td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span>
<td class="row2"><span class="gen"> <textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea></span>
</tr>
<tr>
<td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>
</tr>
</table></form>
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** board_config_body.tpl 2001/11/15 18:37:01 1.7
--- board_config_body.tpl 2001/11/19 19:06:01 1.8
***************
*** 4,8 ****
<p>{L_CONFIGURATION_EXPLAIN}</p>
! <form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_GENERAL_SETTINGS}</th>
--- 4,8 ----
<p>{L_CONFIGURATION_EXPLAIN}</p>
! <form action="{S_CONFIG_ACTION}" method="post"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_GENERAL_SETTINGS}</th>
***************
*** 17,26 ****
</tr>
<tr>
<td class="row1">{L_ACCT_ACTIVATION}</td>
! <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
</tr>
<tr>
<td class="row1">{L_BOARD_EMAIL_FORM}<br /><span class="gensmall">{L_BOARD_EMAIL_FORM_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="board_email_form" value="1" {BOARD_EMAIL_FORM_ENABLE}> {L_ENABLED} <input type="radio" name="board_email_form" value="0" {BOARD_EMAIL_FORM_DISABLE}> {L_DISABLED}</td>
</tr>
<tr>
--- 17,30 ----
</tr>
<tr>
+ <td class="row1">{L_DISABLE_BOARD}<br /><span class="gensmall">{L_DISABLE_BOARD_EXPLAIN}</span></td>
+ <td class="row2"><input type="radio" name="board_disable" value="1" {S_DISABLE_BOARD_YES} /> {L_YES} <input type="radio" name="board_disable" value="0" {S_DISABLE_BOARD_NO} /> {L_NO}</td>
+ </tr>
+ <tr>
<td class="row1">{L_ACCT_ACTIVATION}</td>
! <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />Admin</td>
</tr>
<tr>
<td class="row1">{L_BOARD_EMAIL_FORM}<br /><span class="gensmall">{L_BOARD_EMAIL_FORM_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="board_email_form" value="1" {BOARD_EMAIL_FORM_ENABLE} /> {L_ENABLED} <input type="radio" name="board_email_form" value="0" {BOARD_EMAIL_FORM_DISABLE} /> {L_DISABLED}</td>
</tr>
<tr>
***************
*** 46,50 ****
<tr>
<td class="row1">{L_OVERRIDE_STYLE}<br /><span class="gensmall">{L_OVERRIDE_STYLE_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES} <input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
</tr>
<tr>
--- 50,54 ----
<tr>
<td class="row1">{L_OVERRIDE_STYLE}<br /><span class="gensmall">{L_OVERRIDE_STYLE_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES} /> {L_YES} <input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 62,77 ****
<tr>
<td class="row1">{L_ENABLE_GZIP}</td>
! <td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES} <input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ENABLE_PRUNE}</td>
! <td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES} <input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
</tr>
<tr>
<th class="thHead" colspan="2">{L_PRIVATE_MESSAGING}</th>
</tr>
<tr>
! <td class="row1">{L_DISABLE_PRIVATE_MESSAGING}:</td>
! <td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED}>{L_ENABLED} <input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED}>{L_DISABLED}</td>
</tr>
<tr>
--- 66,107 ----
<tr>
<td class="row1">{L_ENABLE_GZIP}</td>
! <td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES} /> {L_YES} <input type="radio" name="gzip_compress" value="0" {GZIP_NO} /> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ENABLE_PRUNE}</td>
! <td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES} /> {L_YES} <input type="radio" name="prune_enable" value="0" {PRUNE_NO} /> {L_NO}</td>
</tr>
<tr>
+ <th class="thHead" colspan="2">{L_COOKIE_SETTINGS}</th>
+ </tr>
+ <tr>
+ <td class="row2" colspan="2"><span class="gensmall">{L_COOKIE_SETTINGS_EXPLAIN}</span></td>
+ </tr>
+ <tr>
+ <td class="row1">{L_COOKIE_NAME}</span></td>
+ <td class="row2"><input type="text" maxlength="16" name="cookie_name" value="{COOKIE_NAME}"></td>
+ </tr>
+ <tr>
+ <td class="row1">{L_COOKIE_DOMAIN}</span></td>
+ <td class="row2"><input type="text" maxlength="50" name="cookie_domain" value="{COOKIE_DOMAIN}"></td>
+ </tr>
+ <tr>
+ <td class="row1">{L_COOKIE_PATH}</span></td>
+ <td class="row2"><input type="text" maxlength="20" name="cookie_path" value="{COOKIE_PATH}"></td>
+ </tr>
+ <tr>
+ <td class="row1">{L_SESSION_LENGTH}</span></td>
+ <td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="{SESSION_LENGTH}"></td>
+ </tr>
+ <tr>
+ <td class="row1">{L_COOKIE_SECURE}</td>
+ <td class="row2"><input type="radio" name="cookie_secure" value="0" {S_COOKIE_SECURE_DISABLED} />{L_DISABLED} <input type="radio" name="cookie_secure" value="1" {S_COOKIE_SECURE_ENABLED} />{L_ENABLED}</td>
+ </tr>
+ <tr>
<th class="thHead" colspan="2">{L_PRIVATE_MESSAGING}</th>
</tr>
<tr>
! <td class="row1">{L_DISABLE_PRIVATE_MESSAGING}</td>
! <td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED} />{L_ENABLED} <input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED} />{L_DISABLED}</td>
</tr>
<tr>
***************
*** 92,96 ****
<tr>
<td class="row1">{L_ALLOW_HTML}</td>
! <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
</tr>
<tr>
--- 122,126 ----
<tr>
<td class="row1">{L_ALLOW_HTML}</td>
! <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES} /> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 100,108 ****
<tr>
<td class="row1">{L_ALLOW_BBCODE}</td>
! <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_SMILIES}</td>
! <td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES} <input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
</tr>
<tr>
--- 130,138 ----
<tr>
<td class="row1">{L_ALLOW_BBCODE}</td>
! <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES} /> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO} /> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_SMILIES}</td>
! <td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES} /> {L_YES} <input type="radio" name="allow_smilies" value="0" {SMILE_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 112,116 ****
<tr>
<td class="row1">{L_ALLOW_SIG}</td>
! <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES} <input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
</tr>
<tr>
--- 142,146 ----
<tr>
<td class="row1">{L_ALLOW_SIG}</td>
! <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES} /> {L_YES} <input type="radio" name="allow_sig" value="0" {SIG_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 120,124 ****
<tr>
<td class="row1">{L_ALLOW_NAME_CHANGE}</td>
! <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES} <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
</tr>
<tr>
--- 150,154 ----
<tr>
<td class="row1">{L_ALLOW_NAME_CHANGE}</td>
! <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES} /> {L_YES} <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 127,139 ****
<tr>
<td class="row1">{L_ALLOW_LOCAL}</td>
! <td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES} <input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_REMOTE} <br /><span class="gensmall">{L_ALLOW_REMOTE_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES} <input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_UPLOAD}</td>
! <td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES} <input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
</tr>
<tr>
--- 157,169 ----
<tr>
<td class="row1">{L_ALLOW_LOCAL}</td>
! <td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES} /> {L_YES} <input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO} /> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_REMOTE} <br /><span class="gensmall">{L_ALLOW_REMOTE_EXPLAIN}</span></td>
! <td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES} /> {L_YES} <input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO} /> {L_NO}</td>
</tr>
<tr>
<td class="row1">{L_ALLOW_UPLOAD}</td>
! <td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES} /> {L_YES} <input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO} /> {L_NO}</td>
</tr>
<tr>
***************
*** 183,192 ****
</tr>
<tr>
! <td class="row1">{L_SMPT_SERVER}</td>
<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
</tr>
-
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
</td>
</tr>
--- 213,221 ----
</tr>
<tr>
! <td class="row1">{L_SMTP_SERVER}</td>
<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
</tr>
<tr>
! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" />
</td>
</tr>
Index: auth_ug_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/auth_ug_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth_ug_body.tpl 2001/10/14 15:55:50 1.3
--- auth_ug_body.tpl 2001/11/19 19:06:01 1.4
***************
*** 6,11 ****
--- 6,18 ----
<form method="post" action="{S_AUTH_ACTION}">
+ <!-- BEGIN switch_user_auth -->
+ <p>{USER_LEVEL}</p>
<p>{USER_GROUP_MEMBERSHIPS}</p>
+ <!-- END switch_user_auth -->
+ <!-- BEGIN switch_group_auth -->
+ <p>{GROUP_MEMBERSHIP}</p>
+ <!-- END switch_group_auth -->
+
<h2>{L_PERMISSIONS}</h2>
***************
*** 34,40 ****
<tr>
<td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS}
! <input type="submit" name="submit" value="{L_SUBMIT_CHANGES}" class="mainoption" />
! <input type="reset" value="{L_RESET_CHANGES}" class="liteoption" name="reset" />
</td>
</tr>
--- 41,47 ----
<tr>
<td colspan="{S_COLUMN_SPAN}" class="catBottom" align="center">{S_HIDDEN_FIELDS}
! <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />
! <input type="reset" value="{L_RESET}" class="liteoption" name="reset" />
</td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:06:04
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv16695/language/lang_english Modified Files: lang_admin.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: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** lang_admin.php 2001/11/17 13:17:38 1.2 --- lang_admin.php 2001/11/19 19:06:01 1.3 *************** *** 12,19 **** --- 12,22 ---- $lang['Welcome_phpBB'] = "Welcome to phpBB"; $lang['Admin_intro'] = "Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools."; + $lang['Main_index'] = "Forum Index"; $lang['Forum_stats'] = "Forum Statistics"; $lang['Admin_Index'] = "Admin Index"; $lang['Preview_forum'] = "Preview Forum"; + $lang['Click_return_admin_index'] = "Click %sHere%s to return to the Admin Index"; + $lang['Statistic'] = "Statistic"; $lang['Value'] = "Value"; *************** *** 35,42 **** --- 38,47 ---- // $lang['Database_Utilities'] = "Database Utilities"; + $lang['Restore'] = "Restore"; $lang['Backup'] = "Backup"; $lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete."; $lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download."; + $lang['Backup_options'] = "Backup options"; $lang['Start_backup'] = "Start Backup"; *************** *** 48,51 **** --- 53,57 ---- $lang['Select_file'] = "Select a file"; $lang['Start_Restore'] = "Start Restore"; + $lang['Restore_success'] = "The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made."; $lang['Backup_download'] = "Your download will start shortly please wait till it begins"; *************** *** 61,71 **** // Auth pages // ! $lang['Administrator'] = "Administrator"; ! $lang['User'] = "User"; ! $lang['Group'] = "Group"; ! $lang['Forum'] = "Forum"; ! $lang['Select_a'] = "Select a"; // followed by on the entries above ! $lang['Auth_Control'] = "Authorisation Control"; // preceeded by one of the above options ! $lang['Look_up'] = "Look up"; // preceeded by one of the above options $lang['Group_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case."; --- 67,79 ---- // Auth pages // ! $lang['Select_a_User'] = "Select a User"; ! $lang['Select_a_Group'] = "Select a Group"; ! $lang['Select_a_Forum'] = "Select a Forum"; ! $lang['Auth_Control_User'] = "User Permissions Control"; ! $lang['Auth_Control_Group'] = "Group Permissions Control"; ! $lang['Auth_Control_Forum'] = "Forum Permissions Control"; ! $lang['Look_up_User'] = "Look up User"; ! $lang['Look_up_Group'] = "Look up Group"; ! $lang['Look_up_Forum'] = "Look up Forum"; $lang['Group_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case."; *************** *** 83,97 **** $lang['Conflict_warning'] = "Authorisation Conflict Warning"; ! $lang['Conflict_message_userauth'] = "This user still has access/moderator rights to this forum via group membership. You may want to alter the group authorisation or remove this user the group to fully prevent them having access/moderator rights. The groups granting rights are noted below."; ! $lang['Conflict_message_groupauth'] = "The following user/s still have access/moderator rights to this forum via their user auth settings. You may want to alter the user authorisation/s to fully prevent them having access/moderator rights. The users granted rights are noted below."; ! ! $lang['has_moderator_status'] = "has moderator status on"; ! $lang['has_access_status'] = "has access status to"; ! $lang['grants_access_status'] = "grants access status to"; ! $lang['grants_moderator_status'] = "grants moderator status to"; ! $lang['for_this_user'] = "for this user"; ! $lang['Submit_changes'] = "Submit changes"; ! $lang['Reset_changes'] = "Reset changes"; $lang['Public'] = "Public"; --- 91,99 ---- $lang['Conflict_warning'] = "Authorisation Conflict Warning"; ! $lang['Conflict_access_userauth'] = "This user still has access rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having access rights. The groups granting rights (and the forums involved) are noted below."; ! $lang['Conflict_mod_userauth'] = "This user still has moderator rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having moderator rights. The groups granting rights (and the forums involved) are noted below."; ! $lang['Conflict_access_groupauth'] = "The following user (or users) still have access rights to this forum via their user permission settings. You may want to alter the user permissions to fully prevent them having access rights. The users granted rights (and the forums involved) are noted below."; ! $lang['Conflict_mod_groupauth'] = "The following user (or users) still have moderator rights to this forum via their user permissions settings. You may want to alter the user permissions to fully prevent them having moderator rights. The users granted rights (and the forums involved) are noted below."; $lang['Public'] = "Public"; *************** *** 115,129 **** $lang['Simple_Permission'] = "Simple Permission"; ! $lang['This_user_is'] = "This user is a"; // followed by User/Administrator and then next line ! $lang['and_belongs_groups'] = "and belongs to the following groups"; // followed by list of groups - $lang['Group_has_members'] = "This group has the following members"; - $lang['Forum_auth_updated'] = "Forum permissions updated"; $lang['User_auth_updated'] = "User permissions updated"; $lang['Group_auth_updated'] = "Group permissions updated"; ! $lang['return_forum_auth_admin'] = "to return to the forum permissions panel"; ! $lang['return_group_auth_admin'] = "to return to the group permissions panel"; ! $lang['return_user_auth_admin'] = "to return to the user permissions panel"; --- 117,134 ---- $lang['Simple_Permission'] = "Simple Permission"; ! $lang['User_Level'] = "User Level"; ! $lang['Auth_User'] = "User"; ! $lang['Auth_Admin'] = "Administrator"; ! $lang['Group_memberships'] = "Usergroup memberships"; ! $lang['Usergroup_members'] = "This group has the following members"; $lang['Forum_auth_updated'] = "Forum permissions updated"; $lang['User_auth_updated'] = "User permissions updated"; $lang['Group_auth_updated'] = "Group permissions updated"; ! ! $lang['Auth_updated'] = "Permissions have been updated"; ! $lang['Click_return_userauth'] = "Click %sHere%s to return to User Permissions"; ! $lang['Click_return_groupauth'] = "Click %sHere%s to return to Group Permissions"; ! $lang['Click_return_forumauth'] = "Click %sHere%s to return to Forum Permissions"; *************** *** 135,143 **** --- 140,154 ---- $lang['Ban_explain_warn'] = "Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range try to keep it small or better yet state specific addresses."; + $lang['Select_username'] = "Select a Username"; + $lang['Select_ip'] = "Select an IP"; + $lang['Select_email'] = "Select an Email address"; + $lang['Ban_username'] = "Ban one or more specific users"; $lang['Ban_username_explain'] = "You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser"; + $lang['Ban_IP'] = "Ban one or more IP addresses or hostnames"; $lang['IP_hostname'] = "IP addresses or hostnames"; $lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *"; + $lang['Ban_email'] = "Ban one or more email addresses"; $lang['Ban_email_explain'] = "To specify more than one email address separate them with commas. To specify a wildcard username use *, for example *@hotmail.com"; *************** *** 145,157 **** $lang['Unban_username'] = "Un-ban one more specific users"; $lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['Unban_IP'] = "Un-ban one or more IP addresses"; $lang['Unban_IP_explain'] = "You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['Unban_email'] = "Un-ban one or more email addresses"; $lang['Unban_email_explain'] = "You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; ! $lang['No_banned_users'] = "No banned users"; $lang['No_banned_ip'] = "No banned IP addresses"; $lang['No_banned_email'] = "No banned email addresses"; - $lang['No_unban'] = "Leave list unchanged"; $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully"; --- 156,169 ---- $lang['Unban_username'] = "Un-ban one more specific users"; $lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser"; + $lang['Unban_IP'] = "Un-ban one or more IP addresses"; $lang['Unban_IP_explain'] = "You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; + $lang['Unban_email'] = "Un-ban one or more email addresses"; $lang['Unban_email_explain'] = "You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; ! $lang['No_banned_users'] = "No banned usernames"; $lang['No_banned_ip'] = "No banned IP addresses"; $lang['No_banned_email'] = "No banned email addresses"; $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully"; *************** *** 163,172 **** $lang['General_Config'] = "General Configuration"; $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side."; $lang['General_settings'] = "General Board Settings"; $lang['Site_name'] = "Site name"; $lang['Site_desc'] = "Site description"; $lang['Acct_activation'] = "Enable account activation"; ! $lang['Abilities_settings'] = "User/Forum Ability Settings"; $lang['Flood_Interval'] = "Flood Interval"; $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; --- 175,189 ---- $lang['General_Config'] = "General Configuration"; $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side."; + + $lang['Click_return_config'] = "Click %sHere%s to return to General Configuration"; + $lang['General_settings'] = "General Board Settings"; $lang['Site_name'] = "Site name"; $lang['Site_desc'] = "Site description"; + $lang['Board_disable'] = "Disable board"; + $lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!"; $lang['Acct_activation'] = "Enable account activation"; ! $lang['Abilities_settings'] = "User and Forum Basic Settings"; $lang['Flood_Interval'] = "Flood Interval"; $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; *************** *** 175,179 **** $lang['Topics_per_page'] = "Topics Per Page"; $lang['Posts_per_page'] = "Posts Per Page"; ! $lang['Hot_threshold'] = "Hot Threshold"; $lang['Default_style'] = "Default Style"; $lang['Override_style'] = "Override user style"; --- 192,196 ---- $lang['Topics_per_page'] = "Topics Per Page"; $lang['Posts_per_page'] = "Posts Per Page"; ! $lang['Hot_threshold'] = "Posts for Popular Threshold"; $lang['Default_style'] = "Default Style"; $lang['Override_style'] = "Override user style"; *************** *** 193,221 **** $lang['Allow_sig'] = "Allow Signatures"; $lang['Max_sig_length'] = "Maximum signature length"; ! $lang['Max_sig_length_explain'] = "Most number of characters allowed in a users signature"; ! $lang['Allow_name_change'] = "Allow Name Change"; $lang['Avatar_settings'] = "Avatar Settings"; ! $lang['Allow_local'] = "Allow local gallery avatars"; ! $lang['Allow_remote'] = "Allow remote avatars"; ! $lang['Allow_remote_explain'] = "Avatars linked from another website"; ! $lang['Allow_upload'] = "Allow avatar uploading"; ! $lang['Max_filesize'] = "Max. Avatar File Size"; $lang['Max_filesize_explain'] = "For uploaded avatar files"; ! $lang['Max_avatar_size'] = "Max. Avatar Size"; ! $lang['Max_avatar_size_explain'] = "(height x width)"; $lang['Avatar_storage_path'] = "Avatar Storage Path"; $lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars"; $lang['Avatar_gallery_path'] = "Avatar Gallery Path"; $lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery"; $lang['COPPA_settings'] = "COPPA Settings"; $lang['COPPA_fax'] = "COPPA Fax Number"; $lang['COPPA_mail'] = "COPPA Mailing Address"; $lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms"; $lang['Email_settings'] = "Email Settings"; $lang['Admin_email'] = "Admin Email Address"; $lang['Email_sig'] = "Email Signature"; $lang['Email_sig_explain'] = "This text will be attached to all emails the board sends"; ! $lang['Use_SMTP'] = "Use SMTP for delivery"; ! $lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a server instead of the local mail function"; $lang['SMTP_server'] = "SMTP Server Address"; --- 210,241 ---- $lang['Allow_sig'] = "Allow Signatures"; $lang['Max_sig_length'] = "Maximum signature length"; ! $lang['Max_sig_length_explain'] = "Maximum number of characters in user signatures"; ! $lang['Allow_name_change'] = "Allow Username changes"; ! $lang['Avatar_settings'] = "Avatar Settings"; ! $lang['Allow_local'] = "Enable gallery avatars"; ! $lang['Allow_remote'] = "Enable remote avatars"; ! $lang['Allow_remote_explain'] = "Avatars linked to from another website"; ! $lang['Allow_upload'] = "Enable avatar uploading"; ! $lang['Max_filesize'] = "Maximum Avatar File Size"; $lang['Max_filesize_explain'] = "For uploaded avatar files"; ! $lang['Max_avatar_size'] = "Maximum Avatar Dimensions"; ! $lang['Max_avatar_size_explain'] = "(Height x Width in pixels)"; $lang['Avatar_storage_path'] = "Avatar Storage Path"; $lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars"; $lang['Avatar_gallery_path'] = "Avatar Gallery Path"; $lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery"; + $lang['COPPA_settings'] = "COPPA Settings"; $lang['COPPA_fax'] = "COPPA Fax Number"; $lang['COPPA_mail'] = "COPPA Mailing Address"; $lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms"; + $lang['Email_settings'] = "Email Settings"; $lang['Admin_email'] = "Admin Email Address"; $lang['Email_sig'] = "Email Signature"; $lang['Email_sig_explain'] = "This text will be attached to all emails the board sends"; ! $lang['Use_SMTP'] = "Use SMTP Server for email"; ! $lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a named server instead of the local mail function"; $lang['SMTP_server'] = "SMTP Server Address"; *************** *** 225,229 **** --- 245,257 ---- $lang['Savebox_limits'] = "Max posts in Savebox"; + $lang['Cookie_settings'] = "Cookie settings"; + $lang['Cookie_settings_explain'] = "These control how the cookie sent to browsers is defined. In most cases the default should be sufficient. If you need to change these do so with care, incorrect settings can prevent users logging in."; + $lang['Cookie_name'] = "Cookie name"; + $lang['Cookie_domain'] = "Cookie domain"; + $lang['Cookie_path'] = "Cookie path"; + $lang['Session_length'] = "Session length [ seconds ]"; + $lang['Cookie_secure'] = "Cookie secure [ https ]"; + // // Forum Management *************** *** 358,363 **** // Mass Email // ! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients. If you are emailing a large group of people, please be patient after submiting and DO NOT stop the page halfway through. It is normal for amass emailing to take a long time."; ! $lang['Compose'] = "Compose"; --- 386,394 ---- // Mass Email // ! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients. If you are emailing a large group of people, please be patient after submiting and <b>DO NOT</b> stop the page halfway through. It is normal for amass emailing to take a long time."; ! $lang['Compose'] = "Compose"; ! ! $lang['Recipients'] = "Recipients"; ! $lang['All_users'] = "All Users"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 19:05:40
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin In directory usw-pr-cvs1:/tmp/cvs-serv16580/templates/subSilver/admin Removed Files: user_email.tpl Log Message: Name change --- user_email.tpl DELETED --- |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 18:39:48
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english/email
In directory usw-pr-cvs1:/tmp/cvs-serv9133/language/lang_english/email
Added Files:
admin_send_email.tpl
Log Message:
Template for mess emailing
--- NEW FILE ---
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
{BOARD_EMAIL}
Include this full email (particularly the headers).
Message sent to you follows:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{MESSAGE}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 17:54:31
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28080
Modified Files:
search.php
Log Message:
Fixed bug #483105
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** search.php 2001/11/19 14:48:58 1.33
--- search.php 2001/11/19 17:54:27 1.34
***************
*** 424,428 ****
}
*/
! $sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2";
--- 424,428 ----
}
*/
! $sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, t.topic_last_post_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2";
***************
*** 746,750 ****
);
! $highlight_matches = "";
for($j = 0; $j < count($split_search); $j++ )
{
--- 746,750 ----
);
! $highlight_active = "";
for($j = 0; $j < count($split_search); $j++ )
{
***************
*** 753,757 ****
if( $split_word != "and" && $split_word != "or" && $split_word != "not" )
{
! $highlight_matches .= " " . $split_word;
$search_string[] = "#\b(" . preg_quote(str_replace("*", ".*?", $split_word), "#") . ")\b#i";
--- 753,757 ----
if( $split_word != "and" && $split_word != "or" && $split_word != "not" )
{
! $highlight_active .= " " . $split_word;
$search_string[] = "#\b(" . preg_quote(str_replace("*", ".*?", $split_word), "#") . ")\b#i";
***************
*** 767,771 ****
$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
! $highlight_matches .= " " . $match_synonym;
}
}
--- 767,771 ----
$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
! $highlight_active .= " " . $match_synonym;
}
}
***************
*** 773,784 ****
}
! $highlight_matches = urlencode(trim($highlight_matches));
for($i = 0; $i < min($per_page, count($searchset)); $i++)
{
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
! $topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_matches");
$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
! $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_matches#" . $searchset[$i]['post_id']);
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
--- 773,784 ----
}
! $highlight_active = urlencode(trim($highlight_active));
for($i = 0; $i < min($per_page, count($searchset)); $i++)
{
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
! $topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_active");
$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
! $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_active#" . $searchset[$i]['post_id']);
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
***************
*** 926,930 ****
for($j = 0; $j < $replies + 1; $j += $board_config['topics_per_page'])
{
! $base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_matches");
if( $times > 4 )
--- 926,930 ----
for($j = 0; $j < $replies + 1; $j += $board_config['topics_per_page'])
{
! $base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_active");
if( $times > 4 )
|
7 messages has been excluded from this view by a project administrator.
