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-29 15:04:46
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv16136/db/schemas
Modified Files:
mssql_basic.sql mssql_schema.sql
Log Message:
Up to date MSSQL schema and basic, tested under MSSQL 2000
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mssql_basic.sql 2001/11/29 13:25:56 1.2
--- mssql_basic.sql 2001/11/29 15:04:42 1.3
***************
*** 88,93 ****
password: admin (change this or remove it once everything is working!)
*/
! INSERT INTO phpbb_users (user_id, user_active, username, user_password, user_autologin_key, user_level, user_posts, user_timezone, user_dateformat, user_lang, user_viewemail, user_attachsig, user_allowhtml, user_allowbbcode, user_allowsmile, user_allowavatar, user_allow_pm, user_allow_viewonline, user_notify, user_notify_pm, user_regdate, user_rank, user_avatar, user_email, user_icq, user_website, user_from, user_sig, user_aim, user_yim, user_msnm, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (-1, '', 'Anonymous', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, 0, '', '', '', '', '', '', '', '', '', '', '', '', '', '');
! INSERT INTO phpbb_users (user_id, user_active, username, user_password, user_autologin_key, user_level, user_posts, user_timezone, user_dateformat, user_style, user_lang, user_viewemail, user_attachsig, user_allowhtml, user_allowbbcode, user_allowsmile, user_allowavatar, user_allow_pm, user_allow_viewonline, user_notify, user_notify_pm, user_regdate, user_rank, user_avatar, user_email, user_icq, user_website, user_from, user_sig, user_aim, user_yim, user_msnm, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Admin', '21232f297a57a5a743894a0e4a801fc3', '', 1, 1, 0, 'd M Y h:i a', 1, '', 1, '', '', 1, 1, 1, 1, 1, '', 1, 0, 1, '', 'ad...@yo...', '', '', '', '', '', '', '', '', '', '', '');
--- 88,93 ----
password: admin (change this or remove it once everything is working!)
*/
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
! INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', '', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
***************
*** 131,137 ****
SET IDENTITY_INSERT phpbb_posts ON;
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, poster_ip, post_username, enable_bbcode, enable_html, enable_smilies, enable_sig, bbcode_uid, post_edit_time, post_edit_count) VALUES (1, 1, 1, 2, 972086460, '7F000001', '', 1, '', 1, '', '', '', '');
!
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, '', 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
SET IDENTITY_INSERT phpbb_posts OFF;
--- 131,136 ----
SET IDENTITY_INSERT phpbb_posts ON;
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001');
! INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
SET IDENTITY_INSERT phpbb_posts OFF;
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvsuHnP9z and /tmp/cvsmaUZ91 differ
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 13:25:59
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv24054/templates/subSilver
Modified Files:
posting_body.tpl
Log Message:
Fixed problem with surprise and shock smileys, shock = 8O, surprise = :o or text equivs
Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** posting_body.tpl 2001/11/24 02:23:36 1.11
--- posting_body.tpl 2001/11/29 13:25:56 1.12
***************
*** 267,271 ****
<td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
<td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
! <td><a href="javascript:emoticon(':eek:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Surprise" /></a></td>
</tr>
<tr align="center" valign="middle">
--- 267,271 ----
<td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
<td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
! <td><a href="javascript:emoticon(':shock:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Shocked" /></a></td>
</tr>
<tr align="center" valign="middle">
***************
*** 279,283 ****
<td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td>
<td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td>
! <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Shock" /></a></td>
</tr>
<tr align="center" valign="middle">
--- 279,283 ----
<td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td>
<td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td>
! <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Surprised" /></a></td>
</tr>
<tr align="center" valign="middle">
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 13:25:59
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv24054/db/schemas
Modified Files:
mssql_basic.sql mysql_basic.sql postgres_basic.sql
Log Message:
Fixed problem with surprise and shock smileys, shock = 8O, surprise = :o or text equivs
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mssql_basic.sql 2001/11/20 22:28:41 1.1
--- mssql_basic.sql 2001/11/29 13:25:56 1.2
***************
*** 12,19 ****
-- Config
*/
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mssql');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
--- 12,20 ----
-- Config
*/
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
***************
*** 28,33 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
--- 29,34 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
***************
*** 43,50 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80');
--- 44,50 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80');
***************
*** 54,61 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_admin_style','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
--- 54,61 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
***************
*** 125,128 ****
--- 125,129 ----
SET IDENTITY_INSERT phpbb_topics OFF;
+
/*
-- Demo Post
***************
*** 136,139 ****
--- 137,141 ----
SET IDENTITY_INSERT phpbb_posts OFF;
+
/*
-- Themes
***************
*** 151,154 ****
--- 153,157 ----
SET IDENTITY_INSERT phpbb_themes OFF;
+
/*
-- Smilies
***************
*** 156,202 ****
SET IDENTITY_INSERT phpbb_smilies ON;
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '1', ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '2', ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '3', ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '4', ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '5', ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '6', ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '7', ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '8', ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '9', ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '10', ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '11', ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '12', ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '13', ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '14', ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '15', ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '16', '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '17', '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '18', ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '19', ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '20', ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '21', ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '22', ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '23', ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '24', ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '25', ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '26', ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '27', ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '28', ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '29', ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '30', ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '31', ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '32', ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '33', ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '34', ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '35', ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '36', ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '37', ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '38', ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '39', ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '40', ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '41', ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
SET IDENTITY_INSERT phpbb_smilies OFF;
COMMIT;
--- 159,246 ----
SET IDENTITY_INSERT phpbb_smilies ON;
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
SET IDENTITY_INSERT phpbb_smilies OFF;
+
+
+ /*
+ -- Search Words
+ */
+ SET IDENTITY_INSERT phpbb_search_wordlist ON;
+
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'may', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'delete', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'topic', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'forum', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'since', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'everything', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'seems', 0 );
+ INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'working', 0 );
+
+ SET IDENTITY_INSERT phpbb_search_wordlist OFF;
+
+
+ /*
+ -- Search Word Matches
+ */
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 );
+ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 0 );
COMMIT;
Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mysql_basic.sql 2001/11/23 22:55:23 1.3
--- mysql_basic.sql 2001/11/29 13:25:56 1.4
***************
*** 113,148 ****
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 113,151 ----
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** postgres_basic.sql 2001/11/23 22:55:23 1.3
--- postgres_basic.sql 2001/11/29 13:25:56 1.4
***************
*** 112,147 ****
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_eek.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 112,150 ----
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 13:05:06
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv18568/language/lang_english Modified Files: lang_main.php Log Message: Fix for 'bug' #484650 Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** lang_main.php 2001/11/27 22:14:24 1.56 --- lang_main.php 2001/11/29 13:05:03 1.57 *************** *** 672,676 **** $lang['Display_results'] = "Display results as"; ! $lang['All'] = "All"; $lang['No_search_match'] = "No topics or posts met your search criteria"; --- 672,677 ---- $lang['Display_results'] = "Display results as"; ! $lang['All_available'] = "All available"; ! $lang['No_searchable_forums'] = "You do not have permissions to search any forum on this site"; $lang['No_search_match'] = "No topics or posts met your search criteria"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-29 13:05:06
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv18568
Modified Files:
search.php
Log Message:
Fix for 'bug' #484650
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** search.php 2001/11/24 17:17:04 1.39
--- search.php 2001/11/29 13:05:03 1.40
***************
*** 35,42 ****
--- 35,51 ----
$char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
+ $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
+ $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
+
+ $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
+ $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
+
$entry = " " . strip_tags(strtolower($entry)) . " ";
$entry = str_replace("+", " and ", $entry);
$entry = str_replace("-", " not ", $entry);
+
+ $entry = str_replace($sgml_match, $sgml_match, $entry);
+ $entry = str_replace($accent_match, $accent_replace, $entry);
$entry = str_replace($char_match, $char_replace, $entry);
***************
*** 316,321 ****
FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id
! ORDER BY m.post_id";
$result = $db->sql_query($sql);
if( !$result )
--- 325,329 ----
FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id";
$result = $db->sql_query($sql);
if( !$result )
***************
*** 531,536 ****
$searchset = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
-
//
// Clean up search results table
--- 539,542 ----
***************
*** 1079,1091 ****
$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
-
- $s_forums = "<option value=\"all\">" . $lang['All'] . "</option>";
while($row = $db->sql_fetchrow($result))
{
! if($is_auth_ary[$row['forum_id']]['auth_read'])
{
$s_forums .= "<option value=\"" . $row['forum_id'] . "\">" . $row['forum_name'] . "</option>";
! if(empty($list_cat[$row['cat_id']]))
{
$list_cat[$row['cat_id']] = $row['cat_title'];
--- 1085,1096 ----
$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
+ $s_forums = "";
while($row = $db->sql_fetchrow($result))
{
! if( $is_auth_ary[$row['forum_id']]['auth_read'] )
{
$s_forums .= "<option value=\"" . $row['forum_id'] . "\">" . $row['forum_name'] . "</option>";
! if( empty($list_cat[$row['cat_id']]) )
{
$list_cat[$row['cat_id']] = $row['cat_title'];
***************
*** 1094,1104 ****
}
! //
! // Category to search
! //
! $s_categories = "<option value=\"all\">" . $lang['All'] . "</option>";
! while( list($cat_id, $cat_title) = each($list_cat))
{
! $s_categories .= "<option value=\"$cat_id\">$cat_title</option>";
}
--- 1099,1118 ----
}
! if( $s_forums != "" )
! {
! $s_forums = "<option value=\"all\">" . $lang['All_available'] . "</option>" . $s_forums;
!
! //
! // Category to search
! //
! $s_categories = "<option value=\"all\">" . $lang['All_available'] . "</option>";
! while( list($cat_id, $cat_title) = @each($list_cat))
! {
! $s_categories .= "<option value=\"$cat_id\">$cat_title</option>";
! }
! }
! else
{
! message_die(GENERAL_MESSAGE, $lang['No_searchable_forums']);
}
***************
*** 1106,1110 ****
// Number of chars returned
//
! $s_characters = "<option value=\"all\">" . $lang['All'] . "</option>";
$s_characters .= "<option value=\"0\">0</option>";
$s_characters .= "<option value=\"25\">25</option>";
--- 1120,1124 ----
// Number of chars returned
//
! $s_characters = "<option value=\"all\">" . $lang['All_available'] . "</option>";
$s_characters .= "<option value=\"0\">0</option>";
$s_characters .= "<option value=\"25\">25</option>";
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 12:47:41
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv13580
Modified Files:
profile.php
Log Message:
Fixed bug #486800 which is probably caused by pruning of posts ... can't see any other reason at present
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -r1.149 -r1.150
*** profile.php 2001/11/27 20:03:08 1.149
--- profile.php 2001/11/29 12:47:39 1.150
***************
*** 252,256 ****
{
$total_posts = get_db_stat("postcount");
! $percentage = ( $total_posts ) ? sprintf("%.2f", ($profiledata['user_posts'] / $total_posts) * 100) : 0;
}
else
--- 252,256 ----
{
$total_posts = get_db_stat("postcount");
! $percentage = ( $total_posts ) ? sprintf("%.2f", max(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
}
else
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 12:46:19
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv13221
Modified Files:
posting.php privmsg.php
Log Message:
Fix bug #486674 and removed superfluous/commented lines for html treatment
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** posting.php 2001/11/27 18:26:03 1.115
--- posting.php 2001/11/29 12:46:16 1.116
***************
*** 662,665 ****
--- 662,666 ----
$post_append = "";
}
+ header("HTTP/1.0 302 Redirect");
header("Location:" . append_sid($redirect) . $post_append, true);
}
***************
*** 986,989 ****
--- 987,991 ----
}
+ header("HTTP/1.0 302 Redirect");
header("Location: " . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
***************
*** 1823,1826 ****
--- 1825,1829 ----
else
{
+ header("HTTP/1.0 302 Redirect");
header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
}
***************
*** 2367,2371 ****
$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
$post_message = str_replace("<br />", "\n", $post_message);
- // $post_message = preg_replace($html_entities_match, $html_entities_replace, $post_message);
$post_message = preg_replace('#</textarea>#si', '</textarea>', $post_message);
--- 2370,2373 ----
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** privmsg.php 2001/11/27 18:26:03 1.57
--- privmsg.php 2001/11/29 12:46:16 1.58
***************
*** 38,43 ****
// Var definitions
//
! $html_entities_match = array("#<#", "#>#", "#& #", "#\"#");
! $html_entities_replace = array("<", ">", "& ", """);
//
--- 38,43 ----
// Var definitions
//
! $html_entities_match = array("#&#", "#<#", "#>#", "#\"#");
! $html_entities_replace = array("&", "<", ">", """);
//
***************
*** 1112,1116 ****
$to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : "";
$privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : "";
! $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim(stripslashes($HTTP_POST_VARS['message'])) : "";
$privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message);
--- 1112,1116 ----
$to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : "";
$privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : "";
! $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : "";
$privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message);
***************
*** 1218,1222 ****
if( $mode == "edit" )
{
! $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_text, u.username, u.user_id, u.user_sig
FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id
--- 1218,1222 ----
if( $mode == "edit" )
{
! $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig
FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id
***************
*** 1238,1245 ****
$privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
! $privmsg_message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $privmsg_message);
$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
- $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message);
--- 1238,1245 ----
$privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
+ $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
! $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message);
***************
*** 1253,1257 ****
{
! $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id
FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id
--- 1253,1257 ----
{
! $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id
FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id
***************
*** 1271,1287 ****
$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
$to_username = $privmsg['username'];
$to_userid = $privmsg['user_id'];
! $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $privmsg_message);
$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
- $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message);
if( $mode == "quote" )
{
- $privmsg_message = $privmsg['privmsgs_text'];
-
$msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
--- 1271,1286 ----
$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
+ $privmsg_message = $privmsg['privmsgs_text'];
+ $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
$to_username = $privmsg['username'];
$to_userid = $privmsg['user_id'];
! $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message);
if( $mode == "quote" )
{
$msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
***************
*** 1320,1324 ****
}
! $preview_message = prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
//
--- 1319,1324 ----
}
! $preview_message = stripslashes(prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid));
! $privmsg_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $privmsg_message));
//
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 12:25:07
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv7896/db
Modified Files:
postgres7.php
Log Message:
Fix for insert_id problem
Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres7.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** postgres7.php 2001/09/07 16:58:45 1.13
--- postgres7.php 2001/11/29 12:25:04 1.14
***************
*** 387,395 ****
if($query_id && $this->last_query_text[$query_id] != "")
{
! if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename))
{
$query = "SELECT last_value
! FROM ".$tablename[2]."_id_seq";
$temp_q_id = @pg_exec($this->db_connect_id, $query);
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
if($temp_result)
--- 387,401 ----
if($query_id && $this->last_query_text[$query_id] != "")
{
!
! if( preg_match("/^INSERT[ ]+INTO[ ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
{
$query = "SELECT last_value
! FROM " . $tablename[1] . "_id_seq";
$temp_q_id = @pg_exec($this->db_connect_id, $query);
+ if( !$temp_q_id )
+ {
+ return false;
+ }
+
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
if($temp_result)
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 11:26:46
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv28089/language/lang_english Modified Files: lang_admin.php Log Message: Doh! Commited lang_admin before updating from CVS ... just call me stupid, but not too often Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** lang_admin.php 2001/11/29 11:25:04 1.13 --- lang_admin.php 2001/11/29 11:26:44 1.14 *************** *** 349,352 **** --- 349,354 ---- $lang['Forums_updated'] = "Forum and Category information updated successfully"; + $lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category"; + $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-29 11:25:07
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv27715/language/lang_english Modified Files: lang_admin.php Log Message: Fixed bug #486207 Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** lang_admin.php 2001/11/29 08:45:55 1.12 --- lang_admin.php 2001/11/29 11:25:04 1.13 *************** *** 350,355 **** $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; - $lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category"; // // Smiley Management --- 350,355 ---- $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; + // // Smiley Management *************** *** 394,398 **** $lang['Look_up_user'] = "Look up user"; ! $lang['Admin_user_fail'] = "Couldn't update the user's profile."; $lang['Admin_user_updated'] = "The user's profile was successfully updated."; $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration"; --- 394,398 ---- $lang['Look_up_user'] = "Look up user"; ! $lang['Admin_user_fail'] = "Couldn't update the users profile."; $lang['Admin_user_updated'] = "The user's profile was successfully updated."; $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-29 11:25:07
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv27715/admin
Modified Files:
admin_users.php
Log Message:
Fixed bug #486207
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** admin_users.php 2001/11/21 13:02:36 1.32
--- admin_users.php 2001/11/29 11:25:04 1.33
***************
*** 336,343 ****
--- 336,351 ----
$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
$this_userdata = get_userdata_from_id($user_id);
+ if( !$this_userdata )
+ {
+ message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+ }
}
else
{
$this_userdata = get_userdata($HTTP_POST_VARS['username']);
+ if( !$this_userdata )
+ {
+ message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+ }
}
***************
*** 551,556 ****
//
// Default user selection box
- //
- // This should be altered on the final system
//
$sql = "SELECT user_id, username
--- 559,562 ----
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 11:25:07
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27715/includes
Modified Files:
functions.php
Log Message:
Fixed bug #486207
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** functions.php 2001/11/26 22:42:35 1.86
--- functions.php 2001/11/29 11:25:04 1.87
***************
*** 85,89 ****
if( !$db->sql_numrows($result) )
{
! message_die(GENERAL_ERROR, "No userdata for this user_id", "", __LINE__, __FILE__, $sql);
}
--- 85,89 ----
if( !$db->sql_numrows($result) )
{
! return false;
}
***************
*** 109,113 ****
if( !$db->sql_numrows($result) )
{
! message_die(GENERAL_ERROR, "Tried obtaining data for a non-existent user", "", __LINE__, __FILE__, $sql);
}
--- 109,113 ----
if( !$db->sql_numrows($result) )
{
! return false;
}
|
|
From: James A. <th...@us...> - 2001-11-29 09:57:32
|
Update of /cvsroot/phpbb/phpBB2/db/schemas In directory usw-pr-cvs1:/tmp/cvs-serv8846 Modified Files: postgres_schema.sql Log Message: This should fix the schmea problems, not the best solution but it works Index: postgres_schema.sql =================================================================== RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** postgres_schema.sql 2001/11/26 03:02:41 1.4 --- postgres_schema.sql 2001/11/29 09:57:29 1.5 *************** *** 7,24 **** CREATE SEQUENCE phpbb_banlist_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_categories_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_config_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_disallow_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_forums_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_posts_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_privmsgs_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_ranks_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_search_wordlist_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_smilies_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_themes_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_topics_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_users_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_words_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_groups_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_forum_prune_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_vote_desc_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; --- 7,23 ---- CREATE SEQUENCE phpbb_banlist_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_categories_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_disallow_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_forums_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_posts_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_privmsgs_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_ranks_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_search_wordlist_id_seq start 13 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_smilies_id_seq start 42 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_themes_id_seq start 7 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_topics_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_users_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_words_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; ! CREATE SEQUENCE phpbb_groups_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_forum_prune_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; CREATE SEQUENCE phpbb_vote_desc_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; |
|
From: James A. <th...@us...> - 2001-11-29 08:45:57
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv18218/language/lang_english Modified Files: lang_admin.php Log Message: Fixed bug with deleting categories, and found a hard coded english message! Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** lang_admin.php 2001/11/27 22:14:24 1.11 --- lang_admin.php 2001/11/29 08:45:55 1.12 *************** *** 350,354 **** $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; ! // --- 350,354 ---- $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; ! $lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category"; // |
|
From: James A. <th...@us...> - 2001-11-29 08:45:57
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18218/admin
Modified Files:
admin_forums.php
Log Message:
Fixed bug with deleting categories, and found a hard coded english message!
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** admin_forums.php 2001/11/27 20:57:58 1.29
--- admin_forums.php 2001/11/29 08:45:54 1.30
***************
*** 672,676 ****
if ($count > 0)
{
! message_die(GENERAL_ERROR, "You need to delete all forums before you can delete this category");
}
else
--- 672,676 ----
if ($count > 0)
{
! message_die(GENERAL_ERROR, $lang['Must_delete_forums']);
}
else
***************
*** 699,703 ****
'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,
--- 699,704 ----
'L_MOVE_CONTENTS' => $lang['Move_contents'],
'L_FORUM_NAME' => $lang['Forum_name'],
!
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
'S_SELECT_TO' => $select_to,
***************
*** 740,743 ****
--- 741,746 ----
$sql = "DELETE FROM " . CATEGORIES_TABLE ."
WHERE cat_id = $from_id";
+
+ echo $sql;
if( !$result = $db->sql_query($sql) )
{
|
|
From: James A. <th...@us...> - 2001-11-29 08:32:05
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13630
Modified Files:
admin_styles.php
Log Message:
Dumped array_merge for code that should be php3 compatable
Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_styles.php 2001/11/24 01:51:35 1.8
--- admin_styles.php 2001/11/29 08:32:02 1.9
***************
*** 465,468 ****
--- 465,470 ----
$style_id = $HTTP_GET_VARS['style_id'];
+ $selected_names = array();
+ $selected_values = array();
//
// Fetch the Theme Info from the db
***************
*** 491,495 ****
$selected_names = $db->sql_fetchrow($result);
! $selected = array_merge($selected_values, $selected_names);
$s_hidden_fields = '<input type="hidden" name="style_id" value="' . $style_id . '" />';
--- 493,512 ----
$selected_names = $db->sql_fetchrow($result);
! //$selected = array_merge($selected_values, $selected_names);
! if(count($selected_values))
! {
! while(list($key, $val) = each($selected_values))
! {
! $selected[$key] = $val;
! }
! }
!
! if($selected_names)
! {
! while(list($key, $val) = each($selected_names))
! {
! $selected[$key] = $val;
! }
! }
$s_hidden_fields = '<input type="hidden" name="style_id" value="' . $style_id . '" />';
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 02:26:32
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11376/includes
Modified Files:
sessions.php
Log Message:
Various updates
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** sessions.php 2001/11/22 01:04:01 1.37
--- sessions.php 2001/11/29 02:26:29 1.38
***************
*** 79,102 ****
if($ban_info['ban_ip'] || $ban_info['ban_userid'])
{
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
! message_die(CRITICAL_MESSAGE, $lang['You_been_banned']);
}
else
{
! /*
! $sql = "SELECT COUNT(*)
! FROM " . SESSIONS_TABLE . "
! WHERE session_ip = '$user_ip'";
! if($result = $db->sql_query($sql))
{
- if( $db->sql_numrows($result) > $board_config['session_max'] )
- {
- message_die(CRITICAL_MESSAGE, "Sorry but " . $board_config['sessions_max'] ." live sessions already exist for your IP. If you are browsing this site using multiple windows you should close one and visit later. If you are browsing from a single window or if this problem persists please contact the board administrator");
- }
- }
- */
-
- if($user_id == ANONYMOUS)
- {
$login = 0;
$autologin = 0;
--- 79,88 ----
if($ban_info['ban_ip'] || $ban_info['ban_userid'])
{
! message_die(CRITICAL_MESSAGE, 'You_been_banned');
}
else
{
! if( $user_id == ANONYMOUS )
{
$login = 0;
$autologin = 0;
***************
*** 107,134 ****
// in a cookie, if it exists
//
! $sessiondata['lastvisit'] = (!empty($sessiondata['sessiontime'])) ? $sessiondata['sessiontime'] : $current_time;
! $sql_update = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
WHERE (session_id = '" . $session_id . "')
AND (session_ip = '$user_ip')";
! $result = $db->sql_query($sql_update, END_TRANSACTION);
! if(!$result || !$db->sql_affectedrows())
{
$session_id = md5(uniqid($user_ip));
! $sql_insert = "INSERT INTO " . SESSIONS_TABLE . "
(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! $result = $db->sql_query($sql_insert);
if(!$result)
{
message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
}
-
}
! if($autologin)
{
mt_srand( (double) microtime() * 1000000);
--- 93,138 ----
// in a cookie, if it exists
//
! if( $sessionmethod == SESSION_METHOD_GET && $user_id != ANONYMOUS )
! {
! $sql = "SELECT user_lastvisit
! FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(CRITICAL_ERROR, "Couldn't obtain lastvisit data from user table", "", __LINE__, __FILE__, $sql);
! }
!
! $row = $db->sql_fetchrow($result);
! $sessiondata['lastvisit'] = $row['user_lastvisit'];
!
! }
! else
! {
! $sessiondata['lastvisit'] = (!empty($sessiondata['sessiontime'])) ? $sessiondata['sessiontime'] : $current_time;
! }
!
! $sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
WHERE (session_id = '" . $session_id . "')
AND (session_ip = '$user_ip')";
! $result = $db->sql_query($sql);
! if( !$result || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
! $sql = "INSERT INTO " . SESSIONS_TABLE . "
(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! $result = $db->sql_query($sql);
if(!$result)
{
message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
}
}
! if( $autologin && $sessionmethod = SESSION_METHOD_COOKIE )
{
mt_srand( (double) microtime() * 1000000);
***************
*** 138,146 ****
SET user_autologin_key = '$autologin_key'
WHERE user_id = $user_id";
! $result = $db->sql_query($sql_auto, END_TRANSACTION);
if(!$result)
{
message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", __LINE__, __FILE__, $sql);
}
$sessiondata['autologinid'] = $autologin_key;
}
--- 142,151 ----
SET user_autologin_key = '$autologin_key'
WHERE user_id = $user_id";
! $result = $db->sql_query($sql_auto);
if(!$result)
{
message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", __LINE__, __FILE__, $sql);
}
+
$sessiondata['autologinid'] = $autologin_key;
}
***************
*** 152,156 ****
$serialised_cookiedata = serialize($sessiondata);
setcookie($cookiename, $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
- // The session cookie may well change to last just this session soon ...
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
--- 157,160 ----
***************
*** 194,209 ****
//
- // Delete expired sessions
- //
- $expiry_time = $current_time - $board_config['session_length'];
- $sql = "DELETE FROM " . SESSIONS_TABLE . "
- WHERE session_time < $expiry_time";
- $result = $db->sql_query($sql);
- if(!$result)
- {
- message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", __LINE__, __FILE__, $sql);
- }
-
- //
// Does a session exist?
//
--- 198,201 ----
***************
*** 241,251 ****
// Only update session DB a minute or so after last update
//
! if($current_time - $userdata['session_time'] > 60)
{
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE (session_id = '" . $userdata['session_id'] . "')
! AND (session_ip = '$user_ip')
! AND (session_user_id = " . $userdata['user_id'] . ")";
$result = $db->sql_query($sql);
if(!$result)
--- 233,243 ----
// Only update session DB a minute or so after last update
//
! if( $current_time - $userdata['session_time'] > 60 )
{
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_ip = '$user_ip'
! AND session_user_id = " . $userdata['user_id'];
$result = $db->sql_query($sql);
if(!$result)
***************
*** 253,262 ****
message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", __LINE__, __FILE__, $sql);
}
! else
{
! $userdata['session_time'] = $current_time;
! return $userdata;
}
}
//
--- 245,276 ----
message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", __LINE__, __FILE__, $sql);
}
!
! if( $sessionmethod == SESSION_METHOD_GET )
{
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = $current_time
! WHERE user_id = " . $userdata['user_id'];
! $result = $db->sql_query($sql);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Error updating users table : session_pagestart (GET)", __LINE__, __FILE__, $sql);
! }
! }
!
! $userdata['session_time'] = $current_time;
! //
! // Delete expired sessions
! //
! $expiry_time = $current_time - $board_config['session_length'];
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_time < $expiry_time";
! $result = $db->sql_query($sql);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", __LINE__, __FILE__, $sql);
}
+
+ return $userdata;
}
//
***************
*** 377,381 ****
WHERE (session_id = '" . $session_id . "')
AND (session_user_id = $user_id)";
-
$result = $db->sql_query($sql, BEGIN_TRANSACTION);
if (!$result)
--- 391,394 ----
***************
*** 389,393 ****
SET user_autologin_key = ''
WHERE user_id = $user_id";
-
$result = $db->sql_query($sql, END_TRANSACTION);
if (!$result)
--- 402,405 ----
***************
*** 402,406 ****
$serialised_cookiedata = serialize($sessiondata);
setcookie($cookiename, $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
- // The session cookie may well change to last just this session soon ...
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
--- 414,417 ----
|
|
From: Paul S. O. <ps...@us...> - 2001-11-29 00:47:54
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv20060
Modified Files:
groupcp.php
Log Message:
Enable pagination for usergroup listing, a little crude but never mind
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** groupcp.php 2001/11/27 18:26:03 1.29
--- groupcp.php 2001/11/29 00:47:51 1.30
***************
*** 555,558 ****
--- 555,571 ----
//
+ // Get moderator details for this group
+ //
+ $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm
+ FROM " . USERS_TABLE . "
+ WHERE user_id = " . $group_info['group_moderator'];
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Error getting user list for group", "", __LINE__, __FILE__, $sql);
+ }
+
+ $group_moderator = $db->sql_fetchrow($result);
+
+ //
// Get user information for this group
//
***************
*** 561,567 ****
WHERE ug.group_id = $group_id
AND u.user_id = ug.user_id
! AND ug.user_pending = 0
! ORDER BY u.user_regdate
! LIMIT $start, " . $board_config['topics_per_page'];
if(!$result = $db->sql_query($sql))
{
--- 574,580 ----
WHERE ug.group_id = $group_id
AND u.user_id = ug.user_id
! AND ug.user_pending = 0
! AND ug.user_id <> " . $group_moderator['user_id'] . "
! ORDER BY u.username";
if(!$result = $db->sql_query($sql))
{
***************
*** 580,584 ****
AND ug.user_pending = 1
AND u.user_id = ug.user_id
! ORDER BY u.user_regdate";
if(!$result = $db->sql_query($sql))
{
--- 593,597 ----
AND ug.user_pending = 1
AND u.user_id = ug.user_id
! ORDER BY u.username";
if(!$result = $db->sql_query($sql))
{
***************
*** 685,688 ****
--- 698,762 ----
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+ //
+ // Add the moderator
+ //
+ $username = $group_moderator['username'];
+ $user_id = $group_moderator['user_id'];
+ $from = $group_moderator['user_from'];
+
+ $joined = create_date($board_config['default_dateformat'], $group_moderator['user_regdate'], $board_config['board_timezone']);
+
+ $posts = ($group_moderator['user_posts']) ? $group_moderator['user_posts'] : 0;
+
+ $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
+
+ $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
+
+ if( !empty($group_moderator['user_viewemail']) )
+ {
+ $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $group_moderator['user_id']) : "mailto:" . $group_moderator['user_email'];
+
+ $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
+ }
+ else
+ {
+ $email_img = "";
+ }
+
+ $www_img = ( $group_moderator['user_website'] ) ? "<a href=\"" . $group_moderator['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
+
+ if( !empty($group_moderator['user_icq']) )
+ {
+ $icq_status_img = "<a href=\"http://wwp.icq.com/" . $group_moderator['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $group_moderator['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
+
+ //
+ // This cannot stay like this, it needs a 'proper' solution, eg a separate
+ // template for overlaying the ICQ icon, or we just do away with the icq status
+ // display (which is after all somewhat a pain in the rear :D
+ //
+ if( $theme['template_name'] == "subSilver" )
+ {
+ $icq_add_img = '<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" class="icqback"><img src="images/spacer.gif" width="3" height="18" alt = "">' . $icq_status_img . '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $group_moderator['user_icq'] . '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="' . $lang['ICQ'] . '" /></a></td></tr></table>';
+ $icq_status_img = "";
+ }
+ else
+ {
+ $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $group_moderator['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
+ }
+ }
+ else
+ {
+ $icq_status_img = "";
+ $icq_add_img = "";
+ }
+
+ $aim_img = ( $group_moderator['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $group_moderator['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "";
+
+ $msn_img = ( $group_moderator['user_msnm'] ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $group_moderator['user_id']) . "\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "";
+
+ $yim_img = ( $group_moderator['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $group_moderator['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "";
+
+ $search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($group_moderator['username']) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
+
$template->assign_vars(array(
"L_GROUP_INFORMATION" => $lang['Group_Information'],
***************
*** 737,740 ****
--- 811,831 ----
"L_FIND_USERNAME" => $lang['Find_username'],
+ "MOD_ROW_COLOR" => "#" . $theme['td_color1'],
+ "MOD_ROW_CLASS" => $theme['td_class1'],
+ "MOD_USERNAME" => $username,
+ "MOD_FROM" => $from,
+ "MOD_JOINED" => $joined,
+ "MOD_POSTS" => $posts,
+ "MOD_EMAIL_IMG" => $email_img,
+ "MOD_PM_IMG" => $pm_img,
+ "MOD_WWW_IMG" => $www_img,
+ "MOD_ICQ_STATUS_IMG" => $icq_status_img,
+ "MOD_ICQ_ADD_IMG" => $icq_add_img,
+ "MOD_AIM_IMG" => $aim_img,
+ "MOD_YIM_IMG" => $yim_img,
+ "MOD_MSN_IMG" => $msn_img,
+ "MOD_SEARCH_IMG" => $search,
+
+ "U_MOD_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id),
"U_SEARCH_USER" => append_sid("search.$phpEx?mode=searchuser"),
***************
*** 744,748 ****
);
! for($i = 0; $i < $members_count; $i++)
{
$username = $group_members[$i]['username'];
--- 835,842 ----
);
! //
! // Dump out the remaining users
! //
! for($i = $start; $i < min($board_config['topics_per_page'] + $start, $members_count); $i++)
{
$username = $group_members[$i]['username'];
***************
*** 772,776 ****
$www_img = ( $group_members[$i]['user_website'] ) ? "<a href=\"" . $group_members[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
! if( !empty($postrow[$i]['user_icq']) )
{
$icq_status_img = "<a href=\"http://wwp.icq.com/" . $group_members[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $group_members[$i]['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
--- 866,870 ----
$www_img = ( $group_members[$i]['user_website'] ) ? "<a href=\"" . $group_members[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
! if( !empty($group_members[$i]['user_icq']) )
{
$icq_status_img = "<a href=\"http://wwp.icq.com/" . $group_members[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $group_members[$i]['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
***************
*** 804,865 ****
$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($group_members[$i]['username']) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
!
! if( $user_id == $group_info['group_moderator'] )
{
! $template->assign_vars(array(
! "U_MOD_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id),
! "MOD_ROW_COLOR" => "#" . $theme['td_color1'],
! "MOD_ROW_CLASS" => $theme['td_class1'],
! "MOD_USERNAME" => $username,
! "MOD_FROM" => $from,
! "MOD_JOINED" => $joined,
! "MOD_POSTS" => $posts,
!
! "MOD_EMAIL_IMG" => $email_img,
! "MOD_PM_IMG" => $pm_img,
! "MOD_WWW_IMG" => $www_img,
! "MOD_ICQ_STATUS_IMG" => $icq_status_img,
! "MOD_ICQ_ADD_IMG" => $icq_add_img,
! "MOD_AIM_IMG" => $aim_img,
! "MOD_YIM_IMG" => $yim_img,
! "MOD_MSN_IMG" => $msn_img,
! "MOD_SEARCH_IMG" => $search)
! );
! }
! else
! {
! if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
! {
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars("member_row", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "USERNAME" => $username,
! "FROM" => $from,
! "JOINED" => $joined,
! "POSTS" => $posts,
!
! "USER_ID" => $user_id,
! "EMAIL_IMG" => $email_img,
! "PM_IMG" => $pm_img,
! "WWW_IMG" => $www_img,
! "ICQ_STATUS_IMG" => $icq_status_img,
! "ICQ_ADD_IMG" => $icq_add_img,
! "AIM_IMG" => $aim_img,
! "YIM_IMG" => $yim_img,
! "MSN_IMG" => $msn_img,
! "SEARCH_IMG" => $search,
!
! "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id))
! );
! if( $is_moderator )
! {
! $template->assign_block_vars("member_row.switch_mod_option", array());
! }
}
}
--- 898,933 ----
$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($group_members[$i]['username']) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
!
! if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
{
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("member_row", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "USERNAME" => $username,
! "FROM" => $from,
! "JOINED" => $joined,
! "POSTS" => $posts,
!
! "USER_ID" => $user_id,
!
! "EMAIL_IMG" => $email_img,
! "PM_IMG" => $pm_img,
! "WWW_IMG" => $www_img,
! "ICQ_STATUS_IMG" => $icq_status_img,
! "ICQ_ADD_IMG" => $icq_add_img,
! "AIM_IMG" => $aim_img,
! "YIM_IMG" => $yim_img,
! "MSN_IMG" => $msn_img,
! "SEARCH_IMG" => $search,
! "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id))
! );
! if( $is_moderator )
! {
! $template->assign_block_vars("member_row.switch_mod_option", array());
}
}
***************
*** 878,881 ****
--- 946,956 ----
}
+ $template->assign_vars(array(
+ "PAGINATION" => generate_pagination("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start),
+ "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $members_count / $board_config['topics_per_page'] )),
+
+ "L_GOTO_PAGE" => $lang['Goto_page'])
+ );
+
if( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member && !$is_moderator )
{
***************
*** 929,933 ****
$www_img = ( $modgroup_pending_list[$i]['user_website'] ) ? "<a href=\"" . $modgroup_pending_list[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : "";
! if( !empty($postrow[$i]['user_icq']) )
{
$icq_status_img = "<a href=\"http://wwp.icq.com/" . $modgroup_pending_list[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $modgroup_pending_list[$i]['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
--- 1004,1008 ----
$www_img = ( $modgroup_pending_list[$i]['user_website'] ) ? "<a href=\"" . $modgroup_pending_list[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : "";
! if( !empty($modgroup_pending_list[$i]['user_icq']) )
{
$icq_status_img = "<a href=\"http://wwp.icq.com/" . $modgroup_pending_list[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $modgroup_pending_list[$i]['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
***************
*** 1009,1012 ****
--- 1084,1089 ----
$template->assign_block_vars("switch_add_member", array());
}
+
+
//
|
|
From: Bart v. B. <ba...@us...> - 2001-11-28 18:49:02
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv2606
Modified Files:
overall_header.tpl
Log Message:
It's the small thing that can annoy the heck out of you :)
Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/overall_header.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** overall_header.tpl 2001/11/26 14:19:39 1.11
--- overall_header.tpl 2001/11/28 18:48:53 1.12
***************
*** 28,32 ****
th { font-family: Verdana, Arial, Helvetica, sans-serif }
P { font-family: Verdana, Arial, Helvetica, sans-serif }
! hr { height: 1px; color:{T_TR_COLOR3} }
--- 28,32 ----
th { font-family: Verdana, Arial, Helvetica, sans-serif }
P { font-family: Verdana, Arial, Helvetica, sans-serif }
! hr { height: 0px; border: solid {T_TR_COLOR3} 0px; border-top-width: 1px;}
***************
*** 135,139 ****
/* The content of the posts (body of text) */
! .postbody { font-size : 12px; line-height: 150%}
a.postlink { text-decoration: none; color : {T_BODY_LINK} }
--- 135,139 ----
/* The content of the posts (body of text) */
! .postbody { font-size : 12px; line-height: 18px}
a.postlink { text-decoration: none; color : {T_BODY_LINK} }
|
|
From: Paul S. O. <ps...@us...> - 2001-11-27 22:14:27
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv26651/language/lang_english Modified Files: lang_main.php lang_admin.php Log Message: Spelling errors and minor changes ... getting quite chilly now Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** lang_main.php 2001/11/27 17:36:04 1.55 --- lang_main.php 2001/11/27 22:14:24 1.56 *************** *** 32,36 **** // ! setlocale(LC_ALL, "en"); $lang['ENCODING'] = "utf-8"; $lang['DIRECTION'] = "LTR"; --- 32,36 ---- // ! //setlocale(LC_ALL, "en"); $lang['ENCODING'] = "utf-8"; $lang['DIRECTION'] = "LTR"; *************** *** 300,304 **** $lang['Flood_Error'] = "You cannot make another post so soon after your last, please try again in a short while"; ! $lang['Empty_subject'] = "You must specifiy a subject when posting a new topic"; $lang['Empty_message'] = "You must enter a message when posting"; $lang['Announce_and_sticky'] = "You cannot post a topic that is both an announcement and a sticky topic"; --- 300,304 ---- $lang['Flood_Error'] = "You cannot make another post so soon after your last, please try again in a short while"; ! $lang['Empty_subject'] = "You must specify a subject when posting a new topic"; $lang['Empty_message'] = "You must enter a message when posting"; $lang['Announce_and_sticky'] = "You cannot post a topic that is both an announcement and a sticky topic"; *************** *** 466,470 **** $lang['Incomplete_URL'] = "The URL you entered is incomplete"; $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid"; ! $lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrived because you account is currently inactive. Please contact the forum administrator for more information"; $lang['Always_smile'] = "Always enable Smilies"; --- 466,470 ---- $lang['Incomplete_URL'] = "The URL you entered is incomplete"; $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid"; ! $lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrieved because you account is currently inactive. Please contact the forum administrator for more information"; $lang['Always_smile'] = "Always enable Smilies"; *************** *** 607,611 **** $lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership"; $lang['No_pending_group_members'] = "This group has no pending members"; ! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notifed when your subscription is approved by the group moderator"; $lang['Group_request'] = "A request to join your group has been made"; $lang['Group_approved'] = "Your request has been approved"; --- 607,611 ---- $lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership"; $lang['No_pending_group_members'] = "This group has no pending members"; ! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notified when your subscription is approved by the group moderator"; $lang['Group_request'] = "A request to join your group has been made"; $lang['Group_approved'] = "Your request has been approved"; *************** *** 620,624 **** $lang['Confirm_unsub_pending'] = "Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?"; ! $lang['Unsub_success'] = "You have been unsubscribed from this group."; $lang['Approve_selected'] = "Approve Selected"; --- 620,624 ---- $lang['Confirm_unsub_pending'] = "Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?"; ! $lang['Unsub_success'] = "You have been un-subscribed from this group."; $lang['Approve_selected'] = "Approve Selected"; *************** *** 897,902 **** $lang['General_Error'] = "General Error"; $lang['Critical_Error'] = "Critical Error"; ! $lang['An_error_occured'] = "An Error Occured"; ! $lang['A_critical_error'] = "A Critical Error Occured"; $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password"; --- 897,902 ---- $lang['General_Error'] = "General Error"; $lang['Critical_Error'] = "Critical Error"; ! $lang['An_error_occured'] = "An Error Occurred"; ! $lang['A_critical_error'] = "A Critical Error Occurred"; $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password"; Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** lang_admin.php 2001/11/24 01:51:36 1.10 --- lang_admin.php 2001/11/27 22:14:24 1.11 *************** *** 37,48 **** $lang['Configuration'] = "Configuration"; $lang['Permissions'] = "Permissions"; ! $lang['Manage'] = "Manage"; ! $lang['Disallow'] = "Disallow usernames"; $lang['Prune'] = "Pruning"; ! $lang['Mass_Email'] = "Send Bulk Email"; $lang['Ranks'] = "Ranks"; $lang['Smilies'] = "Smilies"; $lang['Ban_Management'] = "Ban Control"; ! $lang['Word_Censor'] = "Word Censoring"; $lang['Export'] = "Export"; $lang['Create_new'] = "Create"; --- 37,48 ---- $lang['Configuration'] = "Configuration"; $lang['Permissions'] = "Permissions"; ! $lang['Manage'] = "Management"; ! $lang['Disallow'] = "Disallow names"; $lang['Prune'] = "Pruning"; ! $lang['Mass_Email'] = "Mass Email"; $lang['Ranks'] = "Ranks"; $lang['Smilies'] = "Smilies"; $lang['Ban_Management'] = "Ban Control"; ! $lang['Word_Censor'] = "Word Censors"; $lang['Export'] = "Export"; $lang['Create_new'] = "Create"; *************** *** 92,96 **** $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"; --- 92,96 ---- $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 separated 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"; *************** *** 217,221 **** $lang['No_banned_email'] = "No banned email addresses"; ! $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully"; --- 217,221 ---- $lang['No_banned_email'] = "No banned email addresses"; ! $lang['Ban_update_sucessful'] = "The banlist has been updated successfully"; *************** *** 255,259 **** $lang['Allow_BBCode'] = "Allow BBCode"; $lang['Allowed_tags'] = "Allowed HTML tags"; ! $lang['Allowed_tags_explain'] = "Seperate tags with commas"; $lang['Allow_smilies'] = "Allow Smilies"; $lang['Smilies_path'] = "Smilies Storage Path"; --- 255,259 ---- $lang['Allow_BBCode'] = "Allow BBCode"; $lang['Allowed_tags'] = "Allowed HTML tags"; ! $lang['Allowed_tags_explain'] = "Separate tags with commas"; $lang['Allow_smilies'] = "Allow Smilies"; $lang['Smilies_path'] = "Smilies Storage Path"; *************** *** 316,320 **** $lang['Action'] = "Action"; $lang['Update_order'] = "Update Order"; ! $lang['Config_updated'] = "Forum Configuration Updated Sucessfully"; $lang['Edit'] = "Edit"; $lang['Delete'] = "Delete"; --- 316,320 ---- $lang['Action'] = "Action"; $lang['Update_order'] = "Update Order"; ! $lang['Config_updated'] = "Forum Configuration Updated Successfully"; $lang['Edit'] = "Edit"; $lang['Delete'] = "Delete"; *************** *** 394,398 **** $lang['Look_up_user'] = "Look up user"; ! $lang['Admin_user_fail'] = "Couldn't update the user's profiile."; $lang['Admin_user_updated'] = "The user's profile was successfully updated."; $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration"; --- 394,398 ---- $lang['Look_up_user'] = "Look up user"; ! $lang['Admin_user_fail'] = "Couldn't update the user's profile."; $lang['Admin_user_updated'] = "The user's profile was successfully updated."; $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration"; *************** *** 481,485 **** // 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, you will be notified when the script has completed"; $lang['Compose'] = "Compose"; --- 481,485 ---- // 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 recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for amass emailing to take a long time, you will be notified when the script has completed"; $lang['Compose'] = "Compose"; *************** *** 498,502 **** $lang['DB_config'] = "Database Configuration"; $lang['Admin_config'] = "Admin Configuration"; ! $lang['Installer_Error'] = "An error has occured during installation"; $lang['Previous_Install'] = "A previous installation has been detected"; $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist"; --- 498,502 ---- $lang['DB_config'] = "Database Configuration"; $lang['Admin_config'] = "Admin Configuration"; ! $lang['Installer_Error'] = "An error has occurred during installation"; $lang['Previous_Install'] = "A previous installation has been detected"; $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist"; *************** *** 512,519 **** $lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2."; $lang['Finish_Install'] = "Finish Installation"; ! $lang['Install_db_error'] = "An error occured trying to update the database"; $lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN."; $lang['Table_Prefix'] = "Prefix for tables in database"; ! $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2."; $lang['Download_config'] = "Download Config"; $lang['ftp_choose'] = "Choose Download Method"; --- 512,519 ---- $lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2."; $lang['Finish_Install'] = "Finish Installation"; ! $lang['Install_db_error'] = "An error occurred trying to update the database"; $lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN."; $lang['Table_Prefix'] = "Prefix for tables in database"; ! $lang['Unwriteable_config'] = "Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2."; $lang['Download_config'] = "Download Config"; $lang['ftp_choose'] = "Choose Download Method"; *************** *** 598,602 **** $lang['Create_theme'] = "Create Theme"; ! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, ie. CCCCCC is valid, #CCCCCC is not"; $lang['Export_themes'] = "Export Themes"; --- 598,602 ---- $lang['Create_theme'] = "Create Theme"; ! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, i.e.. CCCCCC is valid, #CCCCCC is not"; $lang['Export_themes'] = "Export Themes"; *************** *** 625,649 **** $lang['Stylesheet'] = "CSS Stylesheet"; $lang['Background_image'] = "Background Image"; ! $lang['Background_color'] = "Background Color"; $lang['Theme_name'] = "Theme Name"; ! $lang['Link_color'] = "Link Color"; ! $lang['VLink_color'] = "Visited Link Color"; ! $lang['ALink_color'] = "Active Link Color"; ! $lang['HLink_color'] = "Hover Link Color"; ! $lang['Tr_color1'] = "Table Row Color 1"; ! $lang['Tr_color2'] = "Table Row Color 2"; ! $lang['Tr_color3'] = "Table Row Color 3"; $lang['Tr_class1'] = "Table Row Class 1"; $lang['Tr_class2'] = "Table Row Class 2"; $lang['Tr_class3'] = "Table Row Class 3"; ! $lang['Th_color1'] = "Table Header Color 1"; ! $lang['Th_color2'] = "Table Header Color 2"; ! $lang['Th_color3'] = "Table Header Color 3"; $lang['Th_class1'] = "Table Header Class 1"; $lang['Th_class2'] = "Table Header Class 2"; $lang['Th_class3'] = "Table Header Class 3"; ! $lang['Td_color1'] = "Table Cell Color 1"; ! $lang['Td_color2'] = "Table Cell Color 2"; ! $lang['Td_color3'] = "Table Cell Color 3"; $lang['Td_class1'] = "Table Cell Class 1"; $lang['Td_class2'] = "Table Cell Class 2"; --- 625,649 ---- $lang['Stylesheet'] = "CSS Stylesheet"; $lang['Background_image'] = "Background Image"; ! $lang['Background_color'] = "Background Colour"; $lang['Theme_name'] = "Theme Name"; ! $lang['Link_color'] = "Link Colour"; ! $lang['VLink_color'] = "Visited Link Colour"; ! $lang['ALink_color'] = "Active Link Colour"; ! $lang['HLink_color'] = "Hover Link Colour"; ! $lang['Tr_color1'] = "Table Row Colour 1"; ! $lang['Tr_color2'] = "Table Row Colour 2"; ! $lang['Tr_color3'] = "Table Row Colour 3"; $lang['Tr_class1'] = "Table Row Class 1"; $lang['Tr_class2'] = "Table Row Class 2"; $lang['Tr_class3'] = "Table Row Class 3"; ! $lang['Th_color1'] = "Table Header Colour 1"; ! $lang['Th_color2'] = "Table Header Colour 2"; ! $lang['Th_color3'] = "Table Header Colour 3"; $lang['Th_class1'] = "Table Header Class 1"; $lang['Th_class2'] = "Table Header Class 2"; $lang['Th_class3'] = "Table Header Class 3"; ! $lang['Td_color1'] = "Table Cell Colour 1"; ! $lang['Td_color2'] = "Table Cell Colour 2"; ! $lang['Td_color3'] = "Table Cell Colour 3"; $lang['Td_class1'] = "Table Cell Class 1"; $lang['Td_class2'] = "Table Cell Class 2"; *************** *** 655,661 **** $lang['fontsize2'] = "Font Size 2"; $lang['fontsize3'] = "Font Size 3"; ! $lang['fontcolor1'] = "Font Color 1"; ! $lang['fontcolor2'] = "Font Color 2"; ! $lang['fontcolor3'] = "Font Color 3"; $lang['span_class1'] = "Span Class 1"; $lang['span_class2'] = "Span Class 2"; --- 655,661 ---- $lang['fontsize2'] = "Font Size 2"; $lang['fontsize3'] = "Font Size 3"; ! $lang['fontcolor1'] = "Font Colour 1"; ! $lang['fontcolor2'] = "Font Colour 2"; ! $lang['fontcolor3'] = "Font Colour 3"; $lang['span_class1'] = "Span Class 1"; $lang['span_class2'] = "Span Class 2"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-27 22:12:53
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv16303/templates/subSilver
Modified Files:
faq_body.tpl
Log Message:
Updated FAQ ... near complete?
Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** faq_body.tpl 2001/11/20 02:28:23 1.5
--- faq_body.tpl 2001/11/27 21:37:31 1.6
***************
*** 16,19 ****
--- 16,22 ----
</tr>
<!-- BEGIN faq_block_link -->
+ <tr>
+ <td><span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span></td>
+ </tr>
<!-- BEGIN faq_row_link -->
<tr>
***************
*** 29,34 ****
<tr>
<td height="28" class="cat"> </td>
</tr>
- <!-- BEGIN faq_block -->
<!-- BEGIN faq_row -->
<tr>
--- 32,45 ----
<tr>
<td height="28" class="cat"> </td>
+ </tr>
+ </table>
+
+ <br clear="all" />
+
+ <!-- BEGIN faq_block -->
+ <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
+ <tr>
+ <td height="28" class="cat" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
</tr>
<!-- BEGIN faq_row -->
<tr>
***************
*** 39,47 ****
</tr>
<!-- END faq_row -->
- <tr>
- <td height="28" class="cat"> </td>
- </tr>
- <!-- END faq_block -->
</table>
<table width="100%" cellspacing="2" border="0" align="center">
--- 50,57 ----
</tr>
<!-- END faq_row -->
</table>
+
+ <br clear="all" />
+ <!-- END faq_block -->
<table width="100%" cellspacing="2" border="0" align="center">
|
|
From: Paul S. O. <ps...@us...> - 2001-11-27 22:12:51
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv16303/language/lang_english
Modified Files:
lang_faq.php
Log Message:
Updated FAQ ... near complete?
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_faq.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_faq.php 2001/11/16 15:16:14 1.2
--- lang_faq.php 2001/11/27 21:37:31 1.3
***************
*** 34,76 ****
$faq[] = array("Why can't I login?", "Have you registered? Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.");
$faq[] = array("Why do I need to register at all?", "You may not have too, it is up to the administrator of the board as to whether you need to register in order to post messages. However registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.");
! $faq[] = array("Why do I get logged off automatically?", "If you do not check the 'Log me in automatically' box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, eg. library, internet cafe, university cluster, etc.");
! $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option 'Hide your online status', if you switch this 'on' you'll only appear to board admins or to yourself. You will be counted as a hidden user.");
$faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I've forgotten my password</u>, follow the instructions and you should be back online in no time");
! $faq[] = array("I registered but cannot login!", "Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of 'roque' users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.");
$faq[] = array("I registered in the past but cannot login any more?!", "The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.");
- $faq[] = array("--","");
$faq[] = array("How do I change my settings?", "All your settings (if you are registered) are stored in the database. To alter them click the <u>Profile</u> link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings");
! $faq[] = array("The times are not correct!", "The times are almost certainly correct, however what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case you should change your profile setting for the timezone to match your particular area, eg. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings can only be done by registered users. So if you are not registered this is a good 'time' to do so, if you pardon the pun!");
! $faq[] = array("I changed the timezone and the time is still wrong!", "If you are sure you have set the timezone correctly and the time is still different the most likely answer is 'daylight savings time' (or 'summer time' as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the 'real' local time.");
$faq[] = array("My language is not in the list!", "The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need, if it does not exist then please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages)");
! $faq[] = array("How do I show an image below my username?", "There may be two images below a username when viewing posts. The first is an image associated with your 'rank', generally these take the form of stars or blocks indicating how many posts you have made or your 'status' on the forums. Below this may be a larger image known as an avatar, this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we're sure they'll be good!)");
$faq[] = array("When I click the email link for a user it asks me to login?", "Sorry but only registered users can send email to people via the built-in email form (if the admin has enabled this feature). This is to prevent malicious use of the email system by anonymous users.");
! $faq[] = array("--","");
! $faq[] = array("How do I post a topic in a forum?", "Easy, click the relevant button on either the forum or topic screens. You may need to register before you can post a message, the facilities available to you are listed at the bottom of the forum and topic screens (the 'You can post new topics, You can vote in polls, etc.' list)");
! $faq[] = array("How do I edit or delete a post?", "Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the 'edit' button for the relevant post. If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or admins edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.");
! $faq[] = array("How do I create a poll?", "Creating a poll is easy, when you post a new topic (or edit the first post of a topic, if you have permission) you shoul see a 'Add Poll' form below the main posting box (if you cannot see this then you probably do not have rights to create polls). You should enter a title for the poll and then at least two options (to set an option type in the poll question and click the 'Add option' button. You can also set a time limit for the poll, 0 is an infinite poll. There will be a limit to the number of options you can list, this is set by the board administrator");
! $faq[] = array("How do I edit or delete a poll?", "As with posts, polls can only be edited by the original poster, a moderator or board admin. To edit a poll click the first post in the topic (this always has the poll associated with it). If no one has cast a vote then users can delete the poll or edit any poll option, however if people have already placed votes only moderators or admins can edit or delete it. This is to prevent people rigging polls by changing options mid-way through a poll");
$faq[] = array("Why can't I access a forum?", "Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.");
$faq[] = array("Why can't I vote in polls?", "Only registered users can vote in polls (so as to prevent spoofing of results). If you have registered and still cannot vote then you probably do not have appropriate access rights.");
- $faq[] = array("--","");
$faq[] = array("I cannot send private messages!", "There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board or the board administrator has prevented you from sending messages. If it is the later case you should try asking the administrator why.");
$faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.");
! $faq[] = array("I have recieved a spamming or abusive email from someone on this board!", "We are sorry to hear that. The email form feature of this board includes safeguards to try and track users who send such posts. You should email the board administrator with a full copy of the email you received, it is very important this include the headers (these list details of the user that sent the email). They can then take action.");
! $faq[] = array("--","");
!
! $faq[] = array("What are usergroups?", "Usergroups are a way in which board administrators can group users. Each user can belong to several groups (this differs from most other boards) and each group can be assigned individual access rights. This makes it easy for admins to set up several users as moderators of a forum, or to give them access to a private forum, etc.");
! $faq[] = array("How do I join a usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups. Not all groups are 'open access', some are closed and some may even have hidden memberships. If the board is open then you can request to join it by clicking the appropriate button. The user group moderator will need to approve your request, they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down, they will have their reasons.");
! $faq[] = array("How do I become a usergroup moderator?", "Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin, try dropping them a private message.");
! $faq[] = array("--","");
! $faq[] = array("Why isn't X feature available?", "This software was written by and licenced through phpBB Group. If you believe a feature needs to be added then please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the Group uses sourceforge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.");
! $faq[] = array("Who do I contact about abusive and/or legal matters related to this board?", "You should contact the administrator of this board. If you cannot find who this you should first contact one of the forum moderators and ask them who you should in turn contact. If still get no response you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (eg. yahoo, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that phpBB Group has absolutely no control and cannot in any way be held liable over how, where or by whom this board is used. It is absolutely pointless contacting phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpbb.com website or the discrete software of phpBB itself. If you do email phpBB Group about any third party use of this software then you should expect a terse response or no response at all.");
! $faq[] = array("--","");
?>
--- 34,94 ----
+ $faq[] = array("--","Login and Registration Issues");
$faq[] = array("Why can't I login?", "Have you registered? Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.");
$faq[] = array("Why do I need to register at all?", "You may not have too, it is up to the administrator of the board as to whether you need to register in order to post messages. However registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.");
! $faq[] = array("Why do I get logged off automatically?", "If you do not check the <i>Log me in automatically</i> box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university cluster, etc.");
! $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option <i>Hide your online status</i>, if you switch this <i>on</i> you'll only appear to board administrators or to yourself. You will be counted as a hidden user.");
$faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I've forgotten my password</u>, follow the instructions and you should be back online in no time");
! $faq[] = array("I registered but cannot login!", "Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of <i>rouge</i> users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.");
$faq[] = array("I registered in the past but cannot login any more?!", "The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.");
+
+ $faq[] = array("--","User Preferences and settings");
$faq[] = array("How do I change my settings?", "All your settings (if you are registered) are stored in the database. To alter them click the <u>Profile</u> link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings");
! $faq[] = array("The times are not correct!", "The times are almost certainly correct, however what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case you should change your profile setting for the timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings can only be done by registered users. So if you are not registered this is a good time to do so, if you pardon the pun!");
! $faq[] = array("I changed the timezone and the time is still wrong!", "If you are sure you have set the timezone correctly and the time is still different the most likely answer is daylight savings time (or summer time as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the real local time.");
$faq[] = array("My language is not in the list!", "The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need, if it does not exist then please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages)");
! $faq[] = array("How do I show an image below my username?", "There may be two images below a username when viewing posts. The first is an image associated with your rank, generally these take the form of stars or blocks indicating how many posts you have made or your status on the forums. Below this may be a larger image known as an avatar, this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we're sure they'll be good!)");
! $faq[] = array("How do I change my rank?", "In general you cannot directly change the wording of any rank (ranks appear below your username in topics and on your profile depending on the style used). Most boards use ranks to indicate the number of posts you have made and to identify certain users, e.g. moderators and administrators may have a special rank. Please do not abuse the board by posting unnecessarily just to increase your rank, you will probably find the moderator or administrator will simply lower your post count.");
$faq[] = array("When I click the email link for a user it asks me to login?", "Sorry but only registered users can send email to people via the built-in email form (if the admin has enabled this feature). This is to prevent malicious use of the email system by anonymous users.");
!
! $faq[] = array("--","Posting Issues");
! $faq[] = array("How do I post a topic in a forum?", "Easy, click the relevant button on either the forum or topic screens. You may need to register before you can post a message, the facilities available to you are listed at the bottom of the forum and topic screens (the <i>You can post new topics, You can vote in polls, etc.<i> list)");
! $faq[] = array("How do I edit or delete a post?", "Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the <i>edit</i> button for the relevant post. If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or administrators edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.");
! $faq[] = array("How do I add a signature to my post?", "To add a signature to a post you must first create one, this is done via your profile. Once created you can check the <i>Add Signature</i> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio box in your profile (you can still prevent a signature being added to individual posts by un-checking the add signature box on the posting form)");
! $faq[] = array("How do I create a poll?", "Creating a poll is easy, when you post a new topic (or edit the first post of a topic, if you have permission) you should see a <i>Add Poll</i> form below the main posting box (if you cannot see this then you probably do not have rights to create polls). You should enter a title for the poll and then at least two options (to set an option type in the poll question and click the <i>Add option</i> button. You can also set a time limit for the poll, 0 is an infinite poll. There will be a limit to the number of options you can list, this is set by the board administrator");
! $faq[] = array("How do I edit or delete a poll?", "As with posts, polls can only be edited by the original poster, a moderator or board admin. To edit a poll click the first post in the topic (this always has the poll associated with it). If no one has cast a vote then users can delete the poll or edit any poll option, however if people have already placed votes only moderators or administrators can edit or delete it. This is to prevent people rigging polls by changing options mid-way through a poll");
$faq[] = array("Why can't I access a forum?", "Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.");
$faq[] = array("Why can't I vote in polls?", "Only registered users can vote in polls (so as to prevent spoofing of results). If you have registered and still cannot vote then you probably do not have appropriate access rights.");
+
+ $faq[] = array("--","Formatting and Topic Types");
+ $faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML, whether you can use BBCode is determined by the administrator (you can also disable it on a per post basis from the posting form). BBCode itself is similar in style to HTML, tags are enclosed in square braces [ and ] rather than < and > and it offers greater control over what and how something is displayed. For more information on BBCode see the guide which can be accessed from the posting page.");
+ $faq[] = array("Can I use HTML?", "That depends on whether the administrator allows you too, they have complete control over it. If you are allowed to use it you will probably find only certain tags work. This is a <i>safety</i> feature to prevent people abusing the board by using tags which may destroy the layout or cause other problems. If HTML is enabled you can disable it on a per post basis from the posting form.");
+ $faq[] = array("What are Smileys?", "Smileys, or Emoticons are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys though, they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether");
+ $faq[] = array("Can I post Images?", "Images can indeed be shown in your posts. However, there is no facility at present for uploading images directly to this board. Therefore you must link to an image stored on a publicly accessible web server, e.g. http://www.some-unknown-place.net/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use either the BBCode [img] tag or appropriate HTML (if allowed).");
+ $faq[] = array("What are Announcements?", "Announcements often contain important information and you should read them as soon as possible. Announcements appear at the top of every page in the forum to which they are posted. Whether or not you can post an announcement depends on the permissions required, these are set by the administrator.");
+ $faq[] = array("What are Sticky topics?", "Sticky topics appear below any announcements in viewforum and only on the first page. They are often quite important so you should read them where possible. As with announcements the board administrator determines what permissions are required to post sticky topics in each forum.");
+ $faq[] = array("What are Locked topics?", "Locked topics are set this way by either the forum moderator or board administrator. You cannot reply to locked topics and any poll it contained is automatically ended. Topics may be locked for many reasons.");
+
+
+ $faq[] = array("--","User Levels and Groups");
+ $faq[] = array("What are Administrators?", "Administrators are people assigned the highest level of control over the entire board. These people can control all facets of board operation which includes setting permissions, banning users, creating usergroups or moderators, etc. They also have full moderator capabilities in all the forums.");
+ $faq[] = array("What are Moderators?", "Moderators are individuals (or groups of individuals) whose job it is to look after the running of the forums from day to day. They have the power to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally moderators are there to prevent people going <i>off-topic<i> or posting abusive or offensive material.");
+ $faq[] = array("What are Usergroups?", "Usergroups are a way in which board administrators can group users. Each user can belong to several groups (this differs from most other boards) and each group can be assigned individual access rights. This makes it easy for administrators to set up several users as moderators of a forum, or to give them access to a private forum, etc.");
+ $faq[] = array("How do I join a Usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups. Not all groups are <i>open access</i>, some are closed and some may even have hidden memberships. If the board is open then you can request to join it by clicking the appropriate button. The user group moderator will need to approve your request, they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down, they will have their reasons.");
+ $faq[] = array("How do I become a Usergroup Moderator?", "Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin, try dropping them a private message.");
+
+
+ $faq[] = array("--","Private Messaging");
$faq[] = array("I cannot send private messages!", "There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board or the board administrator has prevented you from sending messages. If it is the later case you should try asking the administrator why.");
$faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.");
! $faq[] = array("I have received a spamming or abusive email from someone on this board!", "We are sorry to hear that. The email form feature of this board includes safeguards to try and track users who send such posts. You should email the board administrator with a full copy of the email you received, it is very important this include the headers (these list details of the user that sent the email). They can then take action.");
! $faq[] = array("--","phpBB 2 Issues");
! $faq[] = array("Why isn't X feature available?", "This software was written by and licensed through phpBB Group. If you believe a feature needs to be added then please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the Group uses sourceforge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.");
! $faq[] = array("Who do I contact about abusive and/or legal matters related to this board?", "You should contact the administrator of this board. If you cannot find who this you should first contact one of the forum moderators and ask them who you should in turn contact. If still get no response you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (e.g. yahoo, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that phpBB Group has absolutely no control and cannot in any way be held liable over how, where or by whom this board is used. It is absolutely pointless contacting phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpbb.com website or the discrete software of phpBB itself. If you do email phpBB Group about any third party use of this software then you should expect a terse response or no response at all.");
?>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-27 21:54:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16303
Modified Files:
faq.php
Log Message:
Updated FAQ ... near complete?
Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** faq.php 2001/11/20 02:24:41 1.8
--- faq.php 2001/11/27 21:37:31 1.9
***************
*** 46,49 ****
--- 46,51 ----
$counter_2 = 0;
$faq_block = array();
+ $faq_block_titles = array();
+
for($i = 0; $i < count($faq); $i++)
{
***************
*** 59,64 ****
else
{
$counter = 0;
- $j++;
}
}
--- 61,69 ----
else
{
+ $j = ( $counter != 0 ) ? $j + 1 : 0;
+
+ $faq_block_titles[$j] = $faq[$i][1];
+
$counter = 0;
}
}
***************
*** 95,102 ****
{
$template->assign_block_vars("faq_block", array(
! "BLOCK_TITLE" => $faq_block[$i]['title'])
);
$template->assign_block_vars("faq_block_link", array(
! "BLOCK_TITLE" => $faq_block[$i]['title'])
);
--- 100,107 ----
{
$template->assign_block_vars("faq_block", array(
! "BLOCK_TITLE" => $faq_block_titles[$i])
);
$template->assign_block_vars("faq_block_link", array(
! "BLOCK_TITLE" => $faq_block_titles[$i])
);
|
|
From: Bart v. B. <ba...@us...> - 2001-11-27 20:58:03
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv2984
Modified Files:
admin_forums.php
Log Message:
Fixed bug #486170
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** admin_forums.php 2001/11/26 20:46:54 1.28
--- admin_forums.php 2001/11/27 20:57:58 1.29
***************
*** 310,314 ****
$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,
--- 310,314 ----
$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,
***************
*** 316,327 ****
'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'],
--- 316,327 ----
'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'],
***************
*** 522,534 ****
$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"))
);
--- 522,534 ----
$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"))
);
***************
*** 575,584 ****
$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_HIDDEN_FIELDS" => $s_hidden_fields,
--- 575,584 ----
$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_HIDDEN_FIELDS" => $s_hidden_fields,
***************
*** 693,702 ****
$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"),
--- 693,702 ----
$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"),
***************
*** 821,833 ****
$template->assign_vars(array(
! "L_FORUM_TITLE" => $lang['Forum_admin'],
! "L_FORUM_EXPLAIN" => $lang['Forum_admin_explain'],
! "L_CREATE_FORUM" => $lang['Create_forum'],
! "L_CREATE_CATEGORY" => $lang['Create_category'],
! "L_EDIT" => $lang['Edit'],
! "L_DELETE" => $lang['Delete'],
! "L_MOVE_UP" => $lang['Move_up'],
! "L_MOVE_DOWN" => $lang['Move_down'],
! "L_RESYNC" => $lang['Resync'])
);
--- 821,834 ----
$template->assign_vars(array(
! 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! 'L_FORUM_TITLE' => $lang['Forum_admin'],
! 'L_FORUM_EXPLAIN' => $lang['Forum_admin_explain'],
! 'L_CREATE_FORUM' => $lang['Create_forum'],
! 'L_CREATE_CATEGORY' => $lang['Create_category'],
! 'L_EDIT' => $lang['Edit'],
! 'L_DELETE' => $lang['Delete'],
! 'L_MOVE_UP' => $lang['Move_up'],
! 'L_MOVE_DOWN' => $lang['Move_down'],
! 'L_RESYNC' => $lang['Resync'])
);
***************
*** 866,880 ****
$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"))
);
--- 867,881 ----
$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"))
);
***************
*** 887,902 ****
$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"))
);
--- 888,903 ----
$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"))
);
|
|
From: Bart v. B. <ba...@us...> - 2001-11-27 20:03:11
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv18625
Modified Files:
profile.php
Log Message:
Check, check, double check :( Missed this one ;(
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -r1.148 -r1.149
*** profile.php 2001/11/27 18:26:03 1.148
--- profile.php 2001/11/27 20:03:08 1.149
***************
*** 1121,1125 ****
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
! $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (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://";
--- 1121,1136 ----
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
! if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
! {
! $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
! }
! else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
! {
! $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
! }
! else
! {
! $path = '';
! }
$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://";
***************
*** 1690,1694 ****
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
! $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (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://";
--- 1701,1716 ----
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
! if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
! {
! $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
! }
! else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
! {
! $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
! }
! else
! {
! $path = '';
! }
$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://";
|
7 messages has been excluded from this view by a project administrator.
