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
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv19307/db/schemas
Modified Files:
ms_access_primer.zip mssql_basic.sql mssql_schema.sql
mysql_basic.sql mysql_schema.sql postgres_basic.sql
postgres_schema.sql
Log Message:
Associated schema changes
Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
Binary files /tmp/cvsMsoO1u and /tmp/cvsEpF7vP differ
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mssql_basic.sql 20 Apr 2002 00:22:28 -0000 1.15
--- mssql_basic.sql 20 Apr 2002 23:43:46 -0000 1.16
***************
*** 68,72 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
/*
--- 68,72 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020421]');
/*
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** mssql_schema.sql 20 Apr 2002 00:22:28 -0000 1.25
--- mssql_schema.sql 20 Apr 2002 23:43:46 -0000 1.26
***************
*** 89,92 ****
--- 89,99 ----
GO
+ CREATE TABLE [phpbb_forums_watch] (
+ [forum_id] [int] NOT NULL ,
+ [user_id] [int] NOT NULL ,
+ [notify_status] [smallint] NOT NULL
+ ) ON [PRIMARY]
+ GO
+
CREATE TABLE [phpbb_groups] (
[group_id] [int] NOT NULL ,
***************
*** 603,606 ****
--- 610,616 ----
CREATE INDEX [IX_phpbb_forums] ON [phpbb_forums]([cat_id], [forum_order], [forum_last_post_id]) ON [PRIMARY]
+ GO
+
+ CREATE INDEX [IX_phpbb_forums_watch] ON [phpbb_forums_watch]([forum_id], [user_id]) ON [PRIMARY]
GO
Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** mysql_basic.sql 20 Apr 2002 00:22:28 -0000 1.16
--- mysql_basic.sql 20 Apr 2002 23:43:46 -0000 1.17
***************
*** 61,65 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
--- 61,65 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020421]');
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mysql_schema.sql 20 Apr 2002 00:22:28 -0000 1.18
--- mysql_schema.sql 20 Apr 2002 23:43:46 -0000 1.19
***************
*** 153,156 ****
--- 153,170 ----
# --------------------------------------------------------
#
+ # Table structure for table 'phpbb_forums_watch'
+ #
+ CREATE TABLE phpbb_forums_watch (
+ forum_id smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+ user_id mediumint(8) NOT NULL DEFAULT '0',
+ notify_status tinyint(1) NOT NULL default '0',
+ KEY forum_id (forum_id),
+ KEY user_id (user_id),
+ KEY notify_status (notify_status)
+ );
+
+
+ # --------------------------------------------------------
+ #
# Table structure for table 'phpbb_posts'
#
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** postgres_basic.sql 20 Apr 2002 00:22:28 -0000 1.17
--- postgres_basic.sql 20 Apr 2002 23:43:46 -0000 1.18
***************
*** 62,66 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
-- Categories
--- 62,66 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020421]');
-- Categories
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** postgres_schema.sql 20 Apr 2002 00:22:28 -0000 1.20
--- postgres_schema.sql 20 Apr 2002 23:43:46 -0000 1.21
***************
*** 137,140 ****
--- 137,152 ----
/* --------------------------------------------------------
+ Table structure for table phpbb_forums_watch
+ -------------------------------------------------------- */
+ CREATE TABLE phpbb_forums_watch (
+ forum_id int4,
+ user_id int4,
+ notify_status int2 NOT NULL default '0'
+ );
+ CREATE INDEX forum_id_phpbb_forums_watch_index ON phpbb_forums_watch (forum_id);
+ CREATE INDEX user_id_phpbb_forums_watch_index ON phpbb_forums_watch (user_id);
+
+
+ /* --------------------------------------------------------
Table structure for table phpbb_forum_prune
-------------------------------------------------------- */
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 22:56:13
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv10218
Modified Files:
common.php viewforum.php
Log Message:
Forum watch stuff ... just copied the topic watch stuff and thus needs reviewing inline with everything else ... but something needed to be added to 2.1 :)
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** common.php 20 Apr 2002 00:22:27 -0000 1.75
--- common.php 20 Apr 2002 22:56:09 -0000 1.76
***************
*** 200,203 ****
--- 200,204 ----
define('DISALLOW_TABLE', $table_prefix.'disallow');
define('FORUMS_TABLE', $table_prefix.'forums');
+ define('FORUMS_WATCH_TABLE', $table_prefix.'forums_watch');
define('GROUPS_TABLE', $table_prefix.'groups');
define('POSTS_TABLE', $table_prefix.'posts');
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** viewforum.php 20 Apr 2002 00:22:28 -0000 1.140
--- viewforum.php 20 Apr 2002 22:56:09 -0000 1.141
***************
*** 119,122 ****
--- 119,228 ----
//
+ // Is user watching this thread?
+ //
+ if( $userdata['session_logged_in'] )
+ {
+ $can_watch_forum = TRUE;
+
+ $sql = "SELECT notify_status
+ FROM " . FORUMS_WATCH_TABLE . "
+ WHERE forum_id = $forum_id
+ AND user_id = " . $userdata['user_id'];
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Could not obtain forum watch information", '', __LINE__, __FILE__, $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ if ( isset($HTTP_GET_VARS['unwatch']) )
+ {
+ if ( $HTTP_GET_VARS['unwatch'] == 'forum' )
+ {
+ $is_watching_forum = 0;
+
+ $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : '';
+ $sql = "DELETE $sql_priority FROM " . FORUMS_WATCH_TABLE . "
+ WHERE forum_id = $forum_id
+ AND user_id = " . $userdata['user_id'];
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Could not delete forum watch information", '', __LINE__, __FILE__, $sql);
+ }
+ }
+
+ $template->assign_vars(array(
+ 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&start=$start") . '">')
+ );
+
+ $message = $lang['No_longer_watching_forum'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&start=$start") . '">', '</a>');
+ message_die(GENERAL_MESSAGE, $message);
+ }
+ else
+ {
+ $is_watching_forum = TRUE;
+
+ if ( $row['notify_status'] )
+ {
+ $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : '';
+ $sql = "UPDATE $sql_priority " . FORUM_WATCH_TABLE . "
+ SET notify_status = 0
+ WHERE forum_id = $forum_id
+ AND user_id = " . $userdata['user_id'];
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Could not update forum watch information", '', __LINE__, __FILE__, $sql);
+ }
+ }
+ }
+ }
+ else
+ {
+ if ( isset($HTTP_GET_VARS['watch']) )
+ {
+ if ( $HTTP_GET_VARS['watch'] == 'forum' )
+ {
+ $is_watching_forum = TRUE;
+
+ $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : '';
+ $sql = "INSERT $sql_priority INTO " . FORUMS_WATCH_TABLE . " (user_id, forum_id, notify_status)
+ VALUES (" . $userdata['user_id'] . ", $forum_id, 0)";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Could not insert forum watch information", '', __LINE__, __FILE__, $sql);
+ }
+ }
+
+ $template->assign_vars(array(
+ 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&start=$start") . '">')
+ );
+
+ $message = $lang['You_are_watching_forum'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&start=$start") . '">', '</a>');
+ message_die(GENERAL_MESSAGE, $message);
+ }
+ else
+ {
+ $is_watching_forum = 0;
+ }
+ }
+ }
+ else
+ {
+ if ( isset($HTTP_GET_VARS['unwatch']) )
+ {
+ if ( $HTTP_GET_VARS['unwatch'] == 'forum' )
+ {
+ $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
+ header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&" . POST_FORUM_URL . "=$forum_id&unwatch=forum", true));
+ }
+ }
+ else
+ {
+ $can_watch_forum = 0;
+ $is_watching_forum = 0;
+ }
+ }
+
+ //
// Handle marking posts
//
***************
*** 376,379 ****
--- 482,502 ----
}
+ $s_watching_forum = '';
+ if ( $can_watch_forum )
+ {
+ if ( $is_watching_forum )
+ {
+ $watch_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&unwatch=forum&start=$start");
+ $s_watching_forum = '<a href="' . $watch_url . '">' . $lang['Stop_watching_forum'] . '</a>';
+ $s_watching_forum_img = ( isset($images['Forum_un_watch']) ) ? '<a href="' . $watch_url . '"><img src="' . $images['Forum_un_watch'] . '" alt="' . $lang['Stop_watching_forum'] . '" title="' . $lang['Stop_watching_forum'] . '" border="0"></a>' : '';
+ }
+ else
+ {
+ $watch_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&watch=forum&start=$start");
+ $s_watching_forum = '<a href="' . $watch_url . '">' . $lang['Start_watching_forum'] . '</a>';
+ $s_watching_forum_img = ( isset($images['Forum_watch']) ) ? '<a href="' . $watch_url . '"><img src="' . $images['Forum_watch'] . '" alt="' . $lang['Stop_watching_forum'] . '" title="' . $lang['Start_watching_forum'] . '" border="0"></a>' : '';
+ }
+ }
+
//
// Mozilla navigation bar
***************
*** 433,436 ****
--- 556,560 ----
'S_AUTH_LIST' => $s_auth_can,
+ 'S_WATCH_FORUM' => $s_watching_forum,
'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"),
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 22:56:13
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv10218/templates/subSilver
Modified Files:
viewforum_body.tpl
Log Message:
Forum watch stuff ... just copied the topic watch stuff and thus needs reviewing inline with everything else ... but something needed to be added to 2.1 :)
Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** viewforum_body.tpl 20 Apr 2002 00:22:29 -0000 1.21
--- viewforum_body.tpl 20 Apr 2002 22:56:09 -0000 1.22
***************
*** 54,57 ****
--- 54,60 ----
<td align="left" colspan="3"><span class="nav">{PAGE_NUMBER}</span></td>
</tr>
+ <tr>
+ <td colspan="3"><span class="gensmall">{S_WATCH_FORUM}</span></td>
+ </tr>
</table>
</form>
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 22:56:13
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv10218/includes
Modified Files:
constants.php functions_post.php
Log Message:
Forum watch stuff ... just copied the topic watch stuff and thus needs reviewing inline with everything else ... but something needed to be added to 2.1 :)
Index: constants.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/constants.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** constants.php 4 Apr 2002 11:53:50 -0000 1.47
--- constants.php 20 Apr 2002 22:56:09 -0000 1.48
***************
*** 155,158 ****
--- 155,159 ----
define('DISALLOW_TABLE', $table_prefix.'disallow');
define('FORUMS_TABLE', $table_prefix.'forums');
+ define('FORUMS_WATCH_TABLE', $table_prefix.'forums_watch');
define('GROUPS_TABLE', $table_prefix.'groups');
define('POSTS_TABLE', $table_prefix.'posts');
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** functions_post.php 20 Apr 2002 00:22:28 -0000 1.10
--- functions_post.php 20 Apr 2002 22:56:09 -0000 1.11
***************
*** 612,616 ****
else
{
! if ( $mode == 'reply' )
{
$sql = "SELECT ban_userid
--- 612,616 ----
else
{
! if ( $mode == 'reply' || $mode == 'newtopic' )
{
$sql = "SELECT ban_userid
***************
*** 630,643 ****
}
! $sql = "SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title
! FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u
! WHERE tw.topic_id = $topic_id
! AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . " )
! AND tw.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . "
! AND t.topic_id = tw.topic_id
! AND u.user_id = tw.user_id";
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain list of topic watchers', '', __LINE__, __FILE__, $sql);
}
--- 630,643 ----
}
! $sql = "SELECT u.user_id, u.username, u.user_email, u.user_lang, f.forum_name
! FROM " . FORUMS_WATCH_TABLE . " w, " . FORUMS_TABLE . " f, " . USERS_TABLE . " u
! WHERE w.forum_id = $forum_id
! AND w.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . " )
! AND w.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . "
! AND f.forum_id = w.forum_id
! AND u.user_id = w.user_id";
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain list of forum watchers', '', __LINE__, __FILE__, $sql);
}
***************
*** 650,654 ****
$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! $script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
$server_name = trim($board_config['server_name']);
$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
--- 650,654 ----
$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! $script_name = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx;
$server_name = trim($board_config['server_name']);
$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
***************
*** 660,664 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_title = preg_replace($orig_word, $replacement_word, unprepare_message($row['topic_title']));
do
--- 660,664 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $forum_name = unprepare_message($row['forum_name']);
do
***************
*** 666,670 ****
if ( $row['user_email'] != '' )
{
! $emailer->use_template('topic_notify', $row['user_lang']);
$emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['Topic_reply_notification']
--- 666,670 ----
if ( $row['user_email'] != '' )
{
! $emailer->use_template('forum_notify', $row['user_lang']);
$emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['Topic_reply_notification']
***************
*** 675,682 ****
'USERNAME' => $row['username'],
'SITENAME' => $board_config['sitename'],
! 'TOPIC_TITLE' => $topic_title,
! 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id",
! 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
);
--- 675,682 ----
'USERNAME' => $row['username'],
'SITENAME' => $board_config['sitename'],
! 'FORUM_NAME' => $forum_name,
! 'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id",
! 'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum")
);
***************
*** 692,701 ****
if ( $update_watched_sql != '' )
{
! $sql = "UPDATE " . TOPICS_WATCH_TABLE . "
SET notify_status = " . TOPIC_WATCH_NOTIFIED . "
! WHERE topic_id = $topic_id
AND user_id IN ($update_watched_sql)";
$db->sql_query($sql);
}
}
--- 692,762 ----
if ( $update_watched_sql != '' )
{
! $sql = "UPDATE " . FORUMS_WATCH_TABLE . "
SET notify_status = " . TOPIC_WATCH_NOTIFIED . "
! WHERE forum_id = $forum_id
AND user_id IN ($update_watched_sql)";
$db->sql_query($sql);
}
+
+ if ( $mode == 'reply' )
+ {
+ $sql = "SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title
+ FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u
+ WHERE tw.topic_id = $topic_id
+ AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . " )
+ AND tw.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . "
+ AND t.topic_id = tw.topic_id
+ AND u.user_id = tw.user_id";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, 'Could not obtain list of topic watchers', '', __LINE__, __FILE__, $sql);
+ }
+
+ $script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
+ $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+
+ $update_watched_sql = '';
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ $topic_title = preg_replace($orig_word, $replacement_word, unprepare_message($row['topic_title']));
+
+ do
+ {
+ if ( $row['user_email'] != '' )
+ {
+ $emailer->use_template('topic_notify', $row['user_lang']);
+ $emailer->email_address($row['user_email']);
+ $emailer->set_subject();//$lang['Topic_reply_notification']
+ $emailer->extra_headers($email_headers);
+
+ $emailer->assign_vars(array(
+ 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
+ 'USERNAME' => $row['username'],
+ 'SITENAME' => $board_config['sitename'],
+ 'TOPIC_TITLE' => $topic_title,
+
+ 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id",
+ 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
+ );
+
+ $emailer->send();
+ $emailer->reset();
+
+ $update_watched_sql .= ( $update_watched_sql != '' ) ? ', ' . $row['user_id'] : $row['user_id'];
+ }
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ if ( $update_watched_sql != '' )
+ {
+ $sql = "UPDATE " . TOPICS_WATCH_TABLE . "
+ SET notify_status = " . TOPIC_WATCH_NOTIFIED . "
+ WHERE topic_id = $topic_id
+ AND user_id IN ($update_watched_sql)";
+ $db->sql_query($sql);
+ }
+ }
+
}
***************
*** 844,846 ****
}
! ?>
--- 905,907 ----
}
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 22:55:15
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv9976/language/lang_english Modified Files: lang_main.php Log Message: Forum watch stuff Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -r1.86 -r1.87 *** lang_main.php 20 Apr 2002 00:22:29 -0000 1.86 --- lang_main.php 20 Apr 2002 22:55:11 -0000 1.87 *************** *** 245,248 **** --- 245,253 ---- $lang['No_topics_post_one'] = 'There are no posts in this forum<br />Click on the <b>Post New Topic</b> link on this page to post one'; + $lang['Stop_watching_forum'] = 'Stop watching this forum'; + $lang['Start_watching_forum'] = 'Watch this forum for new posts'; + $lang['No_longer_watching_forum'] = 'You are no longer watching this forum'; + $lang['You_are_watching_forum'] = 'You are now watching this forum'; + // |
|
From: Paul S. O. <ps...@us...> - 2002-04-20 21:01:09
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english/email
In directory usw-pr-cvs1:/tmp/cvs-serv14702/language/lang_english/email
Added Files:
forum_notify.tpl
Log Message:
Initial version
--- NEW FILE ---
Subject: Forum Post Notification - {FORUM_NAME}
Hello {USERNAME},
You are receiving this email because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new post since your last visit. You can use the following link to view forum, no more notifications will be sent until you visit the topic.
{U_FORUM}
If you no longer wish to watch this forum you can either click the "Stop watching this forum link" found at the bottom of the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}
{EMAIL_SIG}
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:36:36
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv8809
Modified Files:
update_script.php
Log Message:
Ooops
Index: update_script.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_script.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** update_script.php 20 Apr 2002 00:22:28 -0000 1.2
--- update_script.php 20 Apr 2002 00:36:33 -0000 1.3
***************
*** 24,27 ****
--- 24,28 ----
switch ( $row['config_value'] )
{
+ case '.0.0':
case '.1.0 [20020402]':
echo 'Updating from [20020402] :: ';
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:36:36
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv8809/includes Modified Files: sessions.php Log Message: Ooops Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** sessions.php 20 Apr 2002 00:22:29 -0000 1.59 --- sessions.php 20 Apr 2002 00:36:33 -0000 1.60 *************** *** 298,302 **** } ! echo $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$current_time' WHERE config_name = 'session_last_gc'"; --- 298,302 ---- } ! $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$current_time' WHERE config_name = 'session_last_gc'"; |
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:33
|
Update of /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email
In directory usw-pr-cvs1:/tmp/cvs-serv5403/language/lang_chinese_traditional_taiwan/email
Modified Files:
admin_activate.tpl admin_welcome_activated.tpl
admin_welcome_inactive.tpl coppa_welcome_inactive.tpl
group_added.tpl group_approved.tpl group_request.tpl
privmsg_notify.tpl topic_notify.tpl user_activate.tpl
user_activate_passwd.tpl user_welcome.tpl
user_welcome_inactive.tpl
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_activate.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ·sªº·|û±b¸¹
-
±z¦n,
--- 1,2 ----
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_activated.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ±b¸¹¤w¸g±Ò¥Î
-
¿Ë·Rªº {USERNAME} ±z¦n,
--- 1,2 ----
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_inactive.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: wªï¨Ó¨ì {SITENAME} °Q½×°Ï
-
{WELCOME_MSG}
--- 1,2 ----
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- coppa_welcome_inactive.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: wªï¨Ó¨ì {SITENAME} °Q½×°Ï
-
{WELCOME_MSG}
--- 1,2 ----
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_added.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ±z¤w¸g³Q¥[¤J³oÓ·|û¸s²Õ
-
®¥³ß±z,
--- 1,2 ----
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_approved.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ±zªº½Ð¨D¤w¸gÀò±o§åã
-
®¥³ß±z,
--- 1,2 ----
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_request.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ¦³¤@Ó·|û¥Ó½Ð¥[¤J±zªº¸s²Õ
-
¿Ë·Rªº {GROUP_MODERATOR} ±z¦n,
--- 1,2 ----
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- privmsg_notify.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: "±z¦³·sªº¨p¤H°T®§
-
¿Ë·Rªº {USERNAME} ±z¦n,
--- 1,2 ----
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- topic_notify.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ¥DÃD¦^Âгqª¾ - {TOPIC_TITLE}
-
¿Ë·Rªº {USERNAME} ±z¦n,
--- 1,2 ----
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ±zªº±b¸¹¤w¸g«ì´_±Ò¥Î!
-
¿Ë·Rªº {USERNAME} ±z¦n,
--- 1,2 ----
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate_passwd.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: ·sªº±K½X±Ò¥Î
-
¿Ë·Rªº {USERNAME} ±z¦n,
--- 1,2 ----
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: wªï¨Ó¨ì {SITENAME} °Q½×°Ï
-
{WELCOME_MSG}
--- 1,2 ----
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome_inactive.tpl 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,4 ****
- Subject: wªï¨Ó¨ì {SITENAME} °Q½×°Ï
-
{WELCOME_MSG}
--- 1,2 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:33
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv5403/templates/subSilver
Modified Files:
index_body.tpl posting_body.tpl posting_topic_review.tpl
viewforum_body.tpl
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** index_body.tpl 31 Mar 2002 13:57:56 -0000 1.22
--- index_body.tpl 20 Apr 2002 00:22:29 -0000 1.23
***************
*** 1,14 ****
<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" valign="bottom"><span class="gensmall">
! <!-- BEGIN switch_user_logged_in -->
! {LAST_VISIT_DATE}<br />
! <!-- END switch_user_logged_in -->
! {CURRENT_TIME}<br /></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
! <td align="right" valign="bottom" class="gensmall">
! <!-- BEGIN switch_user_logged_in -->
! <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
! <!-- END switch_user_logged_in -->
! <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a></td>
</tr>
</table>
--- 1,20 ----
+
<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
<tr>
! <td width="100%" align="left" valign="bottom"><table width="100%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <td align="left" valign="bottom"><p><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span></p><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
! <td align="right" class="gensmall" valign="bottom">
! <!-- BEGIN switch_user_logged_in -->
! <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
! <!-- END switch_user_logged_in -->
! <a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br />
! <br />
! <!-- BEGIN switch_user_logged_in -->
! {LAST_VISIT_DATE}<br />
! <!-- END switch_user_logged_in -->
! {CURRENT_TIME}</td>
! </tr>
! </table></td>
</tr>
</table>
***************
*** 28,35 ****
<!-- BEGIN forumrow -->
<tr>
! <td class="row1" align="center" valign="middle" height="50"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td>
! <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br />
! </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br />
! </span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td>
--- 34,39 ----
<!-- BEGIN forumrow -->
<tr>
! <td class="row1" width="50" height="50" align="center" valign="middle"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td>
! <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /></span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /></span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td>
***************
*** 47,61 ****
</table>
! <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
<tr>
<td class="catHead" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td>
</tr>
<tr>
! <td class="row1" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
! <td class="row1" align="left" width="100%"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span>
! </td>
</tr>
! <tr>
! <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td>
</tr>
</table>
--- 51,64 ----
</table>
! <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
<tr>
<td class="catHead" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td>
</tr>
<tr>
! <td class="row1" width="46" rowspan="2" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
! <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td>
</tr>
! <tr>
! <td class="row1" align="left"><span class="gensmall"><b>{L_LEGEND}</b> :: {L_WHOSONLINE_ADMIN} - {L_WHOSONLINE_MOD} - {L_WHOSONLINE_USER}</span></td>
</tr>
</table>
Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** posting_body.tpl 31 Mar 2002 00:06:34 -0000 1.26
--- posting_body.tpl 20 Apr 2002 00:22:29 -0000 1.27
***************
*** 280,284 ****
<!-- BEGIN switch_smilies_extra -->
<tr align="center">
! <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td>
</tr>
<!-- END switch_smilies_extra -->
--- 280,284 ----
<!-- BEGIN switch_smilies_extra -->
<tr align="center">
! <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td>
</tr>
<!-- END switch_smilies_extra -->
Index: posting_topic_review.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_topic_review.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** posting_topic_review.tpl 31 Mar 2002 00:06:34 -0000 1.4
--- posting_topic_review.tpl 20 Apr 2002 00:22:29 -0000 1.5
***************
*** 8,12 ****
<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" >
<!-- END switch_inline_mode -->
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" style="border: 0px #006699 solid ">
<tr>
<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
--- 8,12 ----
<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" >
<!-- END switch_inline_mode -->
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** viewforum_body.tpl 31 Mar 2002 00:06:34 -0000 1.20
--- viewforum_body.tpl 20 Apr 2002 00:22:29 -0000 1.21
***************
*** 4,8 ****
<tr>
<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
! <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
</tr>
<tr>
--- 4,8 ----
<tr>
<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
! <td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
</tr>
<tr>
***************
*** 19,23 ****
<th width="100" align="center" class="thTop" nowrap="nowrap"> {L_AUTHOR} </th>
<th width="50" align="center" class="thTop" nowrap="nowrap"> {L_VIEWS} </th>
! <th align="center" nowrap="nowrap" class="thCornerR" nowrap="nowrap"> {L_LASTPOST} </th>
</tr>
<!-- BEGIN topicrow -->
--- 19,23 ----
<th width="100" align="center" class="thTop" nowrap="nowrap"> {L_AUTHOR} </th>
<th width="50" align="center" class="thTop" nowrap="nowrap"> {L_VIEWS} </th>
! <th align="center" class="thCornerR" nowrap="nowrap"> {L_LASTPOST} </th>
</tr>
<!-- BEGIN topicrow -->
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:33
|
Update of /cvsroot/phpbb/phpBB2/language/lang_greek In directory usw-pr-cvs1:/tmp/cvs-serv5403/language/lang_greek Modified Files: lang_main.php Log Message: merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/lang_main.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** lang_main.php 10 Mar 2002 03:23:55 -0000 1.5 --- lang_main.php 20 Apr 2002 00:22:29 -0000 1.6 *************** *** 1,905 **** ! <?php ! /*************************************************************************** ! * lang_main.php [Greek] ! * ------------------- ! * begin : Dec 6 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * [...1876 lines suppressed...] ! ! // ! // Errors (not related to a ! // specific failure on a page) ! // ! $lang['Information'] = "Ðëçñïöïñßåò"; ! $lang['Critical_Information'] = "Êñßóéìåò ðëçñïöïñßåò"; ! ! $lang['General_Error'] = "Ãåíéêü ËÜèïò"; ! $lang['Critical_Error'] = "Êñßóéìï ËÜèïò"; ! $lang['An_error_occured'] = "ÐáñïõóéÜóèçêå ËÜèïò"; ! $lang['A_critical_error'] = "ÐáñïõóéÜóèçêå Êñßóéìï ËÜèïò"; ! ! ! ! // ! // That's all Folks! ! // ------------------------------------------------- ! ?> |
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:33
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv5403/templates/subSilver/admin
Modified Files:
board_config_body.tpl ranks_list_body.tpl
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** board_config_body.tpl 25 Mar 2002 23:10:32 -0000 1.20
--- board_config_body.tpl 20 Apr 2002 00:22:29 -0000 1.21
***************
*** 118,130 ****
</tr>
<tr>
! <td class="row1">{L_INBOX_LIMIT}</span></td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td>
</tr>
<tr>
! <td class="row1">{L_SENTBOX_LIMIT}</span></td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td>
</tr>
<tr>
! <td class="row1">{L_SAVEBOX_LIMIT}</span></td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td>
</tr>
--- 118,130 ----
</tr>
<tr>
! <td class="row1">{L_INBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td>
</tr>
<tr>
! <td class="row1">{L_SENTBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td>
</tr>
<tr>
! <td class="row1">{L_SAVEBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td>
</tr>
Index: ranks_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/ranks_list_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ranks_list_body.tpl 5 Dec 2001 14:38:37 -0000 1.4
--- ranks_list_body.tpl 20 Apr 2002 00:22:29 -0000 1.5
***************
*** 17,22 ****
<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
! <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
! <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
</tr>
<!-- END ranks -->
--- 17,22 ----
<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
! <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</a></td>
! <td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</a></td>
</tr>
<!-- END ranks -->
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:32
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv5403/language/lang_english Modified Files: lang_main.php Log Message: merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** lang_main.php 25 Mar 2002 19:22:42 -0000 1.85 --- lang_main.php 20 Apr 2002 00:22:29 -0000 1.86 *************** *** 23,27 **** // The format of this file is: // ! // ---> $lang['message'] = "text"; // // You should also try to set a locale and a character --- 23,27 ---- // The format of this file is: // ! // ---> $lang['message'] = 'text'; // [...1925 lines suppressed...] // ! $lang['Information'] = 'Information'; ! $lang['Critical_Information'] = 'Critical Information'; ! $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'; // *************** *** 990,992 **** // ------------------------------------------------- ! ?> --- 992,994 ---- // ------------------------------------------------- ! ?> \ No newline at end of file |
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:32
|
Update of /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan
In directory usw-pr-cvs1:/tmp/cvs-serv5403/language/lang_chinese_traditional_taiwan
Modified Files:
lang_admin.php lang_bbcode.php lang_faq.php lang_main.php
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/lang_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_admin.php 10 Mar 2002 03:23:55 -0000 1.2
--- lang_admin.php 20 Apr 2002 00:22:29 -0000 1.3
***************
*** 1,736 ****
! <?php
!
! /***************************************************************************
! * lang_admin.php [English]
! * -------------------
! * begin : Sat Dec 16 2000
! * copyright : (C) 2001 The phpBB Group
! * email : su...@ph...
! *
! * $Id$
[...1444 lines suppressed...]
! $lang['ftp_username'] = "±zªº FTP µn¤J¦WºÙ:";
! $lang['ftp_password'] = "±zªº FTP µn¤J±K½X:";
! $lang['Transfer_config'] = "¶}©l¶Ç¿é";
! $lang['NoFTP_config'] = "FTP ¤W¶Ç³]©wÀÉ¥¢±Ñ. ½Ð¤U¸ü³]©wÀɨùÁ¸Õ¤â°Ê¤W¶Ç.";
!
! $lang['Install'] = "§¹¾ã¦w¸Ë";
! $lang['Upgrade'] = "¨t²Î¤É¯Å";
!
!
! $lang['Install_Method'] = "½Ð¿ï¾Ü¦w¸Ë¼Ò¦¡";
!
! $lang['Install_No_Ext'] = "±z¥D¾÷¤Wªº PHP ³]©w¨Ã¤£¤ä´©±z©Ò¿ï¾Üªº¸ê®Æ®w«¬ºA";
!
! $lang['Install_No_PCRE'] = "phpBB2 »Ýn¨Ï¥Î¨ì Perl-Compatible Regular Expressions Module, ¦Ó±zªº PHP ³]©w¨Ã¤£¤ä´©³o¶µ¥\¯à";
!
! //
! // That's all Folks!
! // -------------------------------------------------
!
?>
Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/lang_bbcode.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_bbcode.php 28 Feb 2002 14:18:52 -0000 1.1
--- lang_bbcode.php 20 Apr 2002 00:22:29 -0000 1.2
***************
*** 12,25 ****
***************************************************************************/
! /***************************************************************************
! * Traditional Chinese[ÁcÅ餤¤å»y¨t] Translation
! * -------------------
! * begin : Thu Nov 26 2001
! * by : ¤p¦Ë¤l, OOHOO, ¬Ó®aÃM¤h, «ä
* email : kyo...@ms...
! * mc...@bi...
* sj...@ms...
* f88...@ma...
! *
* last modify : Sun Dec 30 2001
*
--- 12,25 ----
***************************************************************************/
! /***************************************************************************
! * Traditional Chinese Translation [ÁcÅ餤¤å»y¨t]
! * -------------------
! * begin : Thu Nov 26 2001
! * by : ¤p¦Ë¤l, OOHOO, ¬Ó®aÃM¤h, «ä
* email : kyo...@ms...
! * we...@ho...
* sj...@ms...
* f88...@ma...
! *
* last modify : Sun Dec 30 2001
*
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/lang_faq.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_faq.php 28 Feb 2002 14:18:52 -0000 1.1
--- lang_faq.php 20 Apr 2002 00:22:29 -0000 1.2
***************
*** 12,25 ****
***************************************************************************/
! /***************************************************************************
! * Traditional Chinese[ÁcÅ餤¤å»y¨t] Translation
! * -------------------
! * begin : Thu Nov 26 2001
! * by : ¤p¦Ë¤l, OOHOO, ¬Ó®aÃM¤h, «ä
* email : kyo...@ms...
! * mc...@bi...
* sj...@ms...
* f88...@ma...
! *
* last modify : Sun Dec 30 2001
*
--- 12,25 ----
***************************************************************************/
! /***************************************************************************
! * Traditional Chinese Translation [ÁcÅ餤¤å»y¨t]
! * -------------------
! * begin : Thu Nov 26 2001
! * by : ¤p¦Ë¤l, OOHOO, ¬Ó®aÃM¤h, «ä
* email : kyo...@ms...
! * we...@ho...
* sj...@ms...
* f88...@ma...
! *
* last modify : Sun Dec 30 2001
*
***************
*** 107,111 ****
$faq[] = array("½Ö¼g¤F³oÓ°Q½×ª©?", "³oÓµ{¦¡ (¥¼¸gק諸®æ¦¡) ¥Ñ phpBB Group ©Ò¶}µo¤ÎÄÀ¥X, µÛ§@ª©ÅvÂk <a href=\"http://www.phpbb.com/\" target=\"_blank\">phpBB Group</a> ©Ò¦³. ¨Ì·Ó¡u²¥£¤j²³¤½¦³ª©Åv¡v(GNU General Public License) ªºÁn©ú, ³oÓµ{¦¡¥i¥H¦Û¥Ñªº¨Ï¥Î¤Î´²¥¬, ¦pªG±z»Ýn§ó¦hªº¸ê°T¥i¥H°Ñ¦Ò <a href=\"http://www.gnu.org/copyleft/gpl.html\" target=\"_blank\">GNU General Public License</a>.");
$faq[] = array("¬°¤°»ò¤£¯à¨Ï¥Î§ó¦hªº¥\¯à ?", "³oÓ³nÅé¬O¥Ñ phpBB Group ©Ò»s§@. ¦pªG±z»{¬°»Ýn¥[¤J§ó¦h¥\¯à½Ð°ÑÆ[ phpbb.com website ªº»¡©ú. ½Ð¤£nµoªí¶i¶¥¥\¯àn¨D¨ì phpbb.com ªº°Q½×ª©, ³o·|¨Ï±o¶}µo¤p²Õ¤À¤ßµLªkP¤O·s¥\¯àªº¶}µo. ½Ð¦bª©±ÂsÄý, ¦pªG¦³¥ô¦ó§Ṳ́w¶}µo¥B¸g¹L´ú¸Õªºµ{¦¡§ÚÌ·|©ñ¦bª©±¤Wªº.");
! $faq[] = array("§Ú¸Ó¦V½ÖÁpô¦³Ãö³oÓ°Q½×ª©»~¥Î©Îªk«ß¤Wªº¬ÛÃö¨Æ°È?", "±z¥i¥H³sµ¸³oÓ°Q½×ª©ªººÞ²zªÌ. ¦pªG±z¤£¯à§ä¨ì³oÓª©±ªººÞ²zªÌ¥H´M¨D§ó¶i¤@¨BªºªºÁpô. ¦pªG±z³sµ¸ºÞ²zªÌ¤§«á¤´µM¨S¦³¦^À³ (´M§ä whois ) ©ÎªÌ¨ä¬OÄÝ©ó¤@Ó°õ¦æ¤¤ªº§K¶OªA°È (¨Ò¦p: yahoo, free.fr, f2s.com...µ¥µ¥), ºÞ²zªÌ©Î»~¥Î¦¹ªA°Èªº³¡ªù. ½Ð°O¦í phpBB Group ¬O§¹¥þ¨S¦³±±¨îÅv¦Ó¥B§¹¥þ¤£t¥ô¦ó³d¥ôªº, ³oÓ°Q½×ª©¦ì©~¦ó³B¥H¤Î¦ó¤H¾Ö¦³. ¦b¬ÛÃöªk¥O¤U, §¹¥þ¨S¦³¦V phpBB Group «ü¥Ü (cease and desist, liable, defamatory comment...µ¥µ¥). ¤]³\¤£¬Oª½±µ¥Ñ phpbb.com website ¸ô®|¦Ó±o, ©ÎªÌ¬O¥u¦³ phpBB ¦¹³nÅ骺³¡¥÷¦Ó¤w. ¦pªG±z email¨ì phpBB Group ¦³Ãö¥ô¦ó²Ä¤TªÌ¨Ï¥Î³nÅé¤Wªº°ÝÃD, ±zªºµª®×±N·|«D±`²³æ©Î¬O®Ú¥»¤£¤©¦^À³.");
//
--- 107,111 ----
$faq[] = array("½Ö¼g¤F³oÓ°Q½×ª©?", "³oÓµ{¦¡ (¥¼¸gק諸®æ¦¡) ¥Ñ phpBB Group ©Ò¶}µo¤ÎÄÀ¥X, µÛ§@ª©ÅvÂk <a href=\"http://www.phpbb.com/\" target=\"_blank\">phpBB Group</a> ©Ò¦³. ¨Ì·Ó¡u²¥£¤j²³¤½¦³ª©Åv¡v(GNU General Public License) ªºÁn©ú, ³oÓµ{¦¡¥i¥H¦Û¥Ñªº¨Ï¥Î¤Î´²¥¬, ¦pªG±z»Ýn§ó¦hªº¸ê°T¥i¥H°Ñ¦Ò <a href=\"http://www.gnu.org/copyleft/gpl.html\" target=\"_blank\">GNU General Public License</a>.");
$faq[] = array("¬°¤°»ò¤£¯à¨Ï¥Î§ó¦hªº¥\¯à ?", "³oÓ³nÅé¬O¥Ñ phpBB Group ©Ò»s§@. ¦pªG±z»{¬°»Ýn¥[¤J§ó¦h¥\¯à½Ð°ÑÆ[ phpbb.com website ªº»¡©ú. ½Ð¤£nµoªí¶i¶¥¥\¯àn¨D¨ì phpbb.com ªº°Q½×ª©, ³o·|¨Ï±o¶}µo¤p²Õ¤À¤ßµLªkP¤O·s¥\¯àªº¶}µo. ½Ð¦bª©±ÂsÄý, ¦pªG¦³¥ô¦ó§Ṳ́w¶}µo¥B¸g¹L´ú¸Õªºµ{¦¡§ÚÌ·|©ñ¦bª©±¤Wªº.");
! $faq[] = array("§Ú¸Ó¦V½ÖÁpô¦³Ãö³oÓ°Q½×ª©»~¥Î©Îªk«ß¤Wªº¬ÛÃö¨Æ°È?", "±z¥i¥H³sµ¸³oÓ°Q½×ª©ªººÞ²zªÌ. ¦pªG±z¤£¯à§ä¨ì³oÓª©±ªººÞ²zªÌ¥H´M¨D§ó¶i¤@¨BªºªºÁpô. ¦pªG±z³sµ¸ºÞ²zªÌ¤§«á¤´µM¨S¦³¦^À³ (´M§ä whois ) ©ÎªÌ¨ä¬OÄÝ©ó¤@Ó°õ¦æ¤¤ªº§K¶OªA°È (¨Ò¦p: yahoo, free.fr, f2s.com...µ¥µ¥), ºÞ²zªÌ©Î»~¥Î¦¹ªA°Èªº³¡ªù. ½Ð°O¦í phpBB Group ¬O§¹¥þ¨S¦³±±¨îÅv¦Ó¥B§¹¥þ¤£t¥ô¦ó³d¥ôªº, ³oÓ°Q½×ª©¦ì©~¦ó³B¥H¤Î¦ó¤H¾Ö¦³. ¦b¬ÛÃöªk¥O¤U, §¹¥þ¨S¦³¦V phpBB Group «ü¥Ü (cease and desist, liable, defamatory comment...µ¥µ¥). ¤]³\¤£¬Oª½±µ¥Ñ phpbb.com website ¸ô®|¦Ó±o, ©ÎªÌ¬O¥u¦³ phpBB ¦¹³nÅ骺³¡¥÷¦Ó¤w. ¦pªG±z email ¨ì phpBB Group ¦³Ãö¥ô¦ó²Ä¤TªÌ¨Ï¥Î³nÅé¤Wªº°ÝÃD, ±zªºµª®×±N·|«D±`²³æ©Î¬O®Ú¥»¤£¤©¦^À³.");
//
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_traditional_taiwan/lang_main.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** lang_main.php 10 Mar 2002 03:23:55 -0000 1.4
--- lang_main.php 20 Apr 2002 00:22:29 -0000 1.5
***************
*** 1,1008 ****
! <?php
! /***************************************************************************
! * lang_main.php [English]
! * -------------------
! * begin : Sat Dec 16 2000
! * copyright : (C) 2001 The phpBB Group
! * email : su...@ph...
! *
! * $Id$
! *
[...1988 lines suppressed...]
! $lang['datetime']['Nov'] = "¤Q¤@¤ë";
! $lang['datetime']['Dec'] = "¤Q¤G¤ë";
!
! //
! // Errors (not related to a
! // specific failure on a page)
! //
! $lang['Information'] = "¨t²Î°T®§";
! $lang['Critical_Information'] = "«¤j°T®§";
!
! $lang['General_Error'] = "¤@¯ë¿ù»~";
! $lang['Critical_Error'] = "«¤j¿ù»~";
! $lang['An_error_occured'] = "µo¥Í¿ù»~";
! $lang['A_critical_error'] = "µo¥Í«¤j¿ù»~";
!
! //
! // That's all Folks!
! // -------------------------------------------------
!
?>
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:32
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5403/includes
Modified Files:
bbcode.php emailer.php functions.php functions_post.php
functions_search.php functions_validate.php page_header.php
sessions.php usercp_avatar.php usercp_email.php
usercp_register.php
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** bbcode.php 25 Mar 2002 12:41:41 -0000 1.36
--- bbcode.php 20 Apr 2002 00:22:28 -0000 1.37
***************
*** 252,256 ****
$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
! $text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\".*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
// [list] and [list=x] for (un)ordered lists.
--- 252,256 ----
$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
! $text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\"[^"]*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
// [list] and [list=x] for (un)ordered lists.
***************
*** 434,438 ****
$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
bbcode_array_push($stack, $match);
! ++$curr_pos;
}
else
--- 434,444 ----
$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
bbcode_array_push($stack, $match);
! //
! // Rather than just increment $curr_pos
! // Set it to the ending of the tag we just found
! // Keeps error in nested tag from breaking out
! // of table structure..
! //
! $curr_pos = $curr_pos + strlen($possible_start);
}
else
Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** emailer.php 22 Mar 2002 19:33:28 -0000 1.15
--- emailer.php 20 Apr 2002 00:22:28 -0000 1.16
***************
*** 179,193 ****
function send()
{
! global $phpEx, $phpbb_root_dir;
!
! if (isset($phpbb_root_dir))
! {
! // we must be in the admin section.
! $phpbb_root_path = $phpbb_root_dir;
! }
! else
! {
! $phpbb_root_path = "./";
! }
if ($this->address == NULL)
--- 179,183 ----
function send()
{
! global $phpEx, $phpbb_root_path;
if ($this->address == NULL)
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -r1.133 -r1.134
*** functions.php 2 Apr 2002 14:02:27 -0000 1.133
--- functions.php 20 Apr 2002 00:22:28 -0000 1.134
***************
*** 492,496 ****
function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
{
! global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links;
global $userdata, $user_ip, $session_length;
global $starttime;
--- 492,496 ----
function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
{
! global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header;
global $userdata, $user_ip, $session_length;
global $starttime;
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** functions_post.php 3 Apr 2002 14:38:56 -0000 1.9
--- functions_post.php 20 Apr 2002 00:22:28 -0000 1.10
***************
*** 23,27 ****
if ( !defined('IN_PHPBB') )
{
! die("Hacking attempt");
}
--- 23,27 ----
if ( !defined('IN_PHPBB') )
{
! die('Hacking attempt');
}
***************
*** 381,385 ****
global $db;
! $sign = ( $mode == 'delete' ) ? "- 1" : "+ 1";
$forum_update_sql = "forum_posts = forum_posts $sign";
$topic_update_sql = '';
--- 381,385 ----
global $db;
! $sign = ( $mode == 'delete' ) ? '- 1' : '+ 1';
$forum_update_sql = "forum_posts = forum_posts $sign";
$topic_update_sql = '';
***************
*** 396,400 ****
{
! $topic_update_sql = "topic_replies = topic_replies - 1";
$sql = "SELECT MAX(post_id) AS post_id
--- 396,400 ----
{
! $topic_update_sql .= "topic_replies = topic_replies - 1";
$sql = "SELECT MAX(post_id) AS post_id
***************
*** 440,445 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql = 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
}
}
}
--- 440,449 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
}
+ }
+ else
+ {
+ $topic_update_sql .= 'topic_replies = topic_replies - 1';
}
}
Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** functions_search.php 2 Apr 2002 14:03:49 -0000 1.8
--- functions_search.php 20 Apr 2002 00:22:28 -0000 1.9
***************
*** 429,433 ****
{
global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
! global $starttime;
$username_list = '';
--- 429,435 ----
{
global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
! global $starttime, $gen_simple_header;
!
! $gen_simple_header = TRUE;
$username_list = '';
***************
*** 460,464 ****
}
- $gen_simple_header = TRUE;
$page_title = $lang['Search'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 462,465 ----
Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_validate.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** functions_validate.php 2 Apr 2002 21:13:47 -0000 1.6
--- functions_validate.php 20 Apr 2002 00:22:29 -0000 1.7
***************
*** 64,68 ****
while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
--- 64,68 ----
while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
***************
*** 77,81 ****
while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['word'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
--- 77,81 ----
while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
***************
*** 103,107 ****
if ( $email != '' )
{
! if ( preg_match('/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
{
$sql = "SELECT ban_email
--- 103,107 ----
if ( $email != '' )
{
! if ( preg_match('/^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
{
$sql = "SELECT ban_email
***************
*** 111,115 ****
while( $row = $db->sql_fetchrow($result) )
{
! $match_email = str_replace('*', '.*', $row['ban_email']);
if ( preg_match('/^' . $match_email . '$/is', $email) )
{
--- 111,115 ----
while( $row = $db->sql_fetchrow($result) )
{
! $match_email = str_replace('*', '.*?', $row['ban_email']);
if ( preg_match('/^' . $match_email . '$/is', $email) )
{
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** page_header.php 1 Apr 2002 13:23:42 -0000 1.106
--- page_header.php 20 Apr 2002 00:22:29 -0000 1.107
***************
*** 86,96 ****
// situation
//
! $user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id
! OR s.session_page = $forum_id)" : '';
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND ( s.session_time >= ".( time() - 300 ) . "
! OR u.user_session_time >= " . ( time() - 300 ) . " )
$user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC";
--- 86,94 ----
// situation
//
! $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = $forum_id" : '';
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND s.session_time >= ".( time() - 300 ) . "
$user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC";
***************
*** 365,368 ****
--- 363,368 ----
'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'),
'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
+ 'L_WHOSONLINE_USER' => sprintf($lang['User_online_color'], '<span style="color:#' . $theme['fontcolor1'] . '">', '</span>'),
+ 'L_LEGEND' => $lang['Legend'],
'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'),
***************
*** 387,391 ****
'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
! 'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
'S_LOGIN_ACTION' => append_sid('login.'.$phpEx),
--- 387,391 ----
'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
! 'S_TIMEZONE' => sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]),
'S_LOGIN_ACTION' => append_sid('login.'.$phpEx),
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** sessions.php 19 Mar 2002 11:59:36 -0000 1.58
--- sessions.php 20 Apr 2002 00:22:29 -0000 1.59
***************
*** 22,27 ****
//
- // session_begin()
- //
// Adds/updates a new session to the database for the given userid.
// Returns the new session ID on success.
--- 22,25 ----
***************
*** 55,60 ****
//
! // Try and pull the last time stored
! // in a cookie, if it exists
//
$sql = "SELECT *
--- 53,57 ----
//
! // Try and pull the last time stored in a cookie, if it exists
//
$sql = "SELECT *
***************
*** 82,87 ****
$login = 1;
$enable_autologin = 1;
-
- $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
}
else
--- 79,82 ----
***************
*** 103,107 ****
else
{
- $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
$login = 1;
}
--- 98,101 ----
***************
*** 147,151 ****
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
! if ( !($result = $db->sql_query($sql)) || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
--- 141,145 ----
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
! if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
***************
*** 154,165 ****
(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error creating new session : session_begin', '', __LINE__, __FILE__, $sql);
}
}
if ( $user_id != ANONYMOUS )
! {
$sql = "UPDATE " . USERS_TABLE . "
SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit
--- 148,161 ----
(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
! if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
}
}
if ( $user_id != ANONYMOUS )
! {// ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : (
! $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
!
$sql = "UPDATE " . USERS_TABLE . "
SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit
***************
*** 167,171 ****
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating last visit time : session_begin', '', __LINE__, __FILE__, $sql);
}
--- 163,167 ----
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql);
}
***************
*** 186,191 ****
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
--- 182,185 ----
***************
*** 195,200 ****
//
! // Checks for a given user session, tidies session
! // table and updates user sessions at each page refresh
//
function session_pagestart($user_ip, $thispage_id)
--- 189,194 ----
//
! // Checks for a given user session, tidies session table and updates user
! // sessions at each page refresh
//
function session_pagestart($user_ip, $thispage_id)
***************
*** 207,211 ****
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
- $cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
$current_time = time();
--- 201,204 ----
***************
*** 241,245 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch : session_pagestart', '', __LINE__, __FILE__, $sql);
}
--- 234,238 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
}
***************
*** 256,285 ****
// Only update session DB a minute or so after last update
//
! $last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
!
! if ( $current_time - $last_update > 60 )
! { // || $userdata['user_session_page'] != $thispage_id
! $sql = ( $userdata['user_id'] == ANONYMOUS ) ? "UPDATE " . SESSIONS_TABLE . " SET session_time = $current_time, session_page = $thispage_id WHERE session_id = '" . $userdata['session_id'] . "' AND session_ip = '$user_ip'" : "UPDATE " . USERS_TABLE . " SET user_session_time = $current_time, user_session_page = $thispage_id WHERE user_id = " . $userdata['user_id'];
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
}
! //
! // Delete expired sessions
! //
! $expiry_time = $current_time - $board_config['session_length'];
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_time < $expiry_time
! AND session_id <> '$session_id'";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error clearing sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
}
--- 249,312 ----
// Only update session DB a minute or so after last update
//
! if ( $current_time - $userdata['session_time'] > 60 || $userdata['session_page'] != $thispage_id )
! {
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
}
! if ( $current_time - $board_config['session_gc'] > $board_config['session_last_gc'] )
{
! $sql = "SELECT *
! FROM " . SESSIONS_TABLE . "
! WHERE session_time < " . ( $current_time - $board_config['session_length'] ) . "
! AND session_logged_in = 1";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(CRITICAL_ERROR, 'Could not obtain expired session list', '', __LINE__, __FILE__, $sql);
! }
!
! $del_session_id = '';
! while ( $row = $db->sql_fetchrow($result) )
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . $row['session_time'] . ", user_session_page = " . $row['session_page'] . "
! WHERE user_id = " . $row['session_user_id'];
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Could not update user session info', '', __LINE__, __FILE__, $sql);
! }
!
! $del_session_id .= ( ( $del_session_id != '' ) ? ', ' : '' ) . '\'' . $row['session_id'] . '\'';
! }
!
! if ( $del_session_id != '' )
! {
! //
! // Delete expired sessions
! //
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_id IN ($del_session_id)";
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
! }
! }
!
! echo $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '$current_time'
! WHERE config_name = 'session_last_gc'";
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Could not update session gc time', '', __LINE__, __FILE__, $sql);
! }
}
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
}
***************
*** 296,300 ****
if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
{
! message_die(CRITICAL_ERROR, 'Error creating user session : session_pagestart', '', __LINE__, __FILE__, $sql);
}
--- 323,327 ----
if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
{
! message_die(CRITICAL_ERROR, 'Error creating user session', '', __LINE__, __FILE__, $sql);
}
***************
*** 317,321 ****
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
- // $cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
//
--- 344,347 ----
***************
*** 325,334 ****
{
$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
- $sessionmethod = SESSION_METHOD_COOKIE;
}
else
{
$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
- $sessionmethod = SESSION_METHOD_GET;
}
--- 351,358 ----
***************
*** 339,363 ****
WHERE session_id = '$session_id'
AND session_user_id = $user_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error removing user session : session_end', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath. $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
-
- $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
-
- return TRUE;
}
//
! // Append $SID to a url. Borrowed from phplib and modified. This is an
! // extra routine utilised by the session code above and acts as a wrapper
! // around every single URL and form action. If you replace the session
! // code you must include this routine, even if it's empty.
//
function append_sid($url, $non_html_amp = false)
--- 363,379 ----
WHERE session_id = '$session_id'
AND session_user_id = $user_id";
! if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
+ return true;
}
//
! // Append $SID to a url. Borrowed from phplib and modified.
//
function append_sid($url, $non_html_amp = false)
***************
*** 373,375 ****
}
! ?>
--- 389,391 ----
}
! ?>
\ No newline at end of file
Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** usercp_avatar.php 31 Mar 2002 00:06:34 -0000 1.8
--- usercp_avatar.php 20 Apr 2002 00:22:29 -0000 1.9
***************
*** 234,238 ****
}
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$allowviewonline, &$style, &$language, &$timezone, &$dateformat)
{
global $board_config, $db, $template, $lang, $images, $theme;
--- 234,238 ----
}
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
{
global $board_config, $db, $template, $lang, $images, $theme;
***************
*** 310,314 ****
}
! $params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'allowviewonline', 'style', 'language', 'timezone', 'dateformat');
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
--- 310,314 ----
}
! $params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
***************
*** 334,336 ****
}
! ?>
--- 334,336 ----
}
! ?>
\ No newline at end of file
Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** usercp_email.php 31 Mar 2002 00:06:34 -0000 1.7
--- usercp_email.php 20 Apr 2002 00:22:29 -0000 1.8
***************
*** 28,37 ****
}
- if ( !$userdata['session_logged_in'] )
- {
- header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
- exit;
- }
-
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
{
--- 28,31 ----
***************
*** 41,44 ****
--- 35,44 ----
{
message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
+ }
+
+ if ( !$userdata['session_logged_in'] )
+ {
+ header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
+ exit;
}
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** usercp_register.php 3 Apr 2002 23:24:59 -0000 1.20
--- usercp_register.php 20 Apr 2002 00:22:29 -0000 1.21
***************
*** 28,36 ****
}
! //
// Load agreement template since user has not yet
// agreed to registration conditions/coppa
//
! function show_coppa(&$coppa)
{
global $template, $lang, $phpbb_root_path, $phpEx;
--- 28,36 ----
}
! // ---------------------------------------
// Load agreement template since user has not yet
// agreed to registration conditions/coppa
//
! function show_coppa()
{
global $template, $lang, $phpbb_root_path, $phpEx;
***************
*** 41,45 ****
$template->assign_vars(array(
- 'COPPA' => $coppa,
'REGISTRATION' => $lang['Registration'],
'AGREEMENT' => $lang['Reg_agreement'],
--- 41,44 ----
***************
*** 56,61 ****
}
//
! //
! //
$error = FALSE;
--- 55,59 ----
}
//
! // ---------------------------------------
$error = FALSE;
***************
*** 66,75 ****
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! show_coppa($coppa);
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
! $coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
//
--- 64,73 ----
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! show_coppa();
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
! $coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE;
//
***************
*** 224,229 ****
else if ( $mode == 'register' )
{
- $coppa = (!$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa']) ? 0 : TRUE;
-
if ( empty($username) || empty($password) || empty($password_confirm) || empty($email) )
{
--- 222,225 ----
***************
*** 231,235 ****
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
!
}
--- 227,231 ----
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
!
}
***************
*** 708,711 ****
--- 704,709 ----
);
+ $allowviewonline = !$allowviewonline;
+
display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
}
***************
*** 788,792 ****
//
$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! $form_enctype = ( !@$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
$template->assign_vars(array(
--- 786,790 ----
//
$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
! $form_enctype = ( @$ini_val('file_uploads') == '0' || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
$template->assign_vars(array(
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv5403/db/schemas
Modified Files:
ms_access_primer.zip mssql_basic.sql mssql_schema.sql
mysql_basic.sql mysql_schema.sql postgres_basic.sql
postgres_schema.sql
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
Binary files /tmp/cvskSrqkJ and /tmp/cvsszZyuk differ
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mssql_basic.sql 4 Apr 2002 21:50:04 -0000 1.14
--- mssql_basic.sql 20 Apr 2002 00:22:28 -0000 1.15
***************
*** 68,72 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
/*
--- 68,72 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
/*
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** mssql_schema.sql 21 Mar 2002 13:59:33 -0000 1.24
--- mssql_schema.sql 20 Apr 2002 00:22:28 -0000 1.25
***************
*** 319,323 ****
[user_level] [smallint] NOT NULL ,
[user_posts] [int] NOT NULL ,
! [user_timezone] [real] NOT NULL ,
[user_style] [int] NULL ,
[user_lang] [varchar] (255) NULL ,
--- 319,323 ----
[user_level] [smallint] NOT NULL ,
[user_posts] [int] NOT NULL ,
! [user_timezone] [decimal] (4,2) NOT NULL ,
[user_style] [int] NULL ,
[user_lang] [varchar] (255) NULL ,
Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mysql_basic.sql 4 Apr 2002 21:50:04 -0000 1.15
--- mysql_basic.sql 20 Apr 2002 00:22:28 -0000 1.16
***************
*** 61,65 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
--- 61,65 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mysql_schema.sql 21 Mar 2002 13:59:33 -0000 1.17
--- mysql_schema.sql 20 Apr 2002 00:22:28 -0000 1.18
***************
*** 464,468 ****
user_level tinyint(4) DEFAULT '0',
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! user_timezone float DEFAULT '0' NOT NULL,
user_style tinyint(4),
user_lang varchar(255),
--- 464,468 ----
user_level tinyint(4) DEFAULT '0',
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! user_timezone decimal(4,2) DEFAULT '0' NOT NULL,
user_style tinyint(4),
user_lang varchar(255),
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** postgres_basic.sql 4 Apr 2002 21:50:04 -0000 1.16
--- postgres_basic.sql 20 Apr 2002 00:22:28 -0000 1.17
***************
*** 62,66 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
-- Categories
--- 62,66 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
-- Categories
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** postgres_schema.sql 21 Mar 2002 13:59:33 -0000 1.19
--- postgres_schema.sql 20 Apr 2002 00:22:28 -0000 1.20
***************
*** 479,483 ****
user_level int4 DEFAULT '1',
user_lang varchar(255),
! user_timezone real DEFAULT '0' NOT NULL,
user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
user_notify_pm int2 DEFAULT '1' NOT NULL,
--- 479,483 ----
user_level int4 DEFAULT '1',
user_lang varchar(255),
! user_timezone decimal(4) DEFAULT '0' NOT NULL,
user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
user_notify_pm int2 DEFAULT '1' NOT NULL,
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:31
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5403
Modified Files:
common.php groupcp.php modcp.php posting.php privmsg.php
search.php update_script.php upgrade.php viewforum.php
viewonline.php viewtopic.php
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** common.php 18 Mar 2002 23:45:24 -0000 1.74
--- common.php 20 Apr 2002 00:22:27 -0000 1.75
***************
*** 30,98 ****
//
! // addslashes to vars if magic_quotes_gpc is off
! // this is a security precaution to prevent someone
! // trying to break out of a SQL statement.
//
! if( !get_magic_quotes_gpc() )
{
! if( is_array($HTTP_GET_VARS) )
{
! while( list($k, $v) = each($HTTP_GET_VARS) )
{
! if( is_array($HTTP_GET_VARS[$k]) )
! {
! while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
! {
! $HTTP_GET_VARS[$k][$k2] = addslashes($v2);
! }
! @reset($HTTP_GET_VARS[$k]);
! }
! else
! {
! $HTTP_GET_VARS[$k] = addslashes($v);
! }
}
- @reset($HTTP_GET_VARS);
- }
! if( is_array($HTTP_POST_VARS) )
! {
! while( list($k, $v) = each($HTTP_POST_VARS) )
! {
! if( is_array($HTTP_POST_VARS[$k]) )
! {
! while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
! {
! $HTTP_POST_VARS[$k][$k2] = addslashes($v2);
! }
! @reset($HTTP_POST_VARS[$k]);
! }
! else
! {
! $HTTP_POST_VARS[$k] = addslashes($v);
! }
! }
! @reset($HTTP_POST_VARS);
}
! if( is_array($HTTP_COOKIE_VARS) )
! {
! while( list($k, $v) = each($HTTP_COOKIE_VARS) )
! {
! if( is_array($HTTP_COOKIE_VARS[$k]) )
! {
! while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) )
! {
! $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2);
! }
! @reset($HTTP_COOKIE_VARS[$k]);
! }
! else
! {
! $HTTP_COOKIE_VARS[$k] = addslashes($v);
! }
! }
! @reset($HTTP_COOKIE_VARS);
! }
}
--- 30,55 ----
//
! // addslashes to vars if magic_quotes_gpc is off this is a security precaution
! // to prevent someone trying to break out of a SQL statement.
//
! function slash_input_data(&$data)
{
! if ( is_array($data) )
{
! while( list($k, $v) = each($data) )
{
! $data[$k] = ( is_array($v) ) ? slash_input_data($v) : addslashes($v);
}
! @reset($data);
}
+ return $data;
+ }
! if ( !get_magic_quotes_gpc() )
! {
! $HTTP_GET_VARS = slash_input_data($HTTP_GET_VARS);
! $HTTP_POST_VARS = slash_input_data($HTTP_POST_VARS);
! $HTTP_COOKIE_VARS = slash_input_data($HTTP_COOKIE_VARS);
}
***************
*** 102,113 ****
// URI params
//
! $board_config = Array();
! $userdata = Array();
! $theme = Array();
! $images = Array();
! $lang = Array();
$gen_simple_header = FALSE;
! @include($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
--- 59,70 ----
// URI params
//
! $board_config = array();
! $userdata = array();
! $theme = array();
! $images = array();
! $lang = array();
$gen_simple_header = FALSE;
! require($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
***************
*** 116,125 ****
}
! include($phpbb_root_path . 'includes/constants.'.$phpEx);
include($phpbb_root_path . 'includes/template.'.$phpEx);
include($phpbb_root_path . 'includes/sessions.'.$phpEx);
include($phpbb_root_path . 'includes/auth.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
! include($phpbb_root_path . 'includes/db.'.$phpEx);
//
--- 73,269 ----
}
! // Debug Level
! define('DEBUG', 1); // Debugging on
! //define('DEBUG', 0); // Debugging off
!
!
! // User Levels <- Do not change the values of USER or ADMIN
! define('ANONYMOUS', -1);
! define('USER', 0);
! define('ADMIN', 1);
! define('MOD', 2);
!
!
! // User related
! define('USER_ACTIVATION_NONE', 0);
! define('USER_ACTIVATION_SELF', 1);
! define('USER_ACTIVATION_ADMIN', 2);
!
! define('USER_AVATAR_NONE', 0);
! define('USER_AVATAR_UPLOAD', 1);
! define('USER_AVATAR_REMOTE', 2);
! define('USER_AVATAR_GALLERY', 3);
!
!
! // Group settings
! define('GROUP_OPEN', 0);
! define('GROUP_CLOSED', 1);
! define('GROUP_HIDDEN', 2);
!
!
! // Forum state
! define('FORUM_UNLOCKED', 0);
! define('FORUM_LOCKED', 1);
!
!
! // Topic status
! define('TOPIC_UNLOCKED', 0);
! define('TOPIC_LOCKED', 1);
! define('TOPIC_MOVED', 2);
! define('TOPIC_WATCH_NOTIFIED', 1);
! define('TOPIC_WATCH_UN_NOTIFIED', 0);
!
!
! // Topic types
! define('POST_NORMAL', 0);
! define('POST_STICKY', 1);
! define('POST_ANNOUNCE', 2);
! define('POST_GLOBAL_ANNOUNCE', 3);
!
!
! // SQL codes
! define('BEGIN_TRANSACTION', 1);
! define('END_TRANSACTION', 2);
!
!
! // Error codes
! define('GENERAL_MESSAGE', 200);
! define('GENERAL_ERROR', 202);
! define('CRITICAL_MESSAGE', 203);
! define('CRITICAL_ERROR', 204);
!
!
! // Private messaging
! define('PRIVMSGS_READ_MAIL', 0);
! define('PRIVMSGS_NEW_MAIL', 1);
! define('PRIVMSGS_SENT_MAIL', 2);
! define('PRIVMSGS_SAVED_IN_MAIL', 3);
! define('PRIVMSGS_SAVED_OUT_MAIL', 4);
! define('PRIVMSGS_UNREAD_MAIL', 5);
!
!
! // URL PARAMETERS
! define('POST_TOPIC_URL', 't');
! define('POST_CAT_URL', 'c');
! define('POST_FORUM_URL', 'f');
! define('POST_USERS_URL', 'u');
! define('POST_POST_URL', 'p');
! define('POST_GROUPS_URL', 'g');
!
! // Session parameters
! define('SESSION_METHOD_COOKIE', 100);
! define('SESSION_METHOD_GET', 101);
!
!
! // Page numbers for session handling
! define('PAGE_INDEX', 0);
! define('PAGE_LOGIN', -1);
! define('PAGE_SEARCH', -2);
! define('PAGE_REGISTER', -3);
! define('PAGE_PROFILE', -4);
! define('PAGE_VIEWONLINE', -6);
! define('PAGE_VIEWMEMBERS', -7);
! define('PAGE_FAQ', -8);
! define('PAGE_POSTING', -9);
! define('PAGE_PRIVMSGS', -10);
! define('PAGE_GROUPCP', -11);
! define('PAGE_TOPIC_OFFSET', 5000);
!
!
! // Auth settings
! define('AUTH_LIST_ALL', 0);
! define('AUTH_ALL', 0);
!
! define('AUTH_REG', 1);
! define('AUTH_ACL', 2);
! define('AUTH_MOD', 3);
! define('AUTH_ADMIN', 5);
!
! define('AUTH_VIEW', 1);
! define('AUTH_READ', 2);
! define('AUTH_POST', 3);
! define('AUTH_REPLY', 4);
! define('AUTH_EDIT', 5);
! define('AUTH_DELETE', 6);
! define('AUTH_ANNOUNCE', 7);
! define('AUTH_STICKY', 8);
! define('AUTH_POLLCREATE', 9);
! define('AUTH_VOTE', 10);
! define('AUTH_ATTACH', 11);
!
!
! // Table names
! define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access');
! define('BANLIST_TABLE', $table_prefix.'banlist');
! define('CATEGORIES_TABLE', $table_prefix.'categories');
! define('CONFIG_TABLE', $table_prefix.'config');
! define('DISALLOW_TABLE', $table_prefix.'disallow');
! define('FORUMS_TABLE', $table_prefix.'forums');
! define('GROUPS_TABLE', $table_prefix.'groups');
! define('POSTS_TABLE', $table_prefix.'posts');
! define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
! define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
! define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
! define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore');
! define('PRUNE_TABLE', $table_prefix.'forum_prune');
! define('RANKS_TABLE', $table_prefix.'ranks');
! define('SEARCH_TABLE', $table_prefix.'search_results');
! define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist');
! define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch');
! define('SESSIONS_TABLE', $table_prefix.'sessions');
! define('SMILIES_TABLE', $table_prefix.'smilies');
! define('THEMES_TABLE', $table_prefix.'themes');
! define('THEMES_NAME_TABLE', $table_prefix.'themes_name');
! define('TOPICS_TABLE', $table_prefix.'topics');
! define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
! define('USER_GROUP_TABLE', $table_prefix.'user_group');
! define('USERS_TABLE', $table_prefix.'users');
! define('WORDS_TABLE', $table_prefix.'words');
! define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
! define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
! define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
!
include($phpbb_root_path . 'includes/template.'.$phpEx);
include($phpbb_root_path . 'includes/sessions.'.$phpEx);
include($phpbb_root_path . 'includes/auth.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
!
! switch($dbms)
! {
! case 'mysql':
! include($phpbb_root_path . 'db/mysql.'.$phpEx);
! break;
!
! case 'mysql4':
! include($phpbb_root_path . 'db/mysql4.'.$phpEx);
! break;
!
! case 'postgres':
! include($phpbb_root_path . 'db/postgres7.'.$phpEx);
! break;
!
! case 'mssql':
! include($phpbb_root_path . 'db/mssql.'.$phpEx);
! break;
!
! case 'oracle':
! include($phpbb_root_path . 'db/oracle.'.$phpEx);
! break;
!
! case 'msaccess':
! include($phpbb_root_path . 'db/msaccess.'.$phpEx);
! break;
!
! case 'mssql-odbc':
! include($phpbb_root_path . 'db/mssql-odbc.'.$phpEx);
! break;
! }
!
! // Make the database connection.
! $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
! if ( !$db->db_connect_id )
! {
! message_die(CRITICAL_ERROR, "Could not connect to the database");
! }
//
***************
*** 171,184 ****
$sql = "SELECT *
FROM " . CONFIG_TABLE;
! if(!$result = $db->sql_query($sql))
{
! message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
}
! else
{
! while($row = $db->sql_fetchrow($result))
! {
! $board_config[$row['config_name']] = $row['config_value'];
! }
}
--- 315,326 ----
$sql = "SELECT *
FROM " . CONFIG_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql);
}
!
! while($row = $db->sql_fetchrow($result))
{
! $board_config[$row['config_name']] = $row['config_value'];
}
***************
*** 186,190 ****
// Show 'Board is disabled' message if needed.
//
! if( $board_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN") )
{
message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
--- 328,332 ----
// Show 'Board is disabled' message if needed.
//
! if ( $board_config['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN') )
{
message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** groupcp.php 3 Apr 2002 22:24:56 -0000 1.58
--- groupcp.php 20 Apr 2002 00:22:27 -0000 1.59
***************
*** 30,34 ****
function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
{
! global $lang, $images, $board_config;
$from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' ';
--- 30,34 ----
function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
{
! global $lang, $images, $board_config, $phpEx;
$from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' ';
***************
*** 208,212 ****
if ( !$userdata['session_logged_in'] )
{
! header($header_location . ppend_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
--- 208,212 ----
if ( !$userdata['session_logged_in'] )
{
! header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
***************
*** 309,313 ****
if ( $cancel )
{
! header($header_location . ppend_sid("groupcp.$phpEx", true));
}
elseif ( !$userdata['session_logged_in'] )
--- 309,313 ----
if ( $cancel )
{
! header($header_location . append_sid("groupcp.$phpEx", true));
}
elseif ( !$userdata['session_logged_in'] )
***************
*** 913,917 ****
'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
'L_PM' => $lang['Private_Message'],
! 'L_EMAIL' => $lang['Email'],
'L_WEBSITE' => $lang['Website'],
'L_FROM' => $lang['Location'],
--- 913,918 ----
'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
'L_PM' => $lang['Private_Message'],
! 'L_EMAIL' => $lang['Email'],
! 'L_POSTS' => $lang['Posts'],
'L_WEBSITE' => $lang['Website'],
'L_FROM' => $lang['Location'],
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** modcp.php 4 Apr 2002 11:41:32 -0000 1.71
--- modcp.php 20 Apr 2002 00:22:27 -0000 1.72
***************
*** 344,348 ****
for($i = 0; $i < count($topics); $i++)
{
! $hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . $topics[$i] . '" />';
}
}
--- 344,348 ----
for($i = 0; $i < count($topics); $i++)
{
! $hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . intval($topics[$i]) . '" />';
}
}
***************
*** 392,396 ****
for($i = 0; $i < count($topics); $i++)
{
! $topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . $topics[$i];
}
--- 392,396 ----
for($i = 0; $i < count($topics); $i++)
{
! $topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . intval($topics[$i]);
}
***************
*** 625,629 ****
}
! $new_forum_id = $HTTP_POST_VARS['new_forum_id'];
$topic_time = time();
--- 625,629 ----
}
! $new_forum_id = intval($HTTP_POST_VARS['new_forum_id']);
$topic_time = time();
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -r1.159 -r1.160
*** posting.php 1 Apr 2002 20:07:51 -0000 1.159
--- posting.php 20 Apr 2002 00:22:27 -0000 1.160
***************
*** 83,97 ****
{
$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! $post_append = "";
}
else if ( $forum_id )
{
$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $post_append = "";
}
else
{
$redirect = "index.$phpEx";
! $post_append = "";
}
--- 83,97 ----
{
$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! $post_append = '';
}
else if ( $forum_id )
{
$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $post_append = '';
}
else
{
$redirect = "index.$phpEx";
! $post_append = '';
}
***************
*** 443,447 ****
if ( !empty($HTTP_POST_VARS['vote_id']) )
{
! $vote_option_id = $HTTP_POST_VARS['vote_id'];
$sql = "SELECT vd.vote_id
--- 443,447 ----
if ( !empty($HTTP_POST_VARS['vote_id']) )
{
! $vote_option_id = intval($HTTP_POST_VARS['vote_id']);
$sql = "SELECT vd.vote_id
***************
*** 872,876 ****
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"';
! if ( $post_data['topic_type'] == POST_STICKY )
{
$topic_type_toggle .= ' checked="checked"';
--- 872,876 ----
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"';
! if ( $post_data['topic_type'] == POST_STICKY || $topic_type == POST_STICKY )
{
$topic_type_toggle .= ' checked="checked"';
***************
*** 882,886 ****
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"';
! if ( $post_data['topic_type'] == POST_ANNOUNCE )
{
$topic_type_toggle .= ' checked="checked"';
--- 882,886 ----
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"';
! if ( $post_data['topic_type'] == POST_ANNOUNCE || $topic_type == POST_ANNOUNCE )
{
$topic_type_toggle .= ' checked="checked"';
***************
*** 891,895 ****
if ( $topic_type_toggle != '' )
{
! $topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . ' ' . $topic_type_toggle;
}
}
--- 891,895 ----
if ( $topic_type_toggle != '' )
{
! $topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL || $topic_type == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . ' ' . $topic_type_toggle;
}
}
***************
*** 1083,1085 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 1083,1085 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** privmsg.php 31 Mar 2002 00:06:33 -0000 1.96
--- privmsg.php 20 Apr 2002 00:22:28 -0000 1.97
***************
*** 100,108 ****
}
! $start = ( !empty($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) )
{
! $privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? $HTTP_POST_VARS[POST_POST_URL] : $HTTP_GET_VARS[POST_POST_URL];
}
else
--- 100,108 ----
}
! $start = ( !empty($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) )
{
! $privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]);
}
else
***************
*** 174,178 ****
if ( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
! $privmsgs_id = $HTTP_GET_VARS[POST_POST_URL];
}
else
--- 174,178 ----
if ( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
! $privmsgs_id = intval($HTTP_GET_VARS[POST_POST_URL]);
}
else
***************
*** 473,479 ****
$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';
! if ( !empty($privmsg['user_viewemail']) || $is_auth['auth_mod'] )
{
! $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $privmsg['user_email'];
$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
--- 473,479 ----
$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';
! if ( !empty($privmsg['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
! $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id_from) : 'mailto:' . $privmsg['user_email'];
$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
***************
*** 911,915 ****
if ( !$userdata['session_logged_in'] )
{
! $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . $HTTP_GET_VARS[POST_USERS_URL] : '';
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
--- 911,915 ----
if ( !$userdata['session_logged_in'] )
{
! $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . intval($HTTP_GET_VARS[POST_USERS_URL]) : '';
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
***************
*** 1038,1042 ****
$msg_time = time();
! if ( $mode != "edit" )
{
//
--- 1038,1042 ----
$msg_time = time();
! if ( $mode != 'edit' )
{
//
***************
*** 1088,1092 ****
}
! if ( $mode != "edit" )
{
$privmsg_sent_id = $db->sql_nextid();
--- 1088,1092 ----
}
! if ( $mode != 'edit' )
{
$privmsg_sent_id = $db->sql_nextid();
***************
*** 1226,1230 ****
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) )
{
! $user_id = $HTTP_GET_VARS[POST_USERS_URL];
$sql = "SELECT username
--- 1226,1230 ----
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) )
{
! $user_id = intval($HTTP_GET_VARS[POST_USERS_URL]);
$sql = "SELECT username
***************
*** 1746,1750 ****
if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) )
{
! $msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays'];
$min_msg_time = time() - ($msg_days * 86400);
--- 1746,1750 ----
if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) )
{
! $msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? intval($HTTP_POST_VARS['msgdays']) : intval($HTTP_GET_VARS['msgdays']);
$min_msg_time = time() - ($msg_days * 86400);
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** search.php 31 Mar 2002 19:13:06 -0000 1.72
--- search.php 20 Apr 2002 00:22:28 -0000 1.73
***************
*** 116,124 ****
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
- //
- // Define some globally used data
- //
$sort_by_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']);
- $sort_by_sql = array('p.post_time', 'pt.post_subject', 't.topic_title', 'u.username', 'f.forum_id');
//
--- 116,120 ----
***************
*** 162,166 ****
else
{
! header("Location: login.$phpEx?redirect=search&search_id=newposts");
exit;
}
--- 158,162 ----
else
{
! header("Location: login.$phpEx?redirect=search.$phpEx&search_id=newposts", true);
exit;
}
***************
*** 180,184 ****
else
{
! header("Location: login.$phpEx?redirect=search&search_id=egosearch");
exit;
}
--- 176,180 ----
else
{
! header("Location: login.$phpEx?redirect=search.$phpEx&search_id=egosearch", true);
exit;
}
***************
*** 447,452 ****
else if ( $search_author != '' || $search_time || $auth_sql != '' )
{
! $where_sql = ( $search_author == '' && $auth_sql == '' ) ? "post_id IN (" . implode(', ', $search_ids) . ")" : "p.post_id IN (" . implode(", ", $search_ids) . ")";
! $from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . " p";
if ( $search_time )
--- 443,448 ----
else if ( $search_author != '' || $search_time || $auth_sql != '' )
{
! $where_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id IN (' . implode(', ', $search_ids) . ')' : 'p.post_id IN (' . implode(', ', $search_ids) . ')';
! $from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . ' p';
if ( $search_time )
***************
*** 641,648 ****
AND u2.user_id = p2.poster_id";
}
!
$per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
! $sql .= " ORDER BY " . $sort_by_sql[$sort_by] . " $sort_dir LIMIT $start, " . $per_page;
if ( !$result = $db->sql_query($sql) )
--- 637,663 ----
AND u2.user_id = p2.poster_id";
}
!
$per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
! $sql .= " ORDER BY ";
! switch ( $sort_by )
! {
! case 1:
! $sql .= ( $show_results == 'posts' ) ? 'pt.post_subject' : 't.topic_title';
! break;
! case 2:
! $sql .= 't.topic_title';
! break;
! case 3:
! $sql .= 'u.username';
! break;
! case 4:
! $sql .= 'f.forum_id';
! break;
! default:
! $sql .= ( $show_results == 'posts' ) ? 'p.post_time' : 'p2.post_time';
! break;
! }
! $sql .= " $sort_dir LIMIT $start, " . $per_page;
if ( !$result = $db->sql_query($sql) )
***************
*** 726,730 ****
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $searchset[$i]['forum_id']);
$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $searchset[$i]['topic_id'] . "&highlight=$highlight_active");
! $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['post_id'] . "&highlight=$highlight_active#" . $searchset[$i]['post_id']);
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
--- 741,745 ----
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $searchset[$i]['forum_id']);
$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $searchset[$i]['topic_id'] . "&highlight=$highlight_active");
! $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['post_id'] . "&highlight=$highlight_active") . '#' . $searchset[$i]['post_id'];
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
***************
*** 1299,1301 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 1314,1316 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
Index: update_script.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_script.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** update_script.php 4 Apr 2002 21:44:36 -0000 1.1
--- update_script.php 20 Apr 2002 00:22:28 -0000 1.2
***************
*** 21,38 ****
if ( $row = $db->sql_fetchrow($result) )
{
! if ( $row['config_value'] != '.1.0 [20020402]' )
{
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.1.0 [20020402]'
! WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
{
! die("Couldn't update version info");
}
-
- die("UPDATING COMPLETE");
}
}
echo "\n<br />\n<b>COMPLETE!</b><br />\n";
--- 21,61 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $sql = array();
! switch ( $row['config_value'] )
{
! case '.1.0 [20020402]':
! echo 'Updating from [20020402] :: ';
! flush();
!
! $sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
! VALUES ('session_gc', '3600')";
! $sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
! VALUES ('session_last_gc', '0')";
!
! echo '<span style="color:green">DONE</span><br /><br />';
! break;
! default;
! echo 'No updates made<br /><br />';
! }
!
! if ( count($sql) )
! {
! for($i = 0; $i < count($sql); $i++)
{
! if ( !($result = $db->sql_query($sql[$i])) )
! {
! die("Couldn't run update >> " . $sql);
! }
}
}
}
+ $sql = "UPDATE " . CONFIG_TABLE . "
+ SET config_value = '.1.0 [20020420]'
+ WHERE config_name = 'version'";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't update version info");
+ }
echo "\n<br />\n<b>COMPLETE!</b><br />\n";
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** upgrade.php 25 Mar 2002 20:28:11 -0000 1.27
--- upgrade.php 20 Apr 2002 00:22:28 -0000 1.28
***************
*** 162,166 ****
}
! function smiley_replace($text = "")
{
global $db;
--- 162,166 ----
}
! function smiley_replace($text = '')
{
global $db;
***************
*** 187,191 ****
}
! return ( $text != "" ) ? preg_replace($search, $replace, $text) : "";
}
--- 187,191 ----
}
! return ( $text != '' ) ? preg_replace($search, $replace, $text) : '';
}
***************
*** 202,221 ****
$line = $schemafile[$i];
! if ( preg_match("/^CREATE TABLE (\w+)/i", $line, $matches) )
{
// Start of a new table definition, set some variables and go to the next line.
$tabledata = 1;
// Replace the 'phpbb_' prefix by the user defined prefix.
! $table = str_replace("phpbb_", $table_prefix, $matches[1]);
$table_def[$table] = "CREATE TABLE $table (\n";
continue;
}
! if ( preg_match("/^\);/", $line) )
{
// End of the table definition
// After this we will skip everything until the next 'CREATE' line
$tabledata = 0;
! $table_def[$table] .= ")"; // We don't need the closing semicolon
}
--- 202,221 ----
$line = $schemafile[$i];
! if ( preg_match('/^CREATE TABLE (\w+)/i', $line, $matches) )
{
// Start of a new table definition, set some variables and go to the next line.
$tabledata = 1;
// Replace the 'phpbb_' prefix by the user defined prefix.
! $table = str_replace('phpbb_', $table_prefix, $matches[1]);
$table_def[$table] = "CREATE TABLE $table (\n";
continue;
}
! if ( preg_match('/^\);/', $line) )
{
// End of the table definition
// After this we will skip everything until the next 'CREATE' line
$tabledata = 0;
! $table_def[$table] .= ')'; // We don't need the closing semicolon
}
***************
*** 225,229 ****
// Add the current line to the complete table definition:
$table_def[$table] .= $line;
! if ( preg_match("/^\s*(\w+)\s+(\w+)\((\d+)\)(.*)$/", $line, $matches) )
{
// This is a column definition
--- 225,229 ----
// Add the current line to the complete table definition:
$table_def[$table] .= $line;
! if ( preg_match('/^\s*(\w+)\s+(\w+)\(([\d,]+)\)(.*)$/', $line, $matches) )
{
// This is a column definition
***************
*** 232,240 ****
$size = $matches[3];
! preg_match("/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i", $matches[4], $match);
$default = $match[1];
! $notnull = ( preg_match("/NOT NULL/i", $matches[4]) ) ? 1 : 0;
! $auto_increment = ( preg_match("/auto_increment/i", $matches[4]) ) ? 1 : 0;
$field_def[$table][$field] = array(
--- 232,240 ----
$size = $matches[3];
! preg_match('/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i', $matches[4], $match);
$default = $match[1];
! $notnull = ( preg_match('/NOT NULL/i', $matches[4]) ) ? 1 : 0;
! $auto_increment = ( preg_match('/auto_increment/i', $matches[4]) ) ? 1 : 0;
$field_def[$table][$field] = array(
***************
*** 247,261 ****
}
! if ( preg_match("/\s*PRIMARY\s+KEY\s*\((.*)\).*/", $line, $matches) )
{
// Primary key
$key_def[$table]['PRIMARY'] = $matches[1];
}
! else if ( preg_match("/\s*KEY\s+(\w+)\s*\((.*)\)/", $line, $matches) )
{
// Normal key
$key_def[$table][$matches[1]] = $matches[2];
}
! else if ( preg_match("/^\s*(\w+)\s*(.*?),?\s*$/", $line, $matches) )
{
// Column definition
--- 247,261 ----
}
! if ( preg_match('/\s*PRIMARY\s+KEY\s*\((.*)\).*/', $line, $matches) )
{
// Primary key
$key_def[$table]['PRIMARY'] = $matches[1];
}
! else if ( preg_match('/\s*KEY\s+(\w+)\s*\((.*)\)/', $line, $matches) )
{
// Normal key
$key_def[$table][$matches[1]] = $matches[2];
}
! else if ( preg_match('/^\s*(\w+)\s*(.*?),?\s*$/', $line, $matches) )
{
// Column definition
***************
*** 281,289 ****
global $table_prefix;
! $insertfile = file("db/schemas/mysql_basic.sql");
for($i = 0; $i < count($insertfile); $i++)
{
! if ( preg_match("/(INSERT INTO (\w+)\s.*);/i", str_replace("phpbb_", $table_prefix, $insertfile[$i]), $matches) )
{
$returnvalue[$matches[2]][] = $matches[1];
--- 281,289 ----
global $table_prefix;
! $insertfile = file('db/schemas/mysql_basic.sql');
for($i = 0; $i < count($insertfile); $i++)
{
! if ( preg_match('/(INSERT INTO (\w+)\s.*);/i', str_replace('phpbb_', $table_prefix, $insertfile[$i]), $matches) )
{
$returnvalue[$matches[2]][] = $matches[1];
***************
*** 324,337 ****
{
// Undo [code]
! $code_start_html = "<!-- BBCode Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Code:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><PRE>";
! $code_end_html = "</PRE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode End -->";
! $message = str_replace($code_start_html, "[code]", $message);
! $message = str_replace($code_end_html, "[/code]", $message);
// Undo [quote]
! $quote_start_html = "<!-- BBCode Quote Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Quote:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><BLOCKQUOTE>";
! $quote_end_html = "</BLOCKQUOTE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode Quote End -->";
! $message = str_replace($quote_start_html, "[quote]", $message);
! $message = str_replace($quote_end_html, "[/quote]", $message);
// Undo [b] and [i]
--- 324,337 ----
{
// Undo [code]
! $code_start_html = '<!-- BBCode Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Code:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><PRE>';
! $code_end_html = '</PRE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode End -->';
! $message = str_replace($code_start_html, '[code]', $message);
! $message = str_replace($code_end_html, '[/code]', $message);
// Undo [quote]
! $quote_start_html = '<!-- BBCode Quote Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Quote:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><BLOCKQUOTE>';
! $quote_end_html = '</BLOCKQUOTE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode Quote End -->';
! $message = str_replace($quote_start_html, '[quote]', $message);
! $message = str_replace($quote_end_html, '[/quote]', $message);
// Undo [b] and [i]
***************
*** 354,368 ****
// <li> tags:
! $message = str_replace("<!-- BBCode --><LI>", "[*]", $message);
// [list] tags:
! $message = str_replace("<!-- BBCode ulist Start --><UL>", "[list]", $message);
// [list=x] tags:
! $message = preg_replace("#<!-- BBCode olist Start --><OL TYPE=([A1])>#si", "[list=\\1]", $message);
// [/list] tags:
! $message = str_replace("</UL><!-- BBCode ulist End -->", "[/list]", $message);
! $message = str_replace("</OL><!-- BBCode olist End -->", "[/list]", $message);
return $message;
--- 354,368 ----
// <li> tags:
! $message = str_replace('<!-- BBCode --><LI>', '[*]', $message);
// [list] tags:
! $message = str_replace('<!-- BBCode ulist Start --><UL>', '[list]', $message);
// [list=x] tags:
! $message = preg_replace('#<!-- BBCode olist Start --><OL TYPE=([A1])>#si', "[list=\\1]", $message);
// [/list] tags:
! $message = str_replace('</UL><!-- BBCode ulist End -->', '[/list]', $message);
! $message = str_replace('</OL><!-- BBCode olist End -->', '[/list]', $message);
return $message;
***************
*** 1076,1080 ****
$row['post_text'] = bbdecode(stripslashes($row['post_text']));
$row['post_text'] = undo_make_clickable($row['post_text']);
! $row['post_text'] = str_replace("<BR>", "\n", $row['post_text']);
// make a uid
--- 1076,1080 ----
$row['post_text'] = bbdecode(stripslashes($row['post_text']));
$row['post_text'] = undo_make_clickable($row['post_text']);
! $row['post_text'] = str_replace('<BR>', "\n", $row['post_text']);
// make a uid
***************
*** 1087,1098 ****
$edited_sql = "";
! if ( preg_match("/^(.*?)([\n]+<font size=\-1>\[ This message was .*?)$/s", $row['post_text'], $matches) )
{
$row['post_text'] = $matches[1];
$edit_info = $matches[2];
! $edit_times = count(explode(" message ", $edit_info)) - 1; // Taken from example for substr_count in annotated PHP manual
! if ( preg_match("/^.* by: (.*?) on (....)-(..)-(..) (..):(..) \]<\/font>/s", $edit_info, $matches) )
{
$edited_user = $matches[1];
--- 1087,1098 ----
$edited_sql = "";
! if ( preg_match('/^(.*?)([\n]+<font size=\-1>\[ This message was .*?)$/s', $row['post_text'], $matches) )
{
$row['post_text'] = $matches[1];
$edit_info = $matches[2];
! $edit_times = count(explode(' message ', $edit_info)) - 1; // Taken from example for substr_count in annotated PHP manual
! if ( preg_match('/^.* by: (.*?) on (....)-(..)-(..) (..):(..) \]<\/font>/s', $edit_info, $matches) )
{
$edited_user = $matches[1];
***************
*** 1131,1135 ****
if ( $inc == $per_pct )
{
! print ".";
flush();
$inc = 0;
--- 1131,1135 ----
if ( $inc == $per_pct )
{
! print '.';
flush();
$inc = 0;
***************
*** 1260,1264 ****
if ( $inc == $per_pct )
{
! print ".";
flush();
$inc = 0;
--- 1260,1264 ----
if ( $inc == $per_pct )
{
! print '.';
flush();
$inc = 0;
***************
*** 1280,1284 ****
{
// Check if this moderator and this forum still exist
! $sql = "SELECT NULL
FROM " . USERS_TABLE . ", " . FORUMS_TABLE . "
WHERE user_id = " . $row['user_id'] . "
--- 1280,1284 ----
{
// Check if this moderator and this forum still exist
! $sql = "SELECT user_id
FROM " . USERS_TABLE . ", " . FORUMS_TABLE . "
WHERE user_id = " . $row['user_id'] . "
***************
*** 1310,1313 ****
--- 1310,1342 ----
print "<span class=\"ok\"><b>OK</b></span><br />\n";
}
+
+ print " * Setting correct user_level for moderators ::";
+ flush();
+
+ $sql = "SELECT DISTINCT u.user_id
+ FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa
+ WHERE aa.auth_mod = 1
+ AND ug.group_id = aa.group_id
+ AND u.user_id = ug.user_id
+ AND u.user_level <> " . ADMIN;
+ $result = query($sql, "Couldn't obtain list of moderators");
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ $ug_sql = '';
+
+ do
+ {
+ $ug_sql .= ( ( $ug_sql != '' ) ? ', ' : '' ) . $row['user_id'];
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_level = " . MOD . "
+ WHERE user_id IN ($ug_sql)";
+ query($sql, "Couldn't set moderator status for users");
+ }
+
+ print "<span class=\"ok\"><b>OK</b></span><br />\n";
end_step('convert_privforums');
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -r1.139 -r1.140
*** viewforum.php 4 Apr 2002 11:47:43 -0000 1.139
--- viewforum.php 20 Apr 2002 00:22:28 -0000 1.140
***************
*** 35,39 ****
else if ( isset($HTTP_GET_VARS['forum']))
{
! $forum_id = $HTTP_GET_VARS['forum'];
}
else
--- 35,39 ----
else if ( isset($HTTP_GET_VARS['forum']))
{
! $forum_id = intval($HTTP_GET_VARS['forum']);
}
else
Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** viewonline.php 4 Apr 2002 11:25:56 -0000 1.54
--- viewonline.php 20 Apr 2002 00:22:28 -0000 1.55
***************
*** 80,88 ****
// Get user list
//
! $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND ( s.session_time >= ".( time() - 300 ) . "
! OR u.user_session_time >= " . ( time() - 300 ) . " )
ORDER BY u.username ASC, s.session_ip ASC";
if ( !($result = $db->sql_query($sql)) )
--- 80,87 ----
// Get user list
//
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND s.session_time >= ".( time() - 300 ) . "
ORDER BY u.username ASC, s.session_ip ASC";
if ( !($result = $db->sql_query($sql)) )
***************
*** 135,141 ****
}
- $last_update = $row['user_session_time'];
- $user_page = $row['user_session_page'];
-
$which_counter = 'reg_counter';
$which_row = 'reg_user_row';
--- 134,137 ----
***************
*** 147,157 ****
if ( $row['session_ip'] != $prev_ip )
{
$view_online = true;
$guest_users++;
- $username = $lang['Guest'];
- $last_update = $row['session_time'];
- $user_page = $row['session_page'];
-
$which_counter = 'guest_counter';
$which_row = 'guest_user_row';
--- 143,150 ----
if ( $row['session_ip'] != $prev_ip )
{
+ $username = $lang['Guest'];
$view_online = true;
$guest_users++;
$which_counter = 'guest_counter';
$which_row = 'guest_user_row';
***************
*** 163,169 ****
if ( $view_online )
{
! if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
{
! switch( $user_page )
{
case PAGE_INDEX:
--- 156,162 ----
if ( $view_online )
{
! if ( $row['session_page'] < 1 || !$is_auth_ary[$row['session_page']]['auth_view'] )
{
! switch( $row['session_page'] )
{
case PAGE_INDEX:
***************
*** 210,215 ****
else
{
! $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
! $location = $forum_data[$user_page];
}
--- 203,208 ----
else
{
! $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $row['session_page']);
! $location = $forum_data[$row['session_page']];
}
***************
*** 221,225 ****
'ROW_CLASS' => $row_class,
'USERNAME' => $username,
! 'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
'FORUM_LOCATION' => $location,
--- 214,218 ----
'ROW_CLASS' => $row_class,
'USERNAME' => $username,
! 'LASTUPDATE' => create_date($board_config['default_dateformat'], $row['session_time'], $board_config['board_timezone']),
'FORUM_LOCATION' => $location,
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -r1.186 -r1.187
*** viewtopic.php 31 Mar 2002 00:06:34 -0000 1.186
--- viewtopic.php 20 Apr 2002 00:22:28 -0000 1.187
***************
*** 991,995 ****
$temp_url = append_sid("posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
$delpost_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>';
! $delpost_img = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
}
else
--- 991,995 ----
$temp_url = append_sid("posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
$delpost_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>';
! $delpost = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
}
else
|
|
From: Paul S. O. <ps...@us...> - 2002-04-20 00:22:30
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv5403/admin
Modified Files:
admin_mass_email.php page_footer_admin.php
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** admin_mass_email.php 2 Apr 2002 21:13:47 -0000 1.15
--- admin_mass_email.php 20 Apr 2002 00:22:27 -0000 1.16
***************
*** 34,38 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
--- 34,38 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
***************
*** 44,49 ****
@set_time_limit(1200);
! $message = "";
! $subject = "";
//
--- 44,49 ----
@set_time_limit(1200);
! $message = '';
! $subject = '';
//
***************
*** 67,76 ****
FROM " . USERS_TABLE;
}
!
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
}
if( !$db->sql_numrows($result) )
{
--- 67,79 ----
FROM " . USERS_TABLE;
}
! if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
}
+
+
+
+
if( !$db->sql_numrows($result) )
{
***************
*** 82,88 ****
$email_list = $db->sql_fetchrowset($g_result);
! $subject = stripslashes($HTTP_POST_VARS["subject"]);
! $message = stripslashes($HTTP_POST_VARS["message"]);
//
--- 85,95 ----
$email_list = $db->sql_fetchrowset($g_result);
+
+
+
!
! $subject = stripslashes($HTTP_POST_VARS['subject']);
! $message = stripslashes($HTTP_POST_VARS['message']);
//
***************
*** 108,131 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\n";
! $bcc_list = "";
for($i = 0; $i < count($email_list); $i++)
{
! if( $bcc_list != "" )
! {
! $bcc_list .= ", ";
! }
! $bcc_list .= $email_list[$i]['user_email'];
}
$email_headers .= "Bcc: $bcc_list\n";
! $email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
! $email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
! $email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! $email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! $email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
! $emailer->use_template("admin_send_email");
$emailer->email_address($board_config['board_email']);
$emailer->set_subject($subject);
--- 115,134 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\n";
! $bcc_list = '';
for($i = 0; $i < count($email_list); $i++)
{
! $bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $email_list[$i]['user_email'];
}
$email_headers .= "Bcc: $bcc_list\n";
! $email_headers .= 'Return-Path: ' . $userdata['board_email'] . "\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
! $emailer->use_template('admin_send_email');
$emailer->email_address($board_config['board_email']);
$emailer->set_subject($subject);
***************
*** 133,144 ****
$emailer->assign_vars(array(
! "SITENAME" => $board_config['sitename'],
! "BOARD_EMAIL" => $board_config['board_email'],
! "MESSAGE" => $message)
);
$emailer->send();
$emailer->reset();
! $message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
--- 136,147 ----
$emailer->assign_vars(array(
! 'SITENAME' => $board_config['sitename'],
! 'BOARD_EMAIL' => $board_config['board_email'],
! 'MESSAGE' => $message)
);
$emailer->send();
$emailer->reset();
! $message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
***************
*** 153,168 ****
FROM ".GROUPS_TABLE . "
WHERE group_single_user <> 1";
! $g_result = $db->sql_query($sql);
! $group_list = $db->sql_fetchrowset($g_result);
!
! $select_list = '<select name = "' . POST_GROUPS_URL . '">';
! $select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
! for($i = 0;$i < count($group_list); $i++)
{
! $select_list .= "<option value = \"" . $group_list[$i]['group_id'];
! $select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
}
! $select_list .= "</select>";
//
--- 156,174 ----
FROM ".GROUPS_TABLE . "
WHERE group_single_user <> 1";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not obtain list of groups', '', __LINE__, __FILE__, $sql);
! }
! $select_list = '<select name = "' . POST_GROUPS_URL . '"><option value = "-1">' . $lang['All_users'] . '</option>';
! if ( $row = $db->sql_fetchrow($result) )
{
! do
! {
! $select_list .= '<option value = "' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! }
! while ( $row = $db->sql_fetchrow($result) );
}
! $select_list .= '</select>';
//
***************
*** 172,193 ****
$template->set_filenames(array(
! "body" => "admin/user_email_body.tpl")
);
$template->assign_vars(array(
! "MESSAGE" => $message,
! "SUBJECT" => $subject,
! "L_EMAIL_TITLE" => $lang['Email'],
! "L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
! "L_COMPOSE" => $lang['Compose'],
! "L_RECIPIENTS" => $lang['Recipients'],
! "L_EMAIL_SUBJECT" => $lang['Subject'],
! "L_EMAIL_MSG" => $lang['Message'],
! "L_EMAIL" => $lang['Email'],
! "L_NOTICE" => $notice,
! "S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
! "S_GROUP_SELECT" => $select_list)
);
--- 178,199 ----
$template->set_filenames(array(
! 'body' => 'admin/user_email_body.tpl')
);
$template->assign_vars(array(
! 'MESSAGE' => $message,
! 'SUBJECT' => $subject,
! 'L_EMAIL_TITLE' => $lang['Email'],
! 'L_EMAIL_EXPLAIN' => $lang['Mass_email_explain'],
! 'L_COMPOSE' => $lang['Compose'],
! 'L_RECIPIENTS' => $lang['Recipients'],
! 'L_EMAIL_SUBJECT' => $lang['Subject'],
! 'L_EMAIL_MSG' => $lang['Message'],
! 'L_EMAIL' => $lang['Email'],
! 'L_NOTICE' => $notice,
! 'S_USER_ACTION' => append_sid('admin_mass_email.'.$phpEx),
! 'S_GROUP_SELECT' => $select_list)
);
***************
*** 196,198 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 202,204 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_footer_admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** page_footer_admin.php 18 Mar 2002 14:54:25 -0000 1.9
--- page_footer_admin.php 20 Apr 2002 00:22:27 -0000 1.10
***************
*** 29,53 ****
// Show the overall footer.
//
- $current_time = time();
-
$template->set_filenames(array(
! "page_footer" => "admin/page_footer.tpl")
);
$template->assign_vars(array(
! "PHPBB_VERSION" => "2.0 " . $board_config['version'],
! "TRANSLATION_INFO" => $lang['TRANSLATION_INFO'])
);
! $template->pparse("page_footer");
!
! //
! // Output page creation time
! //
! $mtime = microtime();
! $mtime = explode(" ",$mtime);
! $mtime = $mtime[1] + $mtime[0];
! $endtime = $mtime;
! $totaltime = ($endtime - $starttime);
//
--- 29,42 ----
// Show the overall footer.
//
$template->set_filenames(array(
! 'page_footer' => 'admin/page_footer.tpl')
);
$template->assign_vars(array(
! 'PHPBB_VERSION' => '2' . $board_config['version'],
! 'TRANSLATION_INFO' => $lang['TRANSLATION_INFO'])
);
! $template->pparse('page_footer');
//
***************
*** 74,81 ****
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
echo $gzip_contents;
! echo pack("V", $gzip_crc);
! echo pack("V", $gzip_size);
}
--- 63,70 ----
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
echo $gzip_contents;
! echo pack('V', $gzip_crc);
! echo pack('V', $gzip_size);
}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew/email
In directory usw-pr-cvs1:/tmp/cvs-serv5868
Added Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl index.htm privmsg_notify.tpl
profile_send_email.tpl topic_notify.tpl user_activate.tpl
user_activate_passwd.tpl user_welcome.tpl
user_welcome_inactive.tpl
Log Message:
Initial version by dolfin
--- NEW FILE ---
Subject: çùáåï îùúîù çãù
ùìåí,
äçùáåï äùééê ì "{USERNAME}" äåôñ÷ àå ðåöø îçãù, àúä öøéê ìáãå÷ àú äôøèéí ùì îùúîù æä (àí ðãøù) åìäôòéìå îçãù áòæøú ùéîåù áìéð÷ äáà:
{U_ACTIVATE}
{EMAIL_SIG}
--- NEW FILE ---
äãåàø äàì÷èøåðé äáà ðùìç òì-éãé äîðäì ùì "{SITENAME}". àí äåãòä æå äéà ñôàí, àí äåãòä æå îëéìä òìáåðåú àå äòøåú àçøåú ùàúä îåöà ôåâòåú àðà öåø ÷ùø àí îðäì äìåç áëúåáú äáàä:
{BOARD_EMAIL}
åöøó àú ëì îëúá æä (áîéåçã àú äëåúøåú).
ääåãòä ùðùìçä ìê:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{MESSAGE}
--- NEW FILE ---
Subject: çùáåï äåôòì
ùìåí {USERNAME},
äçùáåï ùìê á "{SITENAME}" äåôòì ëòú, àúä øùàé ìäúçáø òí ùí äîùúîù åäñéñîä ù÷éáìú áîëúá ä÷åãí.
{EMAIL_SIG}
--- NEW FILE ---
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
{WELCOME_MSG}
àðà ùîåø îëúá æä áøùåîåú ùìê. îéãò äçùáåï ùìê äåà:
----------------------------
ùí îùúîù: {USERNAME}
ñéñîä: {PASSWORD}
----------------------------
äçùáåï ùìê ëøâò àéðå ôòéì, îðäì äìåç öøéê ìäôòéì àåúå ìôðé ùúåëì ìäúçáø. àúä ú÷áì òåã îëúá ëùæä é÷øä.
àðà àì úùëç àú ñéñîúê ëéååï ùäéà äåöôðä áîñã äðúåðéí ùìðå åìà ðåëì ìàçæø àåúä òáåøê. áëì î÷øä, àí úùëç àú ñéñîúê úåëì ìá÷ù ñéñîä çãùä ùúåôòì áàåúä ãøê ùçùáåï æä îåôòì.
úåãä ùðøùîú.
{EMAIL_SIG}
--- NEW FILE ---
Subject: Welcome to {SITENAME} Forums
{WELCOME_MSG}
In compliance with the COPPA act your account is currently inactive.
Please print this message out and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
OR mail it to:
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
Permission to Participate at {SITENAME}
Username: {USERNAME}
Password: {PASSWORD}
Email: {EMAIL_ADDRESS}
ICQ Number: {ICQ}
AIM Address: {AIM}
MSN Messenger: {MSN}
Yahoo Messenger: {YIM}
Web Site: {WEB_SITE}
From: {FROM}
Occupation: {OCC}
Interests: {INTERESTS}
I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION.
I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
Parent or Guardian
(print your name here): _____________________
(sign here): __________________
Date: _______________
------------------------------ CUT HERE ------------------------------
Once the administrator has recived the above form via fax or regular mail your account will be activated.
Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.
{EMAIL_SIG}
--- NEW FILE ---
Subject: öåøôú ì÷áåöú äîùúîùéí äæå
áøëåú,
öåøôú ì÷áåöä "{GROUP_NAME}" á {SITENAME}.
ôòåìä æå áåöòä òì-éãé àçøàé ä÷áåöä àå îðäì äàúø, öåø òéîí ÷ùø ìòåã îéãò.
úåëì ìøàåú àú äîéãò òì ä÷áåöåú ùìê ëàï:
{U_GROUPCP}
{EMAIL_SIG}
--- NEW FILE ---
Subject: á÷ùúê àåùøä
áøëåú,
á÷ùúê ìäöèøó ì÷áåöä "{GROUP_NAME}" á {SITENAME} àåùøä.
ìçõ òì äìéð÷ äáà ëãé ìøàåú àú îéãò ä÷áåöåú ùìê.
{U_GROUPCP}
{EMAIL_SIG}
--- NEW FILE ---
Subject: ðòùúä á÷ùä ìäöèøôåú ì÷áåöä ùìê
ìëáåã {GROUP_MODERATOR},
îùúîù áé÷ù ìäöèøó ì÷áåöä ùàúä îðäì á {SITENAME}.
ëãé ìàùø àå ìãçåú àú äá÷ùä ìçáøåú á÷áåöä àðà á÷ø á÷éùåø äáà:
{U_GROUPCP}
{EMAIL_SIG}
--- NEW FILE ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
</body>
</html>
--- NEW FILE ---
Subject: äåãòä ôøèéú çãùä äâéòä
ùìåí {USERNAME},
÷éáìú äåãòä çãùä ìçùáåï ùìê á "{SITENAME}" åáé÷ùú ì÷áì äåãòä áàéøåò æä. àúä éëåì ìøàåú àú äåãòúê òì-éãé ìçéöä òì ä÷éùåø äáà:
{U_INBOX}
æëåø ëé àúä úîéã éëåì ìáçåø ìà ìäéååãò òì äåãòåú çãùåú òì-éãé ùéðåé ääâãøåú äîúàéîåú áôøåôéì ùìê.
{EMAIL_SIG}
--- NEW FILE ---
ùìåí {TO_USERNAME},
äîëúá äáà äåà ãåàø àì÷èøåðé ùðùìç àìéê òì-éãé {FROM_USERNAME} ãøê äçùáåï ùìê á {SITENAME}. àí äåãòä æå äéðä äöôä, îëéìä òìáåðåú àå äòøåú àçøåú ùàúä îåöà ôåâòåú àðà öåø ÷ùø òí îðäì äìåç áëúåáú äáàä:
{BOARD_EMAIL}
öøó àú äîëúá äîìà (áîéåçã äëåúøåú). àðà ùéí ìá ùëúåáú äúâåáä ìîëúá æä ð÷áòä ì {FROM_USERNAME}.
äîëúá ùðùìç àìéê
~~~~~~~~~~~~~~~~~~~~~~~~~~~
{MESSAGE}
--- NEW FILE ---
Subject: äåãòä òì úâåáä ìðåùà - {TOPIC_TITLE}
ùìåí {USERNAME},
÷éáìú îëúá æä ëé àúä òå÷á àçø ðåùà, "{TOPIC_TITLE}" á {SITENAME}. ðåùà æä ÷éáì úâåáä îàæ äáé÷åø äàçøåï ùìê. àúä éëåì ìäùúîù áìéð÷ äáà ëãé ìøàåú àú äúâåáåú ùðëúáå, ìà éùìçå àìéê òåã äåãòåú òã ùúá÷ø áðåùà.
{U_TOPIC}
àí àéï áøöåðê ìò÷åá éåúø àçø ðåùà æä àúä éëåì ììçåõ òì ä÷éùåø "äôñ÷ ìò÷åá àçø ðåùà æä" äðîöà áúçúéú äðåùà äáà àå òì-éãé ìçéöä òì ä÷éùåø äáà:
{U_STOP_WATCHING_TOPIC}
{EMAIL_SIG}
--- NEW FILE ---
Subject: äôòì îçãù àú äçùáåï ùìê
ùìåí {USERNAME},
äçùáåï ùìê á "{SITENAME}" äåôñ÷, øåá äñéëåééí ùòì-éãé òøéëú äôøåôéì ùìê. ëãé ìäôòéì îçãù àú äçùáåï ùìê àúä çééá ììçåõ òì äìéð÷ îèä:
{U_ACTIVATE}
{EMAIL_SIG}
--- NEW FILE ---
Subject: äôòìú ñéñîä çãùä
ùìåí {USERNAME}
àúä î÷áì ãåà"ì æä áâìì ùàúä (àå îéùäå ùîúçæä ìäéåú àúä) áé÷ùú ùìéçú ñéñîä çãùä òáåø äçùáåï ùìê á {SITENAME}. àí ìà áé÷ùú ãåà"ì æä - äúòìí îîðå, àí àúä îîùéê ì÷áì àåúå öåø ÷ùø òí îðäì äìåç.
ëãé ìäùúîù áñéñîä äçãùä éù ìäôòéì àåúä. ëãé ìòùåú æàú ìçõ òì äìéð÷ îèä.
{U_ACTIVATE}
àí äëì éôòì áäöìçä úåëì ìäúçáø òí äñéñîä äæå:
ñéñîä: {PASSWORD}
àúä ëîåáï úåëì ìùðåú àú äñéñîä áòöîê ãøê òîåã äôøåôéì. àí éù ìê ÷ùééí àðà öåø ÷ùø òí îðäì äìåç.
{EMAIL_SIG}
--- NEW FILE ---
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
{WELCOME_MSG}
àðà ùîåø îëúá æä áøùåîåú ùìê. îéãò äçùáåï ùìê äåà:
----------------------------
ùí îùúîù: {USERNAME}
ñéñîä: {PASSWORD}
----------------------------
àðà àì úùëç àú ñéñîúê ëéååï ùäéà äåöôðä áîñã äðúåðéí ùìðå åìà ðåëì ìàçæø àåúä òáåøê. áëì î÷øä, àí úùëç àú ñéñîúê úåëì ìá÷ù ñéñîä çãùä ùúåôòì áàåúä ãøê ùçùáåï æä îåôòì.
úåãä ùðøùîú.
{EMAIL_SIG}
--- NEW FILE ---
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
{WELCOME_MSG}
àðà ùîåø îëúá æä áøùåîåú ùìê. îéãò äçùáåï ùìê äåà:
----------------------------
ùí îùúîù: {USERNAME}
ñéñîä: {PASSWORD}
----------------------------
äçùáåï ùìê ëøâò àéðå ôòéì. ìà úåëì ìäùúîù áå ìôðé ùúá÷ø á÷éùåø äáà:
{U_ACTIVATE}
àðà àì úùëç àú ñéñîúê ëéååï ùäéà äåöôðä áîñã äðúåðéí ùìðå åìà ðåëì ìàçæø àåúä òáåøê. áëì î÷øä, àí úùëç àú ñéñîúê úåëì ìá÷ù ñéñîä çãùä ùúåôòì áàåúä ãøê ùçùáåï æä îåôòì.
úåãä ùðøùîú.
{EMAIL_SIG}
|
|
From: Paul S. O. <ps...@us...> - 2002-04-19 22:38:50
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew
In directory usw-pr-cvs1:/tmp/cvs-serv5678
Added Files:
Tag: phpBB-2_0_0
index.htm lang_admin.php lang_main.php
Log Message:
Initial version by dolfin
--- NEW FILE ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
</body>
</html>
--- NEW FILE ---
<?php
/**************************************************************************
* lang_admin.php [Hebrew]
*
* begin : Sat Apr 16 2002
* copyright : Itay Cishnvesky, Gil Osher and the Chaotic Goat
* email : it...@ho...
*
* lang_admin.php [English] [original]
* -------------------
* begin : Sat Dec 16 2000
* copyright : (C) 2001 The phpBB Group
* email : su...@ph...
*
* $Id: lang_admin.php,v 1.35 2002/03/10 03:41:33 dougk_ff7 Exp $
*
****************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
/***************************************************************************
*
* This file has been edited for legal purposes by Gil Osher and Itay
* Cishnvesky. Have fun all of you Israeli surfers!!!
*
***************************************************************************/
//
// Format is same as lang_main
//
//
// Modules, this replaces the keys used
// in the modules[][] arrays in each module file
//
$lang['General'] = "ðéäåì ëììé";
$lang['Users'] = "ðéäåì îùúîùéí";
$lang['Groups'] = "ðéäåì ÷áåöåú";
$lang['Forums'] = "ðéäåì ôåøåí";
$lang['Styles'] = "ðéäåì ññâåðåú";
$lang['Configuration'] = "äâãøåú";
$lang['Permissions'] = "äøùàåú";
$lang['Manage'] = "àøâåï";
$lang['Disallow'] = "îðò ùîåú";
$lang['Prune'] = "Pruning";
$lang['Mass_Email'] = "Mass Email";
$lang['Ranks'] = "ãéøåâéí";
$lang['Smilies'] = "ñîééìéí";
$lang['Ban_Management'] = "á÷øú âéøåùéí";
$lang['Word_Censor'] = "ñéðåï îéìéí";
$lang['Export'] = "éöà";
$lang['Create_new'] = "öåø";
$lang['Add_new'] = "äåñó";
$lang['Backup_DB'] = "âáä îñã ðúåðéí";
$lang['Restore_DB'] = "ùçæø îñã ðúåðéí";
//
// Index
//
$lang['Admin'] = "ðéäåì";
$lang['Not_admin'] = "àúä ìà îåøùä ìðäì àú äìåç äæä";
$lang['Welcome_phpBB'] = "áøåê äáà ì phpBB";
$lang['Admin_intro'] = "úåãä ùáçøú phpBB ëôúøåï äôåøåí ùìê. îñê æä éöéâ
áôðéê ñ÷éøä îäéøä òì ëì äñèèéñèé÷åú ùì äôåøåí ùìê. úåëì ìçæåø ìãó æä áëì òú
òì éãé ìçéöä òì
<u>Admin Tools</u>
áöã äùîàìé. òì îðú ìçæåø ìàéðã÷ñ äøàùé, ìçõ òì ñîì ä-phpBB àùø îöåé âí äåà
áöã äùîàìé. ùàø ä÷éùåøéåú áöã äùîàìé éàôùøå ìê ìùìåè áëì úçåí ùì äôåøåí ùìê,
áëì îñê éäéå äåøàåú áðåâò ìùéîåù áëìéå.";
$lang['Main_index'] = "àéðã÷ñ äôåøåîéí";
$lang['Forum_stats'] = "ñèèéñèé÷åú äôåøåîéí";
$lang['Admin_Index'] = "àéðã÷ñ ðéäåì";
$lang['Preview_forum'] = "úöåâä î÷ãéîä ùì ôåøåí";
$lang['Click_return_admin_index'] = "ìçõ %sëàï%s ëãé ìçæåø ìàéðã÷ñ äðéäåì";
$lang['Statistic'] = "ñèèéñèé";
$lang['Value'] = "òøê";
$lang['Number_posts'] = "îñôø äåãòåú";
$lang['Posts_per_day'] = "äåãòåú ìéåí";
$lang['Number_topics'] = "îñôø ðåùàéí";
$lang['Topics_per_day'] = "ðåùàéí ìéåí";
$lang['Number_users'] = "îñôø îùúîùéí";
$lang['Users_per_day'] = "îùúîùéí ìéåí";
$lang['Board_started'] = "äìåç äúçéì";
$lang['Avatar_dir_size'] = "âåãì úé÷ééú äñéîìåðéí";
$lang['Database_size'] = "âåãì îñã äðúåðéí";
$lang['Gzip_compression'] ="ëéååõ Gzip";
$lang['Not_available'] = "ìà ÷ééí";
$lang['ON'] = "ôåòì"; // This is for GZip compression
$lang['OFF'] = "ëáåé";
//
// DB Utils
//
$lang['Database_Utilities'] = "òæøé îñã ðúåðéí";
$lang['Restore'] = "ùçæø";
$lang['Backup'] = "âáä";
$lang['Restore_explain'] = "æä éáöò ùçæåø îìà ùì ëì èáìàåú ä-phpBB î÷åáõ
ùîåø. àí äùøú ùìê úåîê áëê, úåëì ìäòìåú ÷áöé è÷ñè î÷åáöéí áôåøîè GZIP åäåà
éôúç áöåøä àåèåîèéú.
<b>àæäøä</b> ôòåìä æå úëúåá òì ëì îéãò ÷ééí. ôòåìú äùçæåø òìåìä ì÷çú æîï øá
ìöåøê òéáåã ðúåðéí - àðà àì úòáåø îòîåã æä òã ìñéåí äúäìéê.";
$lang['Backup_explain'] = "ôòåìä æå éåöøú âéáåé ìëì ñåâé äîéãò ùì phpBB. àí
éù ìê èáìàåú ùéöøú áàåúå îàâø ðúåðéí ùì phpBB åäééú îòåðééï ìâáåú âí àåúï,
àðà äëðñ àú ùîåúéäï ëàùø äï îåôøãåú áñéîï äôñé÷ áî÷åîåú ìîèä. áîéãä åäùøú
ùìê îàôùø æàú úåëì ì÷áõ áôåøîè Gzip àú ä÷åáõ áëãé ìä÷èéï àú âåãìå ìôðé
ääåøãä.";
$lang['Backup_options'] = "àôùøåéåú âéáåé";
$lang['Start_backup'] = "äúçì âéáåé";
$lang['Full_backup'] = "âéáåé îìà";
$lang['Structure_backup'] = "âáä îáðä áìáã";
$lang['Data_backup'] = "âáä ðúåðéí áìáã";
$lang['Additional_tables'] = "èáìàåú ðåñôåú";
$lang['Gzip_compress'] = "÷åáõ îëååõ á Gzip";
$lang['Select_file'] = "áçø ÷åáõ";
$lang['Start_Restore'] = "äúçì ùçæåø";
$lang['Restore_success'] = "îñã äðúåðéí ùåçæø áäöìçä.<br /><br />äìåç ùìê
àîåø
ìäéåú áîöá ùäéä áå äúáöò äâéáåé.";
$lang['Backup_download'] = "ääåøãä ùìê úçì á÷øåá, àðà äîúï òã ùäéà îúçéìä";
$lang['Backups_not_supported'] = "îöèòø, àê âéáåé îñã äðúåðéí ìà ðúîê ëøâò
áîòøëú îñã äðúåðéí ùìê";
$lang['Restore_Error_uploading'] = "ùâéàä áèòéðú ÷åáõ äâéáåé";
$lang['Restore_Error_filename'] = "áòééú ùí ÷åáõ, àðà ðñä ÷åáõ àçø";
$lang['Restore_Error_decompress'] = "ìà éëåì ìëååõ ÷åáõ gzip, àðà èòï ÷åáõ
è÷ñè
ôùåè";
$lang['Restore_Error_no_file'] = "àó ÷åáõ ìà ðèòï";
//
// Auth pages
//
$lang['Select_a_User'] = "áçø îùúîù";
$lang['Select_a_Group'] = "áçø ÷áåöä";
$lang['Select_a_Forum'] = "áçø ôåøåí";
$lang['Auth_Control_User'] = "á÷øú äøùàåú îùúîù";
$lang['Auth_Control_Group'] = "á÷øú äøùàåú ÷áåöä";
$lang['Auth_Control_Forum'] = "á÷øú äøùàåú ôåøåí";
$lang['Look_up_User'] = "áãå÷ îùúîù";
$lang['Look_up_Group'] = "áãå÷ ÷áåöä";
$lang['Look_up_Forum'] = "áãå÷ ôåøåí";
$lang['Group_auth_explain'] = "ëàï úåëì ìùðåú àú ääøùàåú åîöá àçøàé òáåø ëì
÷áåöú îùúîùéí. àì úùëç ùâí òí ùéðåé äâãøåú ÷áåöä - äâãøåú îùúîù ôøèéåú
òìåìåú òãééï ìàôùø ìîùúîù ìäëðñ ìôåøåîéí, åëå'. áîéãä åæä äîöá, ú÷áì àæäøä
òì ëê.";
$lang['User_auth_explain'] = "ëàï úåëì ìùðåú àú ääøùàåú åñèèåñ äàçøàé òáåø
ëì îùúîù ôøèé. æëåø ëé ùéðåé äøùàåú îùúîù ìà éîðòå ñåôéú îîùúîù ìäëðñ ìôåøåí
àí äåà áöåé á÷áåöä áòìú äøùàú ëðéñä. ú÷áì àæäøä áîéãä åãáø ëæä éúøçù.";
$lang['Forum_auth_explain'] = "ëàï úåëì ìùðåú àú ãøâåú ääøùàä ùì ëì ôåøåí.
ìøùåúê úäìéê ôùåè åúäìéê îú÷ãí ìëê, ëàùø äúäìéê äîú÷ãí îöéò ùìéèä ðøçáú éåúø
áôòåìú äôåøåí. æëåø ëé ùéðåé ãøâú ääøùàä úùôéò òì àéìå îùúîùéí éëåìéí ìáöò
ôòåìåú ùåðåú áîñâøúï";
$lang['Simple_mode'] = "îöá ôùåè";
$lang['Advanced_mode'] = "îöá îú÷ãí";
$lang['Moderator_status'] = "îöá àçøàé";
$lang['Allowed_Access'] = "âéùä îåøùéú";
$lang['Disallowed_Access'] = "âéùä àñåøä";
$lang['Is_Moderator'] = "äåà àçøàé";
$lang['Not_Moderator'] = "ìà àçøàé";
$lang['Conflict_warning'] = "àæäøú äúðâùåú äøùàåú";
$lang['Conflict_access_userauth'] = "ìîùúîù æä òãééï éù äøùàú ëðéñä ìôåøåí
æä áàîöòåú àéùåø ÷áåöú îùúîùéí. éúëï ëé úøöä ìùðåú àú äøùàåú ä÷áåöä àå ìäñéø
àú äîùúîù îä÷áåöä áëãé ìîðåò áàåôï îìà àú äøùàú äëðéñä ùìå. ä÷áåöåú äîúéøåú
àú äæëåéåú îöåééðåú áäîùê";
$lang['Conflict_mod_userauth'] = " îùúîù æä äéðå òãééï àçøàé ìôåøåí îëéååï
ùäåà îöåé á÷áåöú îùúîùéí îñåééîú. éúëï ëé úøöä ìùðåú àú äøùàåú ä÷áåöä àå
ìäñéø àú äîùúîù î÷áåöä æå áãé ìîðåò îîðå ìæëåú áîòîã ùì àçøàé òì äôåøåí.
ä÷áåöåú äîúéøåú àú äæëåéåú îöåééðåú áäîùê";
$lang['Conflict_access_groupauth'] = "ìîùúîù (àå îùúîùéí) æä éù òãééï äøùàú
ëðéñä ìôåøåí æä áàîöòåú äâãøåú ääøùàä äôøèéåú ùìäí. éúëï åúøöä ìùðåú äâãøåú
àéìå áëãé ìîðåò áàåôï îìà àú äøùàú äëðéñä ùìäí. ääøùàåú ùì îùúîù æä îôåøèåú
áäîùê.";
$lang['Conflict_mod_groupauth'] = "ìîùúîù (àå îùúîùéí) æä éù òãééï æëåéåú
àçøàé ìôåøåí æä áàîöòåú äâãøåú ääøùàä äôøèéåú. éúëï åúøöä ìùðåú äâãøåú àéìå
áëãé ìîçå÷ áàåôï îìà àú ñèèåñ äàçøàé ùìå. ääøùàåú ùì îùúîù æä îôåøèåú
áäîùê.";
$lang['Public'] = "öéáåøé";
$lang['Private'] = "ôøèé";
$lang['Registered'] = "øùåí";
$lang['Administrators'] = "îðäìéí";
$lang['Hidden'] = "çáåé";
// These are displayed in the drop down boxes for advanced
// mode forum auth, try and keep them short!
$lang['Forum_ALL'] = "äëì";
$lang['Forum_REG'] = "øùåîéí";
$lang['Forum_PRIVATE'] = "ôøèé";
$lang['Forum_MOD'] = "àçøàé";
$lang['Forum_ADMIN'] = "àãîéï";
$lang['View'] = "öôä";
$lang['Read'] = "÷øà";
$lang['Post'] = "ôøñí";
$lang['Reply'] = "äâá";
$lang['Edit'] = "òøåê";
$lang['Delete'] = "îç÷";
$lang['Sticky'] = "ãáé÷";
$lang['Announce'] = "äåãò";
$lang['Vote'] = "äöáò";
$lang['Pollcreate'] = "öåø ñ÷ø";
$lang['Permissions'] = "äøùàåú";
$lang['Simple_Permission'] = "äøùàä ôùåèä";
$lang['User_Level'] = "øîú îùúîù";
$lang['Auth_User'] = "îùúîù";
$lang['Auth_Admin'] = "îðäì";
$lang['Group_memberships'] = "çáøåú á÷áåöú îùúîùéí";
$lang['Usergroup_members'] = "á÷áåöä æå ðîöàéí äçáøéí äáàéí";
$lang['Forum_auth_updated'] = "äøùàåú ôåøåí òåãëðå";
$lang['User_auth_updated'] = "äøùàåú îùúîù òåãëðå";
$lang['Group_auth_updated'] = "äøùàåú ÷áåöä òåãëðå";
$lang['Auth_updated'] = "ääøùàåú òåãëðå";
$lang['Click_return_userauth'] = "ìçõ %sëàï%s ëãé ìçæåø ìäøùàåú îùúîù";
$lang['Click_return_groupauth'] = "ìçõ %sëàï%s ëãé ìçæåø ìäøùàåú ÷áåöä";
$lang['Click_return_forumauth'] = "ìçõ %sëàï%s ëãé ìçæåø ìäøùàåú ôåøåí";
//
// Banning
//
$lang['Ban_control'] = "á÷øú âéøåù";
$lang['Ban_explain'] = "ëàï úåëì ìùìåè áâéøåù îùúîùéí. úåëì ìâøù îùúîù òì
éãé âéøåù ùí äîùúîù ùìå, àå èååç ùì ëúåáú IP. ùéèåú àéìå îåðòåú îîùúîù ìäâéò
àôéìå ìãó äàéðã÷ñ ùì äôåøåí ùìê. áëãé ìîðåò îîùúîù ìäéøùí îçãù úçú ùí îùúîù
ùåðä, úåëì ìçñåí âí ëúåáú ãåà\"ì. ùéí ìá - çñéîú ãåà\"ì áìáã ìà úîðò îîùîúù
ëìùäå ìäúçáø åìôøñí äåãòåú áôåøåí, òìéê úçéìä ìäùúîù áàçú îùúé äùéèåú
ùöåééðå ìòéì òì îðú ìâøù.";
$lang['Ban_explain_warn'] = "àðà ùéí ìá ëé äëðñú èååç IP ìâéøåù ìëê ëé ëì
äëúåáåú îäëúåáú äøàùåðä ìàçøåðä éâåøùå îï äôåøåí. îîåìõ ìöîöí ëëì äðéúï àú
äèååç áëãé ìîðåò çñéîä ùì îùúîùéí øöåééí.";
$lang['Select_username'] = "áçø ùí îùúîù";
$lang['Select_ip'] = "áçø ëúåáú IP";
$lang['Select_email'] = "áçø ëúåáú ãåà\"ì";
$lang['Ban_username'] = "âøù îùúîù îñåééí àçã àå éåúø";
$lang['Ban_username_explain'] = "áéëåìúê ìâøù îñôø øá ùì îùúîùéí áôòí àçú òì
éãé äùéìåá äðëåï ùì äòëáø åäî÷ìãú òáåø äîçùá åäãôãôï ùìê.";
$lang['Ban_IP'] = "âøù ëúåáú IP àå hostname àçã àå éåúø";
$lang['IP_hostname'] = "ëúåáåú IP àå hostnames";
$lang['Ban_IP_explain'] = "ìöåøê âéøåù ëúåáåú IP å-Hostnames øáéí, äôøã àåúí
òì éãé ñéîï äôñé÷. ìöåøê ñéîåï èååç ùì ëúåáåú IP, äôøã áéï äøàùåï ìàçøåï
áàîöòåú äñéîï î÷ó (-). ìöåøê äùéîåù á-wildcard äòæø á-*";
$lang['Ban_email'] = "âøù ëúåáú ãåà\"ì àçú àå éåúø";
$lang['Ban_email_explain'] = "òì îðú ìçñåí éåúø îëúåáú ãåà\"ì àçú, äôøã áéï
äëúåáú òí ñéîï äôñé÷. úåëì ìäòæø á-wildcard ëî÷ù *";
$lang['Unban_username'] = "äçæø îùúîù îñåééí àçã àå éåúø";
$lang['Unban_username_explain'] = "áéëåìúê ìäçæéø ëîä îùúîùéí áå æîðéú òì
éãé ùéîåù ðëåï áöéøåó òëáø åî÷ìãú òáåø äîçùá åäãôãôï ùìê";
$lang['Unban_IP'] = "äçæø ëúåáú IP àçú àå éåúø";
$lang['Unban_IP_explain'] = "áéëåìúê ìäçæéø îñôø ëúåáåú IP áå æîðéú òì éãé
ùéîåù ðëåï áöéøåó òëáø åî÷ìãú òáåø äîçùá åäãôãôï ùìê";
$lang['Unban_email'] = "äçæø ëúåáú ãåà\"ì àçú àå éåúø";
$lang['Unban_email_explain'] = "áéëåìúê ìäçæéø îñôø ëúåáåú ãåà\"ì áå æîðéú
òì éãé ùéîåù ðëåï áöéøåó òëáø åî÷ìãú òáåø äîçùá åäãôãôï ùìê";
$lang['No_banned_users'] = "àéï ùîåú îùúîùéí îâåøùéí";
$lang['No_banned_ip'] = "àéï ëúåáåú IP îâåøùåú";
$lang['No_banned_email'] = "àéï ëúåáåú ãåà\"ì îâåøùåú";
$lang['Ban_update_sucessful'] = "øùéîú äîâåøùéí òåãëðä áäöìçä";
$lang['Click_return_banadmin'] = "ìçõ %sëàï%s ëãé ìçæåø ìá÷øú äâéøåù";
//
// Configuration
//
$lang['General_Config'] = "äâãøåú ëììéåú";
$lang['Config_explain'] = "äèåôñ äáà îàôùø ìê ìäúàéí àéùéú àú äâãøåú äìåç
äëììéåú. ìäâãøåú îùúîù åôåøåí äùúîù á÷éùåøéí áöã ùîàì.";
$lang['Click_return_config'] = "ìçõ %sëàï%s ëãé ìçæåø ìäâãøåú äëììéåú";
$lang['General_settings'] = "äâãøåú ìåç áììéåú";
$lang['Server_name'] = "ùí äãåîééï";
$lang['Server_name_explain'] = "äãåîééï îîðå ôåòì äôåøåí äæä";
$lang['Script_path'] = "ëúåáú äñ÷øéôè";
$lang['Script_path_explain'] = "äñôøéä àùø áà îîå÷í äñ÷øéôè éçñéú ìãåîééï";
$lang['Server_port'] = "ôåøè ùøú";
$lang['Server_port_explain'] = "îñôø äôåøè (port) ùäùøú ùìê øõ òìéå. áãøê
ëìì äòøê äåà 80";
$lang['Site_name'] = "ùí äàúø";
$lang['Site_desc'] = "úàåø äàúø";
$lang['Board_disable'] = "ëáä ìåç";
$lang['Board_disable_explain'] = "æä éäôåê àú äìåç ììà æîéï ìîùúîùéí. àì
úúðú÷
ëùäìåç ëáåé,ìà úåëì ìäúçáø çæøä!";
$lang['Acct_activation'] = "àôùø àéùåø çùáåï";
$lang['Acc_None'] = "ììà"; // These three entries are the type of activation
$lang['Acc_User'] = "îùúîù";
$lang['Acc_Admin'] = "îðäì";
$lang['Abilities_settings'] = "äâãøåú îùúîù åôåøåí áñéñééí";
$lang['Max_poll_options'] = "îñôø àôùøåéåú áñ÷ø";
$lang['Flood_Interval'] = "îåðò äöôåú";
$lang['Flood_Interval_explain'] = "îñôø äùðéåú ùîùúîù çééá ìäîúéï áéï ôøñåí
äåãòåú";
$lang['Board_email_form'] = "ùìéçú ãåà\"ì ãøê äìåç";
$lang['Board_email_form_explain'] = "îùúîùéí ùåìçéí ãåà\"ì àçã ìùðé ãøê
äìåç";
$lang['Topics_per_page'] = "ðåùàéí ìòîåã";
$lang['Posts_per_page'] = "äåãòåú ìòîåã";
$lang['Hot_threshold'] = "äåãòåú òáåø ðåùàéí ôåôåìàøéí";
$lang['Default_style'] = "ñâðåï áøéøú-îçãì";
$lang['Override_style'] = "ãøåñ ñâðåï îùúîù";
$lang['Override_style_explain'] = "îçìéó àú ñâðåðåú äîùúîù òí áøéøú-äîçãì";
$lang['Default_language'] = "ùôú áøéøú-îçãì";
$lang['Date_format'] = "úáðéú úàøéê";
$lang['System_timezone'] = "àæåø æîï äîòøëú";
$lang['Enable_gzip'] = "àôùø ëéååõ GZip";
$lang['Enable_prune'] = "àùø ñøé÷ú äåãòåú áôåøåí";
$lang['Allow_HTML'] = "äøùä HTML";
$lang['Allow_BBCode'] = "äøùä BBCode";
$lang['Allowed_tags'] = "äøùä úâé HTML";
$lang['Allowed_tags_explain'] = "äôøã áéï äúâéí áàîöòåú ñéîï äôñé÷";
$lang['Allow_smilies'] = "äøùä ñîééìéí";
$lang['Smilies_path'] = "ðúéá àçñåï ñîééìéí";
$lang['Smilies_path_explain'] = "ðúéá úçú ñôøééú äùåøù ùì phpBB, ìãåâîä
images/smilies";
$lang['Allow_sig'] = "äøùä çúéîåú";
$lang['Max_sig_length'] = "àåøê çúéîä î÷ñéîìé";
$lang['Max_sig_length_explain'] = "îñôø î÷ñéîåí ùì úåéí áçúéîä";
$lang['Allow_name_change'] = "äøùä ùéðåéé ùîåú îùúîù";
$lang['Avatar_settings'] = "äâãøåú ñéîìåðéí";
$lang['Allow_local'] = "àôùø âìøééú ñéîìåðéí";
$lang['Allow_remote'] = "àôùø ñéîìåðéí îøåç÷éí";
$lang['Allow_remote_explain'] = "ñéîìåðéí î÷åùøéí îàúøéí àçøéí";
$lang['Allow_upload'] = "àôùø èòéðú ñéîìåðéí";
$lang['Max_filesize'] = "âåãì î÷ñéîìé ì÷åáõ ñéîìåï";
$lang['Max_filesize_explain'] = "ìèòéðú ÷åáöé ñéîìåï";
$lang['Max_avatar_size'] = "îéîãé ñéîìåï î÷ñéîìééí";
$lang['Max_avatar_size_explain'] = "(âåáä x øåçá áôé÷ñìéí)";
$lang['Avatar_storage_path'] = "ðúéá àçñåï ñéîìåðéí";
$lang['Avatar_storage_path_explain'] = "ðúéá úçú ñôøééú äùåøù ùì phpBB,
ìãåâîä
images/avatars";
$lang['Avatar_gallery_path'] = "ðúéá âìøééú ñéîìåðéí";
$lang['Avatar_gallery_path_explain'] = "ðúéá úçú ñôøééú äùåøù ùì phpBB
ìúîåðåú
÷ééîåú, ìãåâîä images/avatars/gallery";
$lang['COPPA_settings'] = "äâãøåú COPPA";
$lang['COPPA_fax'] = "îñôø ô÷ñ ùì COPPA";
$lang['COPPA_mail'] = "ëúåáú ãåàø ùì COPPA";
$lang['COPPA_mail_explain'] = "æåäé ëúåáú äãåàø ùàìéä éùìçå ääåøéí àú èôñé
äøéùåí ùì COPPA";
$lang['Email_settings'] = "äâãøåú ãåà\"ì";
$lang['Admin_email'] = "ëúåáú ãåà\"ì ùì äîðäì";
$lang['Email_sig'] = "çúéîú ãåà\"ì";
$lang['Email_sig_explain'] = "è÷ñè æä éöåøó ìëì äîëúáéí ùéùìçå îäìåç";
$lang['Use_SMTP'] = "äùúîù áùøú SMTP òáåø ãåà\"ì";
$lang['Use_SMTP_explain'] = "àîåø ëï àí áøöåðê ìùìåç ãåà\"ì ãøê ùøú øùåí
áî÷åí
ìäùúîù áôåð÷öééú äãåà\"ì äî÷åîéú";
$lang['SMTP_server'] = "ëúåáú ùøú SMTP";
$lang['SMTP_username'] = "ùí îùúîù SMTP";
$lang['SMTP_username_explain'] = "äëðñ ùí îùúîù ø÷ àí ùøú ä-SMTP ùìê ãåøù
æàú";
$lang['SMTP_password'] = "ñéñîú SMTP";
$lang['SMTP_password_explain'] = "äëðñ ñéñîà ø÷ àí ùøú ä-SMTP ùìê ãåøù æàú";
$lang['Disable_privmsg'] = "äåãòåú ôøèéåú";
$lang['Inbox_limits'] = "îñôø äåãòåú î÷ñéîìé áúéáú äãåàø äðëðñ";
$lang['Sentbox_limits'] = "îñôø äåãòåú î÷ñéîìé áúéáú äãåàø äéåöà";
$lang['Savebox_limits'] = "îñôø äåãòåú î÷ñéîìé áúéáú äãåàø äùîåø";
$lang['Cookie_settings'] = "äâãøåú \"òåâééä\"";
$lang['Cookie_settings_explain'] = "äâãøåú àéìå ùåìèåú áöåøä ùáä îåâãøú
ä\"òåâééä\" òì éãé äãôãôðéí. áøåá äî÷øéí áøéøú äîçãì úäéä îñôé÷ä. àí àúä
îúëååï ìùðåú ëàï ãáø, òùä æàú áæäéøåú, äâãøåú îåèòåú òìåìåú ìîðåò îîùúîùéí
ìäúçáø ìôåøåí";
$lang['Cookie_name'] = "ùí äòåâééä";
$lang['Cookie_domain'] = "ãåîééï äòåâééä";
$lang['Cookie_path'] = "ðúéá äòåâééä";
$lang['Session_length'] = "àåøê Session [ ùðéåú ]";
$lang['Cookie_secure'] = "àáèçú òåâéä [ https ]";
$lang['Cookie_secure_explain'] = "àí äùøú ùìê ôåòì ãøê SSL ñîï àåôöééä æå
àçøú àùø àåúä îáåèìú";
$lang['Session_length'] = "àåøê äøéöä [áùðéåú]";
//
// Forum Management
//
$lang['Forum_admin'] = "ðéäåì ôåøåí";
$lang['Forum_admin_explain'] = "îçìåï æä úåëì ìäåñéó, ìîçå÷, ìòøåê ìùðåú ñãø
åìñðëøï îçãù ÷èâåøéåú åôåøåîéí";
$lang['Edit_forum'] = "òøåê ôåøåí";
$lang['Create_forum'] = "öåø ôåøåí çãù";
$lang['Create_category'] = "öåø ÷èâåøéä çãùä";
$lang['Remove'] = "äñø";
$lang['Action'] = "Action";
$lang['Update_order'] = "òãëï ñãø";
$lang['Config_updated'] = "äâãøåú äôåøåí òåãëðå áäöìçä!";
$lang['Edit'] = "òøåê";
$lang['Delete'] = "îç÷";
$lang['Move_up'] = "äææ îòìä";
$lang['Move_down'] = "äææ îèä";
$lang['Resync'] = "Resync";
$lang['No_mode'] = "ùåí îöá ìà ðáçø";
$lang['Forum_edit_delete_explain'] = "èåôñ æä éàôùø ìê ìùðåú åìàôééï àú ëì
àôùøåéåú äôåøåí äëììé. òì îðú ìòøåê äâãøåú îùúîù åôåøåí ñôöéôééí, äòæø
á÷éùåøéåú äîúàéîåú.";
$lang['Move_contents'] = "äòáø àú ëì äúåëï";
$lang['Forum_delete'] = "îç÷ ôåøåí";
$lang['Forum_delete_explain'] = "èåôñ æä éàôùø ìê ìîçå÷ ôåøåí (àå ÷èâåøéä)
åìäçìéè ìàï ìäòáéø àú ëì ääåãòåú (àå äôåøåîéí) ùäåà äëéì.";
$lang['Forum_settings'] = "äâãøåú ôåøåí ëììéåú";
$lang['Forum_name'] = "ùí äôåøåí";
$lang['Forum_desc'] = "úéàåø";
$lang['Forum_status'] = "îöá äôåøåí";
$lang['Forum_pruning'] = "ñøé÷ú äåãòåú àåèåîèéú";
$lang['prune_freq'] = 'áãå÷ àú âéì ääåãòä ëì';
$lang['prune_days'] = "äñø ãéåðéí ùìà ðåñôå ìäí äåãòåú úåê";
$lang['Set_prune_data'] = "äôòìú àú ñøé÷ú ääåãòåú äàåèåîèéú åîçé÷úï ìôåøåí
æä, àê ìà äâãøú úãéøåú àå îñôø éîéí ìáéöåò äñøé÷ä. àðà çæåø åáöò æàú";
$lang['Move_and_Delete'] = "äòáø åîçå÷";
$lang['Delete_all_posts'] = "îç÷ àú ëì ääåãòåú";
$lang['Nowhere_to_move'] = "àéï ìàï ìäòáéø";
$lang['Edit_Category'] = "òøåê ÷èâåøéä";
$lang['Edit_Category_explain'] = "äòæø áèåôñ æä áëãé ìùðåú àú ùí ä÷èâåøéä";
$lang['Forums_updated'] = "äîéãò ùì äôåøåí å/àå ä÷èâåøéä òåãëðå áäöìçä";
$lang['Must_delete_forums'] = "òìéê ìîçå÷ àú ëì äôåøåîéí ìôðé ùúñéø ÷èâåøéä
æå";
$lang['Click_return_forumadmin'] = "ìçõ %sëàï%s òì îðú ìçæåø ììåç ðéäåì";
//
// Smiley Management
//
$lang['smiley_title'] = "ëìé òøéëú äñîééìéí";
$lang['smile_desc'] = "îëàï úåëì ìäåñéó, ìîçå÷ åìòøåê àú äñîééìéí àåúí éåëìå
îùúîùé äôåøåí ìäåñéó ìäåãòåúéäí";
$lang['smiley_config'] = "äâãøåú ñîééìéí";
$lang['smiley_code'] = "î÷ùé äñîééìé";
$lang['smiley_url'] = "÷åáõ äñîééìé";
$lang['smiley_emot'] = "ôéøåù äñîééìé";
$lang['smile_add'] = "äåñó ñîééìé çãù";
$lang['Smile'] = "ñîééìé";
$lang['Emotion'] = "øâù (ôéøåù äñîééìé)";
$lang['Select_pak'] = "áçø á÷åáõ îñåâ .pak";
$lang['replace_existing'] = "äçìó ñîééìé ÷ééí";
$lang['keep_existing'] = "ùîåø òì ñîééìé ÷ééí";
$lang['smiley_import_inst'] = "òìéê ìôúåç àú ÷åáõ äñîééìé äî÷ååõ åìäòìåú àú
ëì ä÷áöéí ìñôøééú ñîééìéí äîúàéîä òáø ääú÷ðä ùìê. ìàçø îëï áçø àú äîéãò
äðëåï ìöåøê éáåà çáéìú äñîééìé";
$lang['smiley_import'] = "ééáà ñîééìé";
$lang['choose_smile_pak'] = "áçø á÷åáõ ñîééìé îñåâ .pak";
$lang['import'] = "éáà ñîééìéí";
$lang['smile_conflicts'] = "îä öøéê ìäòùåú áî÷øä ùì ÷åùé";
$lang['del_existing_smileys'] = "îç÷ ñîééìéí ÷ééîéí ìôðé äééáåà";
$lang['import_smile_pack'] = "ééáà çáéìú ñîééìéí";
$lang['export_smile_pack'] = "öåø çáéìú ñîééìéí";
$lang['export_smiles'] = "ìöåøê éöéøú çáéìú ñîééìéí îáéï îáçø äñîééìéí àùø
ëáø îåú÷ï å÷ééí áøùåúê, ìçõ %sëàï%s ëãé ìäåøéã øú ÷åáõ ä smiles.pak. ùðä àú
ùîå ùì ÷åáõ æä áäúàí, àê ãàâ ìäùàéø àú ñéåîú ä÷åáú .pak. ìàçø îëï öåø ÷åáõ
zip äîëéì àú ëì úîåðåú äñîééìéí áðåñó ì÷åáõ ääâãøåú .pak äæä.";
$lang['smiley_add_success'] = "äñîééìé ðåñó áäöìçä";
$lang['smiley_edit_success'] = "äñîééìé òåãëï áäöìçä";
$lang['smiley_import_success'] = "äñîééìé éåáà áäöìçä!";
$lang['smiley_del_success'] = "äñîééìé äåñø áäöìçä";
$lang['Click_return_smileadmin'] = "ìçõ %sëàï%s áëãé ìùåá ìëìé ðéäåì
äñîééìéí";
//
// User Management
//
$lang['User_admin'] = "ðéäåì îùúîùéí";
$lang['User_admin_explain'] = "ëàï úåëì ìùðåú àú îéãò äîùúîù åîñôø àôùøåéåú
ñôéöéôéåú. òì îðú ìùðåú äøùàåú îùúîù àðà äòæø áîòøëú äøùàåú ÷áåöä åîùúîù";
$lang['Look_up_user'] = "çôù îùúîù";
$lang['Admin_user_fail'] = "ðëùì òãëåï ôøåôéì îùúîù";
$lang['Admin_user_updated'] = "ôøåôéì îùúîù òåãëï áäöìçä.";
$lang['Click_return_useradmin'] = "ìçõ %sëàï%s áëãé ìçæåø ìðéäåì îùúîùéí.";
$lang['User_delete'] = "îç÷ îùúîù æä";
$lang['User_delete_explain'] = "ìçõ ëàï áëãé ìîçå÷ àú äîùúîù, úäìéê æä äéðå
áìúé äôéê!";
$lang['User_deleted'] = "äîùúîù ðîç÷ áäöìçä.";
$lang['User_status'] = "äîùúîù ôòéì";
$lang['User_allowpm'] = "éëåì ìùìåç äåãòåú ôøèéåú";
$lang['User_allowavatar'] = "éëåì ìäöéâ ñîìåï";
$lang['Admin_avatar_explain'] = "ëàï áéëåìúê ìøàåú åìîçå÷ àú äñîìåï ùì îùúîù
îñåééí.";
$lang['User_special'] = "àæåøéí îéåçãéí ìîðäìéí áìáã";
$lang['User_special_explain'] = "îùúîùéí àéðí éëåìéí ìòøåê ùãåú àéìå. ëàï
úåëì ì÷áåò ìäí ñèèåñ åàôùøåéåú àçøåú àùø ìà ðéúðåú ìîùúîùéí";
//
// Group Management
//
$lang['Group_administration'] = "ðéäåì ÷áåöåú";
$lang['Group_admin_explain'] = "îëàï úåëì ìðäì àú ëì ä÷áåöåú, áéëåìúê ìîçå÷,
ìéöåø åìòøåê ÷áåöåú ÷ééîåú. àúä éëåì ìáçåø áàçøàéí, ìùðåú àú äøùàåú ä÷áåöä
åìùðåú àú ùí ä÷áåöä åúéàåøä";
$lang['Error_updating_groups'] = "àéøòä ùâéàä áòú òãëåï äâãøåú ä÷áåöåú";
$lang['Updated_group'] = "ä÷áåöä òåãëðä áäöìçä";
$lang['Added_new_group'] = "÷áåöä çãùä ðåöøä áäöìçä";
$lang['Deleted_group'] = "ä÷áåöä ðîç÷ä áäöìçä";
$lang['New_group'] = "öåø ÷áåöä çãùä";
$lang['Edit_group'] = "òøåê ÷áåöä";
$lang['group_name'] = "ùí ä÷áåöä";
$lang['group_description'] = "úéàåø ä÷áåöä";
$lang['group_moderator'] = "àçøàé ÷áåöä";
$lang['group_status'] = "ñèèåñ ÷áåöä";
$lang['group_open'] = "ôúç ÷áåöä";
$lang['group_closed'] = "ñâåø ÷áåöä";
$lang['group_hidden'] = "÷áåöä ðñúøú";
$lang['group_delete'] = "îç÷ ÷áåöä";
$lang['group_delete_check'] = "îç÷ ÷áåöä æå";
$lang['submit_group_changes'] = "òãëï ùéðåééí";
$lang['reset_group_changes'] = "îç÷ ùéðåééí";
$lang['No_group_name'] = "àúä çééá ìöééï ùí òáåø ÷áåöä æå";
$lang['No_group_moderator'] = "àúä çééá ìöééï àçøàé ì÷áåöä æå";
$lang['No_group_mode'] = "àúä çééá ìöééï îöá ì÷áåöä æå, ÷áåöä ôúåçä àå ÷áåöä
ñâåøä";
$lang['delete_group_moderator'] = "äàí ìîçå÷ àú àçøàé ä÷áåöä äéùï?";
$lang['delete_moderator_explain'] = "àí àúä îùðä àú àçøàé ä÷áåöä, ñîï àú
äøéáåò äæä òì îðú ìîçå÷ àú äàçøàé äéùï. àçøú, àì úñîï øéáåò æä, åäîùúîù
éäôåê ìçáø øâéì á÷áåöä.";
$lang['Click_return_groupsadmin'] = "ìçõ %sëàï%s ëãé ìçæåø ìðéäåì ÷áåöåú";
$lang['Select_group'] = "áçø ÷áåöä";
$lang['Look_up_group'] = "çôù ÷áåöä";
//
// Prune Administration
//
$lang['Forum_Prune'] = "àåèåîçé÷ú ôåøåí";
$lang['Forum_Prune_explain'] = "àôùøåú æàú úîçå÷ ëì ðåùà àùø ìà ðëúáå áå
äåãòåú áîùê ú÷åôú æîï îñåééîú àåúä ú÷áò îøàù. áàí ìà úëðéñ òøê îñôøé, ëì
äðåùàéí éîç÷å. àåèåîçé÷ä ìà éîç÷ ðåùàéí áäí îòøëú äñ÷øéí òãééï ôòéìä, åëîå
ëï ìà úîçå÷ äåãòåú îòøëú. úàìõ ìäñéø ðåùàéí àéìå áöåøä éãðéú.";
$lang['Do_Prune'] = "áöò àåèåîçé÷ä";
$lang['All_Forums'] = "ëì äôåøåîéí";
$lang['Prune_topics_not_posted'] = "àåèåîçé÷ú ðåùàéí àùø ìà ðëúáå áäí äåãòåú
áîùê òøê æä ùì éîéí";
$lang['Topics_pruned'] = "àåèåîçé÷ú ðåùàéí";
$lang['Posts_pruned'] = "àåèåîçé÷ú äåãòåú";
$lang['Prune_success'] = "àåèåîçé÷ú ôåøåîéí äúáöòä áäöìçä.";
//
// Word censor
//
$lang['Words_title'] = "öðæåø îéìéí";
$lang['Words_explain'] = "îëàï áàôùøåúê ìäåñéó, ìòøåê åìîçå÷ îéìéí àùø
éöåðæøå áàåôï àåèåîèé áôåøåîéí ùìê. áðåñó, îùúîùéí ìà éåøùå ìäøùí òí ùîåú
îùúîù àùø îëéìåú áúåëí àú äîéìéí äììå. ÷éöåøéí î÷åáìéí ëàï, ëâåï * å ?.";
$lang['Word'] = "îéìä";
$lang['Edit_word_censor'] = "òøåê îñðï îéìéí";
$lang['Replacement'] = "äçìó";
$lang['Add_new_word'] = "äåñó îéìä çãùä";
$lang['Update_word'] = "òãëï îñðï îéìéí";
$lang['Must_enter_word'] = "àúä çééá ìäëðéñ îéìä àú äîéìä äîçìéôä àåúä";
$lang['No_word_selected'] = "ìà ðáçøä àó îéìä ìòøéëä";
$lang['Word_updated'] = "îñðï äîéìéí äðáçø òåãëï áäöìçä";
$lang['Word_added'] = "îñðï îéìéí çãù äúååñó áäöìçä";
$lang['Word_removed'] = "îñðï äîéìéí äðáçø äåñø áäöìçä";
$lang['Click_return_wordadmin'] = "ìçõ %sëàï%s áëãé ìçæåø ìðéäåì öðæåø
äîéìéí";
//
// Mass Email
//
$lang['Mass_email_explain'] = "îëàï úåëì ìùìåç ãåàì ìëì çáøé äôåøåí ùìê àå
ìëì çáøé ÷áåöä îñåééîú. òì îðú ìòùåú æàú, ãåàì éùìç ìëúåáú äãåàø äðéäåìéú
ùñåô÷ä, òí äòú÷éí ìëì äðîòðéí. àí àúä ùåìç äåãòä ìîñôø øá ùì àðùéí, àðà äéä
ñáìðé åàì úòöåø àú äãó áàîöò äôòåìä. ùìéçú äåãòä ìîñôø øá ùì àðùéí ìå÷çú æîï
øá, åàúä ú÷áì äåãòä áøâò ùäúäìéê éåùí.";
$lang['Compose'] = "ùìç";
$lang['Recipients'] = "äðîòðéí";
$lang['All_users'] = "ëì äîùúîùéí";
$lang['Email_successfull'] = "äåãòúê ðùìçä.";
$lang['Click_return_massemail'] = "ìçõ %sëàï%s áëãé ìçæåø ììåç ùìéçú ãåàì";
//
// Ranks admin
//
$lang['Ranks_title'] = "ðéäåì ãéøåâéí";
$lang['Ranks_explain'] = "áàîöòåú èåôñ æä úåëìå ìäåñéó, ìòøåê, ìöôåú åàó
ìîçå÷ ãéøåâéí. ëîå ëï úåëìå ìéöåø ãéøåâéí îéåçãéí àùø éúååñôå ìîùúîùéí
ñôöéôéí áàîöòåú ìåç äðéäåì";
$lang['Add_new_rank'] = "äåñó ãéøåâ çãù";
$lang['Rank_title'] = "ùí äãéøåâ";
$lang['Rank_special'] = "äâãø ëãéøåâ îéåçã";
$lang['Rank_minimum'] = "îéðéîåí äåãòåú";
$lang['Rank_maximum'] = "î÷ñéîåí äåãòåú";
$lang['Rank_image'] = "úîåðú äãéøåâ (ìôé ñôøééú ä-PHP)";
$lang['Rank_image_explain'] = "äùúîù áëê áëãé ì÷áåò ñîìéí ÷èðéí ä÷ùåøéí
ìãéøåâ";
$lang['Must_select_rank'] = "éù ìáçåø ãéøåâ";
$lang['No_assigned_rank'] = "ùåí ãéøåâ îéåçã ìà ðáçø";
$lang['Rank_updated'] = "äãéøåâ òåãëï áäöìçä";
$lang['Rank_added'] = "äãéøåâ ðåñó áäöìçä";
$lang['Rank_removed'] = "äãéøåâ ðîç÷ áäöìçä";
$lang['No_update_ranks'] = "äãéøåâ ðîç÷ áäöìçä, àê îùúîùéí àùø îùúîùéí
áãéøåâ æä ìà òåãëðå. úéàìõ ìùðåú áàåôï éãðé àú äãéøåâ ùì îùúîùéí àéìå";
$lang['Click_return_rankadmin'] = "ìçõ %sëàï%s áëãé ìçæåø ììåç ðéäåì
ãéøåâéí";
//
// Disallow Username Admin
//
$lang['Disallow_control'] = "îòøëú çñéîú ùîåú îùúîù";
$lang['Disallow_explain'] = "ëìé æä îòðé÷ ìê àú äéëåìú ìîðåò îùí îùúîù
îñåééí ìäøùí. ðéúï ìäòæø áñéîï * áëãé ìäâãéø èååç àåúéåú îñåééí. àí ùí îùúîù
ùðçñí ëáø ÷ééí, òìéê ìîçå÷ úçéìä àú ùí äîùúîù ä÷ééí, åàæ ìáöò àú äçñéîä.";
$lang['Delete_disallow'] = "îç÷";
$lang['Delete_disallow_title'] = "äñø ùí îùúîù çñåí";
$lang['Delete_disallow_explain'] = "áéëåìúê ìîçå÷ ùí îùúîù çñåí òì éãé áçéøú
ùí äîùúîù îøùéîä æå åìçéöä òì îç÷";
$lang['Add_disallow'] = "äåñó";
$lang['Add_disallow_title'] = "äåñó ùí îùúîù çñåí";
$lang['Add_disallow_explain'] = "áéëåìúê ìçñåí ùí îùúîù åìäòæø áñéîï * áëãé
ìäâãéø èååç";
$lang['No_disallowed'] = "àéï ùîåú îùúîù çñåîéí!";
$lang['Disallowed_deleted'] = "çñéîú ùí äîùúîù äåñøä áäöìçä";
$lang['Disallow_successful'] = "çñéîú ùí äîùúîù äçãùä ðåñôä áäöìçä";
$lang['Disallowed_already'] = "ìà ðéúï ìçñåí àú ùí äîùúîù ùäâãøú. éúëï ëé ùí
äîùúîù ëáø ÷ééí áøùéîú äçñéîä, àå áøùéîú öéðæåø äîéìéí åàó éúëï ëé éù áðîöà
ùí îùúîù øùåí ùëæä";
$lang['Click_return_disallowadmin'] = "ìçõ %sëàï%s áëãé ìùåá ìîòøëú çñéîú
ùîåú îùúîù";
//
// Styles Admin
//
$lang['Styles_admin'] = "îòøëú ðéäåì ñâðåðåú";
$lang['Styles_explain'] = "áîòøëú æå úåëì ìäåñéó, ìîçå÷ åìòøåê ñâðåðåú àùø
éäéå áùéîåù îùúîùé äôåøåí.";
$lang['Styles_addnew_explain'] = "äøùéîä äáàä îëéìä àú ëì äñ÷éðéí äàôùøééí
òáåø äñâðåðåú ùéù ìê ëòú. ëì äîöåé áøùéîä æå èøí äåú÷ï áîàâø äîéãò ùì PhpBB.
òì îðú ìäú÷éï ðåùà îñåééí, ôùåè ìçõ òì ÷éùåø ääú÷ðä áöã äøëéá";
$lang['Select_template'] = "áçø úáðéú";
$lang['Style'] = "ñâðåï";
$lang['Template'] = "úáðéú";
$lang['Install'] = "äú÷ï";
$lang['Download'] = "äåøã";
$lang['Edit_theme'] = "òøåê ñ÷éï";
$lang['Edit_theme_explain'] = "áèåôñ äáà úåëì ìòøåê àú ääâãøåú òáåø äñ÷éï
äðáçø";
$lang['Create_theme'] = "öåø ñ÷éï";
$lang['Create_theme_explain'] = "áèåôñ äáà úåëì ìéöåø ñ÷éï çãù òáåø úáðéú
ðáçøú. ëàùø úâãéø àú äöáòéí (òáåøí òìéê ìäùúîù á÷åã HEX), àñåø ìê ìäëìéì àú
äñéîï # ääúçìúé.
ìîùì... CCCCCC äéðå òøê î÷åáì, ëàùø #CCCCCC àéðå òøê î÷åáì.";
$lang['Export_themes'] = "éöà ñ÷éðéí";
$lang['Export_explain'] = "áôàðì æä úåëì ìééöà àú îéãò äñ÷éï òáåø úáðéú àùø
ðáçøä. áçø àú äúáðéú îøùéîä îúçú åäñ÷øéôè éöåø àú ÷åáõ äâãøåú äñ÷éï åéðñä
ìùîåø àåúå áñôøééú äúáðéú äðáçøú. àí ôòåìú äùîéøä ìà úúáöò áäöìçä, úðúï ìê
äàôùøåú ìäåøéã àåúå îäùøú. áëãé ìäáèéç àú äöìçú úäìéê äùîéøä ùì äñ÷øéôè,
òìéê ìäòðé÷ ìùøú äàúø äøùàú ëúéáä òáåø ñôøééú äúáðéú äðáçøú.";
$lang['Theme_installed'] = "äñ÷éï äðáçø äåú÷ï áäöìçä";
$lang['Style_removed'] = "äñâðåï äðáçø äåñø áäöìçä îîàâø äîéãò. òì îðú ìäñéø
áàåôï îåçìè àú ñâðåï æä îäîòøëú òìéê ìîçå÷ àú äñâðåï äîúàéí îñôøéåú äúáðéú
ùìê.";
$lang['Theme_info_saved'] = "äîéãò ùì äñ÷éï òáåø äúáðéú äðáçøú ðùîø áäöìçä.
òìéê ìäçæéø ëòú ìäøùàåú ùì-theme_info.cfg (åàí àôùøé àú ñôøééú äúáðéú
äðáçøú) ì÷øéàä áìáã";
$lang['Theme_updated'] = "äñ÷éï äðáçø òåãëï áäöìçä. òìéê ìééöà ëòú àú äâãøåú
äñ÷éï äçãùåú";
$lang['Theme_created'] = "äñ÷éï ðåöø. òìéê ìééöà ëòú àú äñ÷éï ì÷åáõ äâãøåú
ñ÷éï ëâéáåé, àå òáåø ùéîåù áî÷åí àçø";
$lang['Confirm_delete_style'] = "äàí àúä áèç ëé áøöåðê ìîçå÷ àú äñâðåï
äæä?";
$lang['Download_theme_cfg'] = "úäìéê äééöåà ìà éëì ìëúåá àú ÷åáõ îéãò äñ÷éï.
ìçõ òì äëôúåø ùîúçú òì îðú ìäåøéã àú ä÷åáõ áàîöòåú äãôãôï ùìê. îäøâò ùäåøãú
àåúå, úåëì ìäòáéø àåúå ìñôøééä äîëéìä àú ÷áöé äúáðéú. ìàçø îëï úåëì ìäôéõ àú
äñ÷éï ìëì î÷åí ùúøöä";
$lang['No_themes'] = "äúáðéú àåúä áçøú äéðä çñøú ñ÷éðéí äîùåééëéí àìéä. áëãé
ìéöåø ñ÷éï çãù, ìçõ òì ÷éùåø \"öåø ñ÷éï çãù\" áôàðì äöéãé.";
$lang['No_template_dir'] = "ôúéçú úé÷ééú äúáðéú ðëùìä. éúëï ëé àéï äøùàú
÷øéàä òáåø úé÷ééä æå òì éãé äùøú, àå ùàåìé àéððä ÷ééîú.";
$lang['Cannot_remove_style'] = "ôòåìú ääñøú äñâðåï äðáçø ðëùìä îëéååï ùäåà
îäååä ëòú àú áøéøú äîçãì ùì äôåøåí. àðà ùðä àú áøéøú äîçãì åðñä ùðéú.";
$lang['Style_exists'] = "äùí òáåø äñâðåï ëáø ÷ééí, àðà çæåø åáçø áùí àçø.";
$lang['Click_return_styleadmin'] = "ìçõ %sëàï%s òì îðú ìçæåø ìîòøëú ðéäåì
ñâðåðåú";
$lang['Theme_settings'] = "äâãøåú ñ÷éðéí";
$lang['Theme_element'] = "àìîðè äñ÷éï";
$lang['Simple_name'] = "ùí äñ÷éï";
$lang['Value'] = "òøê";
$lang['Save_Settings'] = "ùîåø äâãøåú";
$lang['Stylesheet'] = "CSS Stylesheet";
$lang['Background_image'] = "úîåðú ø÷ò";
$lang['Background_color'] = "öáò ø÷ò";
$lang['Theme_name'] = "ùí äñ÷éï";
$lang['Link_color'] = "öáò ÷éùåø";
$lang['Text_color'] = "öáò äè÷ñè";
$lang['VLink_color'] = "öáò ÷éùåø ùðáã÷";
$lang['ALink_color'] = "öáò ÷éùåø ôòéì";
$lang['HLink_color'] = "öáò ÷éùåø àùø ñîï äòëáø îöáéò òìéå";
$lang['Tr_color1'] = "öáò ùåøú èáìä 1";
$lang['Tr_color2'] = "öáò ùåøú èáìä 2";
$lang['Tr_color3'] = "öáò ùåøú èáìä 3";
$lang['Tr_class1'] = "ñåâ ùåøú èáìä 1";
$lang['Tr_class2'] = "ñåâ ùåøú èáìä 2";
$lang['Tr_class3'] = "ñåâ ùåøú èáìä 3";
$lang['Th_color1'] = "öáò ëåúøú èáìä 1";
$lang['Th_color2'] = "öáò ëåúøú èáìä 2";
$lang['Th_color3'] = "öáò ëåúøú èáìä 3";
$lang['Th_class1'] = "ñåâ ëåúøú èáìä 1";
$lang['Th_class2'] = "ñåâ ëåúøú èáìä 2";
$lang['Th_class3'] = "ñåâ ëåúøú èáìä 3";
$lang['Td_color1'] = "öáò úà èáìä 1";
$lang['Td_color2'] = "öáò úà èáìä 2";
$lang['Td_color3'] = "öáò úà èáìä 3";
$lang['Td_class1'] = "ñåâ úà èáìä 1";
$lang['Td_class2'] = "ñåâ úà èáìä 2";
$lang['Td_class3'] = "ñåâ úà èáìä 3";
$lang['fontface1'] = "âåôï îñôø 1";
$lang['fontface2'] = "âåôï îñôø 2";
$lang['fontface3'] = "âåôï îñôø 3";
$lang['fontsize1'] = "âåãì âåôï 1";
$lang['fontsize2'] = "âåãì âåôï 2";
$lang['fontsize3'] = "âåãì âåôï 3";
$lang['fontcolor1'] = "öáò âåôï 1";
$lang['fontcolor2'] = "öáò âåôï 2";
$lang['fontcolor3'] = "öáò âåôï 3";
$lang['span_class1'] = "Span Class 1";
$lang['span_class2'] = "Span Class 2";
$lang['span_class3'] = "Span Class 3";
$lang['img_poll_size'] = "Polling Image Size [px]";
$lang['img_pm_size'] = "Private Message Status size [px]";
//
// Install Process
//
$lang['Welcome_install'] = "áøåê äáà ìäú÷ðú PHP 2 - äâøñä äòáøéú";
$lang['Initial_config'] = "äâãøåú áñéñéåú";
$lang['DB_config'] = "äâãøåú îñã ðúåðéí";
$lang['Admin_config'] = "äâãøåú îðäì";
$lang['continue_upgrade'] = "áøâò ùäåøãú àú ÷åáõ ääâãøåú ìîçùá àúä øùàé
ìäîùéê àú ôòåìú äòãëåï òì éãé ìçéöä òì ëôúåø \"äîùê òãëåï\". àðà äîúï
ìäòìàú ÷åáõ ääâãøåú òã ùúäìéê äòãëåï éñúééí.";
$lang['upgrade_submit'] = "äîùê òãëåï";
$lang['Installer_Error'] = "ú÷ìä àéøòä áîäìê ääú÷ðä";
$lang['Previous_Install'] = "äú÷ðä ÷åãîú æåäúä";
$lang['Install_db_error'] = "ú÷ìä äúøçùä áúäìéê òãëåï îñã äðúåðéí";
$lang['Re_install'] = "ääú÷ðä ä÷åãîú òãééï ú÷ôä.<br /><br
/>
àí úøöä ìäú÷éï îçãù àú phpBB 2 òìéê ììçåõ òì ëôúåø ëï îúçú. àðà ùí ìá ùáéöåò
ôòåìä æå úùîéã àú ëì äîéãò ä÷ééí, ììà òùééú ëì âéáåé! ùí äîùúîù åäñéñîà ùì
äàãîéï áäí äúùîùú úéååöø îçãù áñéåí ääú÷ðä, àê ùåí îéãò àçø ìà éùîø.
<br /><br
/>
çùåá áæäéøåú ìôðé ìçéöä òì ëï!";
$lang['Inst_Step_0'] = "úåãä ìê ùáçøú á phpBB 2, äâéøñä äòéáøéú. áëãé ìäùìéí
àú úäìéê ääú÷ðä äæä àðà îìà àú äôøèéí äîáå÷ùéí. àðà ùéí ìá ùîàâø äîéãò ùàúä
îú÷éï ìúåëå ëáø àîåø ìäéåú ÷ééí. àí àúä îú÷éï ìúåê îàâø îéãò äðòæø á ODBC,
ìãåâîà MS Access, òìéê úçéìä ìéöåø DSN òáåøå ìôðé ùúîùéê.";
$lang['Start_Install'] = "úçéìú ääú÷ðä";
$lang['Finish_Install'] = "ñéåí ääú÷ðä";
$lang['Default_lang'] = "ùôú áøéøú äîçãì";
$lang['DB_Host'] = "ùí ùøú îñã äðúåðéí / DSN";
$lang['DB_Name'] = "ùîê áîàâø äîéãò";
$lang['DB_Username'] = "ùí îùúîù îàâø äîéãò";
$lang['DB_Password'] = "ñéñîà ìîàâø äîéãò";
$lang['Database'] = "îàâø äîéãò ùìê";
$lang['Install_lang'] = "áçø áùôä òáåø ääú÷ðä";
$lang['dbms'] = "ñåâ îàâø îéãò";
$lang['Table_Prefix'] = "÷éöåø (ñéîï îéåçã) òáåø èáìàåú áîàâø äîéãò";
$lang['Admin_Username'] = "ùí îùúîù äàãîéï";
$lang['Admin_Password'] = "ñéñîú äàãîéï";
$lang['Admin_Password_confirm'] = "ä÷ù ùðéú àú ñéñîú äàãîéï [ìöåøê àéùåø]";
$lang['Inst_Step_2'] = "ùí îùúîù äàãîéï ùìê ðåöø. áð÷åãä æå ääú÷ðä äáñéñéú
ðñúééîä. ëòú úì÷ç ìîñê àùø éàôùø ìê ìðäì àú ääú÷ðä äçãùä. àðà áãå÷ àú ôøèé
ääâãøåú äëììéåú åáöò àú ëì äùéðåééí äãøåùéí. úåãä ìê ùáçøú á phpBB2, äâéøñä
äòéáøéú.";
$lang['Unwriteable_config'] = "÷åáõ ääâãøåú ùìê àéðå ðéúï ìëúéáä ëøâò. òåú÷
ùì ÷åáõ ääâãøåú éåòáø ìîçùáê áøâò ùú÷éù òì äëôúåø îúçú. òìéê ìäòìåú ÷åáõ æä
ìàåúä ñôøééä áä îîå÷í phpBB2. áøâò ùôòåìä æå úúáöò úåëì ìäúçáø áàîöòåú ñéñîú
äàãîéï ùìê åìá÷ø áìåç äðéäåì (÷éùåø éåôéò áúçúéú äôåøåí) áùáéì ìùðåú àú
ääâãøåú äëììéåú. úåãä ìê ùáçøú á-phpBB2, äâéøñä äòéáøéú.";
$lang['Download_config'] = "äçì äåøãä";
$lang['ftp_choose'] = "áçø öåøú äåøãä";
$lang['ftp_option'] = "<br />îëéååï ùñéåîåú FTP äéðí îåøùåú áâéøñä æå ùì
php, úäéä øùàé ìðñåú úçéìä ìäòìåú àåèåîèéú á-ftp àú ÷åáõ ääâãøåú ìî÷åîå.";
$lang['ftp_instructs'] = "áçøú ìäòìåú àú ä÷åáõ ìçùáåï äîëéì àú phpBB2 áöåøú
FTP áàåôï àåèåîèé. àðà äëðñ àú äîéãò äãøåù áùáéì ìáöò àú úäìéê æä. àðà ùí ìá
ùëúåáú ä-FTP öøéëä ìäéåú äëúåáú äîãåéé÷ú áàîöòåú FTP àì äú÷ðú ä phpBB2 ëôé
ùäééú ðéâù àìéä áàîöòé FTP øâéìéí.";
$lang['ftp_info'] = "äëðñ àú ðúåðé ä-FTP ëàï";
$lang['Attempt_ftp'] = "ðñä ìùìåç àú ÷åáõ ääâãøåú ìî÷åîå áàîöòåú FTP";
$lang['Send_file'] = "ôùåè ùìç àìé àú ä÷åáõ åàðé àòìä àåúå éãðéú";
$lang['ftp_path'] = "ëúåáú FTP àì phpBB2";
$lang['ftp_username'] = "ùí îùúîù FTP ùìê";
$lang['ftp_password'] = "ñéñîú FTP ùìê";
$lang['Transfer_config'] = "äúçì áäòáøä";
$lang['NoFTP_config'] = "ðñéåï äùìéçä ùì ä÷åáõ áàîöòåú FTP ðëùì. àðà äåøã àú
ä÷åáõ åäëðñ àåúå áòöîê áàåôï éãðé.";
$lang['Install'] = "äú÷ï";
$lang['Upgrade'] = "ùãøâ";
$lang['Install_Method'] = "áçø àú ùéèú ääú÷ðä äøöåééä";
$lang['Install_No_Ext'] = "äâãøåú ä-php áùøú ùìê ìà úåîëåú áñåâ îàâø äîéãò
áå áçøú";
$lang['Install_No_PCRE'] = "phpBB2 ãåøù Perl-Compatible Regular
Expressions Module òáåø php, ëàùø äâãøåú ä-Php ùìê ëðøàä àéðï úåîëåú!";
//
// That's all Folks!
// -------------------------------------------------
?>
--- NEW FILE ---
<?php
/***************************************************************************
* lang_main.php [English]
* -------------------
* begin : Tue Apr 9 2002
* copyright : (C) 2002 Gil Osher and the Chaotic Goat
* email : do...@rp...
*
* $Id: lang_main.php,v 1.00 2002/04/09 19:31:00 dolfin Exp $
*
****************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
//
// The format of this file is:
//
// ---> $lang['message'] = "text";
//
// You should also try to set a locale and a character
// encoding (plus direction). The encoding and direction
// will be sent to the template. The locale may or may
// not work, it's dependent on OS support and the syntax
// varies ... give it your best guess!
//
//setlocale(LC_ALL, "he_IL");
$lang['ENCODING'] = "WINDOWS-1255";
$lang['DIRECTION'] = "RTL";
$lang['LEFT'] = "RIGHT";
$lang['RIGHT'] = "LEFT";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
// Common, these terms are used
// extensively on several pages
//
$lang['Forum'] = "ôåøåí";
$lang['Category'] = "÷èâåøéä";
$lang['Topic'] = "ðåùà";
$lang['Topics'] = "ðåùàéí";
$lang['Replies'] = "úâåáåú";
$lang['Views'] = "öôéåú";
$lang['Post'] = "äåãòä";
$lang['Posts'] = "äåãòåú";
$lang['Posted'] = "ôåøñí";
$lang['Username'] = "ùí îùúîù";
$lang['Password'] = "ñéñîä";
$lang['Email'] = "ãåà\"ì";
$lang['Poster'] = "îôøñí";
$lang['Author'] = "îçáø";
$lang['Time'] = "æîï";
$lang['Hours'] = "ùòåú";
$lang['Message'] = "äåãòä";
$lang['1_Day'] = "éåí àçã";
$lang['7_Days'] = "7 éîéí";
$lang['2_Weeks'] = "ùáåòééí";
$lang['1_Month'] = "çåãù àçã";
$lang['3_Months'] = "3 çåãùéí";
$lang['6_Months'] = "6 çåãùéí";
$lang['1_Year'] = "ùðä àçú";
$lang['Go'] = "ìê";
$lang['Jump_to'] = "÷ôåõ àì";
$lang['Submit'] = "ùìç";
$lang['Reset'] = "äúçì îçãù";
$lang['Cancel'] = "áéèåì";
$lang['Preview'] = "úöåâä î÷ãéîä";
$lang['Confirm'] = "àéùåø";
$lang['Spellcheck'] = "áãé÷ú àéåú";
$lang['Yes'] = "ëï";
$lang['No'] = "ìà";
$lang['Enabled'] = "ôåòì";
$lang['Disabled'] = "ëáåé";
$lang['Error'] = "ùâéàä";
$lang['Next'] = "äáà";
$lang['Previous'] = "ä÷åãí";
$lang['Goto_page'] = "ìê ìòîåã";
$lang['Joined'] = "äöèøó";
$lang['IP_Address'] = "ëúåáú IP";
$lang['Select_forum'] = "áçø ôåøåí";
$lang['View_latest_post'] = "öôä áäåãòä äàçøåðä";
$lang['View_newest_post'] = "öôä áäåãòä äçãùä áéåúø";
$lang['Page_of'] = "òîåã <b>%d</b> îúåê <b>%d</b>"; // Replaces with: Page 1 of 2 for example
$lang['ICQ'] = "îñôø ICQ";
$lang['AIM'] = "ëúåáú AIM";
$lang['MSNM'] = "MSN Messenger";
$lang['YIM'] = "Yahoo Messenger";
$lang['Forum_Index'] = "àéðã÷ñ äôåøåîéí ùì %s"; // eg. sitename Forum Index, %s can be removed if you prefer
$lang['Post_new_topic'] = "ôøñí ðåùà çãù";
$lang['Reply_to_topic'] = "äâá ìðåùà";
$lang['Reply_with_quote'] = "äâá òí öéèåè";
$lang['Click_return_topic'] = "ìçõ %sëàï%s ëãé ìçæåø ìðåùà"; // %s's here are for uris, do not remove!
$lang['Click_return_login'] = "ìçõ %sëàï%s ëãé ìðñåú ùåá";
$lang['Click_return_forum'] = "ìçõ %sëàï%s ëãé ìçæåø ìôåøåí";
$lang['Click_view_message'] = "ìçõ %sëàï%s ëãé ìøàåú àú äåãòúê";
$lang['Click_return_modcp'] = "ìçõ %sëàï%s ëãé ìçæåø ììåç äá÷øä ùì äàçøàéí";
$lang['Click_return_group'] = "ìçõ %sëàï%s ëãé ìçæåø ìîéãò ä÷áåöä";
$lang['Admin_panel'] = "ìê ììåç äðéäåì";
$lang['Board_disable'] = "îöèòøéí, àê ìåç æä àéðå æîéï ëøâò, àðà ðñä áîåòã îàåçø éåúø";
//
// Global Header strings
//
$lang['Registered_users'] = "îùúîùéí øùåîéí:";
$lang['Browsing_forum'] = "îùúîùéí äîãôãôéí áôåøåí æä:";
$lang['Online_users_zero_total'] = "áñê äëì éùðí <b>0</b> îùúîùéí îçåáøéí :: ";
$lang['Online_users_total'] = "áñê äëì éùðí <b>%d</b> îùúîùéí îçåáøéí :: ";
$lang['Online_user_total'] = "áñê äëì éùðå îùúîù <b>àçã</b> îçåáø :: ";
$lang['Reg_users_zero_total'] = "0 øùåîéí, ";
$lang['Reg_users_total'] = "%d øùåîéí, ";
$lang['Reg_user_total'] = "àçã øùåí, ";
$lang['Hidden_users_zero_total'] = "0 çáåééí å";
$lang['Hidden_user_total'] = "%d çáåééí å";
$lang['Hidden_users_total'] = "àçã çáåé å";
$lang['Guest_users_zero_total'] = "-0 àåøçéí";
$lang['Guest_users_total'] = "-%d àåøçéí";
$lang['Guest_user_total'] = "àåøç àçã";
$lang['Record_online_users'] = "äîñôø äøá áéåúø ùì îùúîùéí îçåáøéí àé ôòí äéä <b>%s</b> áúàøéê %s"; // first %s = number of users, second %s is the date.
$lang['Admin_online_color'] = "%sîðäì%s";
$lang['Mod_online_color'] = "%sàçøàé%s";
$lang['You_last_visit'] = "áé÷øú ìàçøåðä á %s"; // %s replaced by date/time
$lang['Current_time'] = "äùòä òëùéå äéà %s"; // %s replaced by time
$lang['Search_new'] = "äöâ äåãòåú îàæ äáé÷åø äàçøåï";
$lang['Search_your_posts'] = "öôä áäåãòåúéê";
$lang['Search_unanswered'] = "öôä áäåãòåú ùèøí ðòðå";
$lang['Register'] = "äøùí";
$lang['Profile'] = "ôøåôéì";
$lang['Edit_profile'] = "òøåê àú äôøåôéì ùìê";
$lang['Search'] = "çéôåù";
$lang['Memberlist'] = "øùéîú çáøéí";
$lang['FAQ'] = "FAQ";
$lang['BBCode_guide'] = "îãøéê BBCode";
$lang['Usergroups'] = "÷áåöåú îùúîùéí";
$lang['Last_Post'] = "äåãòä àçøåðä";
$lang['Moderator'] = "àçøàé";
$lang['Moderators'] = "àçøàéí";
//
// Stats block text
//
$lang['Posted_articles_zero_total'] = "äîùúîùéí ùìðå ôøñîå ñê-äëì <b>0</b> äåãòåú"; // Number of posts
$lang['Posted_articles_total'] = "äîùúîùéí ùìðå ôøñîå ñê-äëì <b>%d</b> äåãòåú"; // Number of posts
$lang['Posted_article_total'] = "äîùúîùéí ùìðå ôøñîå ñê-äëì äåãòä <b>àçú</b>"; // Number of posts
$lang['Registered_users_zero_total'] = "éù ìðå <b>0</b> îùúîùéí øùåîéí"; // # registered users
$lang['Registered_users_total'] = "éù ìðå <b>%d</b> îùúîùéí øùåîéí"; // # registered users
$lang['Registered_user_total'] = "éù ìðå îùúîù øùåí <b>àçã</b>"; // # registered users
$lang['Newest_user'] = "äîùúîù äèøé áéåúø äåà <b>%s%s%s</b>"; // a href, username, /a
$lang['No_new_posts_last_visit'] = "àéï äåãòåú çãùåú îàæ áé÷åøê äàçøåï";
$lang['No_new_posts'] = "àéï äåãòåú çãùåú";
$lang['New_posts'] = "äåãòåú çãùåú";
$lang['New_post'] = "äåãòä çãùä";
$lang['No_new_posts_hot'] = "àéï äåãòåú çãùåú [ ôåôåìàøé ]";
$lang['New_posts_hot'] = "éù äåãòåú çãùåú [ ôåôåìàøé ]";
$lang['No_new_posts_locked'] = "àéï äåãòåú çãùåú [ ðòåì ]";
$lang['New_posts_locked'] = "éù äåãòåú çãùåú [ ðòåì ]";
$lang['Forum_is_locked'] = "äôåøåí ðòåì";
//
// Login
//
$lang['Enter_password'] = "àðà äæï àú ùí äîùúîù åäñéñîä ùìê ëãé ìäúçáø";
$lang['Login'] = "äúçáø";
$lang['Logout'] = "äúðú÷";
$lang['Forgotten_password'] = "ùëçúé àú ñéñîúé";
$lang['Log_me_in'] = "çáø àåúé àåèåîèéú áëì áé÷åø";
$lang['Error_login'] = "ñéô÷ú ùí îùúîù ùâåé àå ìà ôòéì àå ñéñîä ùâåéä";
//
// Index page
//
$lang['Index'] = "àéðã÷ñ";
$lang['No_Posts'] = "àéï äåãòåú";
$lang['No_forums'] = "áìåç æä àéï ôåøåîéí";
$lang['Private_Message'] = "äåãòä ôøèéú";
$lang['Private_Messages'] = "äåãòåú ôøèéåú";
$lang['Who_is_Online'] = "îé îçåáø";
$lang['Mark_all_forums'] = "ñîï àú ëì äôåøåîéí ëð÷øàå";
$lang['Forums_marked_read'] = "ëì äôåøåîéí ñåîðå ëð÷øàå";
//
// Viewforum
//
$lang['View_forum'] = "øàä ôåøåí";
$lang['Forum_not_exist'] = "äôåøåí ùáçøú àéðå ÷ééí";
$lang['Reached_on_error'] = "äâòú ìòîåã æä áèòåú";
$lang['Display_topics'] = "äöâ ðåùàéí îìôðé";
$lang['All_Topics'] = "ëì äðåùàéí";
$lang['Topic_Announcement'] = "<b>äëøæä:</b>";
$lang['Topic_Sticky'] = "<b>ãáé÷:</b>";
$lang['Topic_Moved'] = "<b>äåææ:</b>";
$lang['Topic_Poll'] = "<b>[ ñ÷ø ]</b>";
$lang['Mark_all_topics'] = "ñîï àú ëì äðåùàéí ëð÷øàå";
$lang['Topics_marked_read'] = "ëì äðåùàéí áôåøåí æä ñåîðå òëùéå ëð÷øàå";
$lang['Rules_post_can'] = "àúä <b>éëåì</b> ìôøñí ðåùàéí çãùéí áôåøåí æä";
$lang['Rules_post_cannot'] = "àúä <b>ìà éëåì</b> ìôøñí ðåùàéí çãùéí áôåøåí æä";
$lang['Rules_reply_can'] = "àúä <b>éëåì</b> ìäâéá ìðåùàéí áôåøåí æä";
$lang['Rules_reply_cannot'] = "àúä <b>ìà éëåì</b> ìäâéá ìðåùàéí áôåøåí æä";
$lang['Rules_edit_can'] = "àúä <b>éëåì</b> ìòøåê àú äåãòåúéê áôåøåí æä";
$lang['Rules_edit_cannot'] = "àúä <b>ìà éëåì</b> ìòøåê àú äåãòåúéê áôåøåí æä";
$lang['Rules_delete_can'] = "àúä <b>éëåì</b> ìîçå÷ àú äåãòåúéê áôåøåí æä";
$lang['Rules_delete_cannot'] = "àúä <b>ìà éëåì</b> ìîçå÷ àú äåãòåúéê áôåøåí æä";
$lang['Rules_vote_can'] = "àúä <b>éëåì</b> ìäöáéò áñ÷øéí áôåøåí æä";
$lang['Rules_vote_cannot'] = "àúä <b>ìà éëåì</b> ìäöáéò áñ÷øéí áôåøåí æä";
$lang['Rules_moderate'] = "àúä <b>éëåì</b> %sìäùâéç òì ôåøåí æä%s"; // %s replaced by a href links, do not remove!
$lang['No_topics_post_one'] = "àéï äåãòåú áôåøåí æä<br />ìçõ òì ä÷éùåø<b>ôøñí ðåùà çãù</b> áòîåã æä ëãé ìôøñí àçú";
//
// Viewtopic
//
$lang['View_topic'] = "øàä ðåùà";
$lang['Guest'] = 'àåøç';
$lang['Post_subject'] = "ðåùà ääåãòä";
$lang['View_next_topic'] = "öôä áðåùà äáà";
$lang['View_previous_topic'] = "öôä áðåùà ä÷åãí";
$lang['Submit_vote'] = "ùìç ÷åìê";
$lang['View_results'] = "øàä úåöàåú";
$lang['No_newer_topics'] = "àéï ðåùàéí çãùéí éåúø áôåøåí æä";
$lang['No_older_topics'] = "àéï ðåùàéí éùðéí éåúø áôåøåí æä";
$lang['Topic_post_not_exist'] = "äðåùà àå ääåãòä ùáé÷ùú àéðí ÷ééîéí";
$lang['No_posts_topic'] = "ìà ÷ééîåú äåãòåú ìðåùà æä";
$lang['Display_posts'] = "äöâ äåãòåú îìôðé";
$lang['All_Posts'] = "ëì ääåãòåú";
$lang['Newest_First'] = "äëé çãùåú ÷åãí";
$lang['Oldest_First'] = "äëé éùðåú ÷åãí";
$lang['Back_to_top'] = "çæøä ìîòìä";
$lang['Read_profile'] = "öôä áôøåôéì äîùúîù";
$lang['Send_email'] = "ùìç ãåà\"ì ìîùúîù";
$lang['Visit_website'] = "á÷ø áàúø äîôøñí";
$lang['ICQ_status'] = "îöá ICQ";
$lang['Edit_delete_post'] = "òøåê/îç÷ äåãòä æå";
$lang['View_IP'] = "öôä á IP ùì äîùúîù";
$lang['Delete_post'] = "îç÷ äåãòä æå";
$lang['wrote'] = "ëúá"; // proceeds the username and is followed by the quoted text
$lang['Quote'] = "öéèåè"; // comes before bbcode quote output.
$lang['Code'] = "÷åã"; // comes before bbcode code output.
$lang['Edited_time_total'] = "ðòøê ìàçøåðä òì-éãé %s áúàøéê %s, ñê-äëì ðòøê ôòí àçú"; // Last edited by me on 12 Oct 2001, edited 1 time in total
$lang['Edited_times_total'] = "ðòøê ìàçøåðä òì-éãé %s áúàøéê %s, ñê-äëì ðòøê %d ôòîéí"; // Last edited by me on 12 Oct 2001, edited 2 times in total
$lang['Lock_topic'] = "ðòì ðåùà æä";
$lang['Unlock_topic'] = "ôúç ðåùà æä";
$lang['Move_topic'] = "äææ ðåùà æä";
$lang['Delete_topic'] = "îç÷ ðåùà æä";
$lang['Split_topic'] = "ôöì ðåùà æä";
$lang['Stop_watching_topic'] = "äôñ÷ ìò÷åá àçø ðåùà æä";
$lang['Start_watching_topic'] = "ò÷åá àçø ðåùà æä ìúâåáåú";
$lang['No_longer_watching'] = "àúä ìà òå÷á éåúø àçø ðåùà æä";
$lang['You_are_watching'] = "àúä òëùéå òå÷á àçøé ðåùà æä";
$lang['Total_votes'] = "ñê-äëì äöáòåú";
//
// Posting/Replying (Not private messaging!)
//
$lang['Message_body'] = "âåó ääåãòä";
$lang['Topic_review'] = "ñé÷åø ðåùà";
$lang['No_post_mode'] = "ìà öåééï îöá äåãòä"; // If posting.php is called without a mode (newtopic/reply/delete/etc, shouldn't be shown normaly)
$lang['Post_a_new_topic'] = "ôøñí ðåùà çãù";
$lang['Post_a_reply'] = "ôøñí úâåáä";
$lang['Post_topic_as'] = "ôøñí ðåùà ë";
$lang['Edit_Post'] = "òøåê äåãòä";
$lang['Options'] = "àôùøåéåú";
$lang['Post_Announcement'] = "äëøæä";
$lang['Post_Sticky'] = "ãáé÷";
$lang['Post_Normal'] = "øâéì";
$lang['Confirm_delete'] = "àúä áèåç ùáøöåðê ìîçå÷ äåãòä æå?";
$lang['Confirm_delete_poll'] = "àúä áèåç ùáøöåðê ìîçå÷ ñ÷ø æä?";
$lang['Flood_Error'] = "ìà ðéúï ìôøñí äåãòä ëì-ëê îòè æîï àçøé äàçøåðä ùìê, àðà ðñä ùåá úåê æîï ÷öø";
$lang['Empty_subject'] = "àúä çééá ìöééï ðåùà ëùîôøñîéí ðåùà çãù";
$lang['Empty_message'] = "àúä çééá ìä÷ìéã úåëï ìäåãòä ùìê";
$lang['Forum_locked'] = "ôåøåí æä ðòåì, àúä ìà éëåì ìôøñí, ìäâéá àå ìòøåê ðåùàéí";
$lang['Topic_locked'] = "ðåùà æä ðòåì åàúä ìà éëåì ìòøåê äåãòåú àå ìäâéá";
$lang['No_post_id'] = "àúä çééá ìáçåø äåãòä ìòøåê";
$lang['No_topic_id'] = "àúä çééá ìáçåø ðåùà ìäâéá ìå";
$lang['No_valid_mode'] = "àúä éëåì ø÷ ìôøñí, ìäâéá, ìòøåê àå ìöèè äåãòåú, àðà çæåø åðñä ùåá";
$lang['No_such_post'] = "àéï äåãòä ëæå, àðà çæåø åðñä ùåá";
$lang['Edit_own_posts'] = "îöèòø, àê àúä éëåì ìòøåê ø÷ àú ääåãòåú ùìê";
$lang['Delete_own_posts'] = "îöèòø, àê àúä éëåì ìîçå÷ ø÷ àú ääåãòåú ùìê";
$lang['Cannot_delete_replied'] = "îöèòø, àê àúä ìà éëåì ìîçå÷ äåãòåú ùäâéáå ìäï";
$lang['Cannot_delete_poll'] = "îöèòø, àê àéðê éëåì ìîçå÷ ñ÷ø ôòéì";
$lang['Empty_poll_title'] = "àúä çééá ìîìà ëåúøú ìñ÷ø ùìê";
$lang['To_few_poll_options'] = "àúä çééá ìöééï ìôçåú 2 àôùøåéåú ìñ÷ø";
$lang['To_many_poll_options'] = "ðéñéú ìä÷ìéã éåúø îéãé àôùøåéåú ìñ÷ø";
$lang['Post_has_no_poll'] = "áäåãòä æå àéï ñ÷ø";
$lang['Add_poll'] = "äåñó ñ÷ø";
$lang['Add_poll_explain'] = "àí àéðê øåöä ìäåñéó ñ÷ø ìäåãòúê äùàø ùãä æä øé÷";
$lang['Poll_question'] = "ùàìú äñ÷ø";
$lang['Poll_option'] = "àôùøåú äñ÷ø";
$lang['Add_option'] = "äåñó àôùøåú";
$lang['Update'] = "òãëï";
$lang['Delete'] = "îç÷";
$lang['Poll_for'] = "äøõ ñ÷ø ìîùê";
$lang['Days'] = "éîéí"; // This is used for the Run poll for ... Days + in admin_forums for pruning
$lang['Poll_for_explain'] = "[ ëúåá 0 àå äùàø øé÷ òáåø ñ÷ø ùàéðå îñúééí ]";
$lang['Delete_poll'] = "îç÷ ñ÷ø";
$lang['Disable_HTML_post'] = "ëáä HTML áäåãòä æå";
$lang['Disable_BBCode_post'] = "ëáä BBCode áäåãòä æå";
$lang['Disable_Smilies_post'] = "ëáä ñîééìéí áäåãòä æå";
$lang['HTML_is_ON'] = "HTML <u>ãìå÷</u>";
$lang['HTML_is_OFF'] = "HTML <u>ëáåé</u>";
$lang['BBCode_is_ON'] = "%sBBCode%s <u>ãìå÷</u>"; // %s are replaced with URI pointing to FAQ
$lang['BBCode_is_OFF'] = "%sBBCode%s <u>ëáåé</u>";
$lang['Smilies_are_ON'] = "ñîééìéí <u>ãìå÷éí</u>";
$lang['Smilies_are_OFF'] = "ñîééìéí <u>ëáåééí</u>";
$lang['Attach_signature'] = "öøó çúéîä (ðéúï ìùðåú àú äçúéîä áôøåôéì)";
$lang['Notify'] = "ééãò àåúé ëàùø úâåáä îúôøñîú";
$lang['Delete_post'] = "îç÷ äåãòä æå";
$lang['Stored'] = "ääåãòä ùìê ð÷ìèä áäöìçä";
$lang['Deleted'] = "ääåãòä ùìê ðîç÷ä áäöìçä";
$lang['Poll_delete'] = "äñ÷ø ùìê ðîç÷ áäöìçä";
$lang['Vote_cast'] = "ä÷åì ùìê ðùìç";
$lang['Topic_reply_notification'] = "äåãòä òì úâåáä ìðåùà";
$lang['bbcode_b_help'] = "è÷èñ îåãâù: [b]è÷ñè[/b] (alt+b)";
$lang['bbcode_i_help'] = "è÷ñè ðèåé: [i]è÷ñè[/i] (alt+i)";
$lang['bbcode_u_help'] = "è÷ñè òí ÷å úçúé: [u]è÷ñè[/u] (alt+u)";
$lang['bbcode_q_help'] = "öéèåè è÷ñè: [quote]è÷ñè[/quote] (alt+q)";
$lang['bbcode_c_help'] = "äöâú ÷åã: [code]÷åã[/code] (alt+c)";
$lang['bbcode_l_help'] = "øùéîä: [list]è÷ñè[/list] (alt+l)";
$lang['bbcode_o_help'] = "øùéîä îñåãøú: [list=]è÷ñè[/list] (alt+o)";
$lang['bbcode_p_help'] = "öøó úîåðä: [img]http://image_url[/img] (alt+p)";
$lang['bbcode_w_help'] = "öøó ëúåáú: [url]http://url[/url] àå [url=http://url]è÷ñè äëúåáú[/url] (alt+w)";
$lang['bbcode_a_help'] = "ñâåø àú ëì úâé ä bbCode äôúåçéí";
$lang['bbcode_s_help'] = "öáò âåôï: [color=red]è÷ñè[/color] òöä: ðéúï âí ìäùúîù á color=#FF0000";
$lang['bbcode_f_help'] = "âåãì âåôï: [size=x-small]è÷ñè ÷èï[/size]";
$lang['Emoticons'] = "ñîééìéí";
$lang['More_emoticons'] = "øàä òåã ñîééìéí";
$lang['Font_color'] = "öáò âåôï";
$lang['color_default'] = "áøéøú îçãì";
$lang['color_dark_red'] = "àãåí ëää";
$lang['color_red'] = "àãåí";
$lang['color_orange'] = "ëúåí";
$lang['color_brown'] = "çåí";
$lang['color_yellow'] = "öäåá";
$lang['color_green'] = "éøå÷";
$lang['color_olive'] = "æéú";
$lang['color_cyan'] = "úëìú";
$lang['color_blue'] = "ëçåì";
$lang['color_dark_blue'] = "ëçåì ëää";
$lang['color_indigo'] = "ñâåì ëää";
$lang['color_violet'] = "ñâåì";
$lang['color_white'] = "ìáï";
$lang['color_black'] = "ùçåø";
$lang['Font_size'] = "âåãì äâåôï";
$lang['font_tiny'] = "÷èðèï";
$lang['font_small'] = "÷èï";
$lang['font_normal'] = "øâéì";
$lang['font_large'] = "âãåì";
$lang['font_huge'] = "òð÷";
$lang['Close_Tags'] = "ñâåø úâéí";
$lang['Styles_tip'] = "òöä: àôùø ìöøó ñâðåðåú áîäéøåú ìè÷ñè îñåîï";
//
// Private Messaging
//
$lang['Private_Messaging'] = "äåãòåú ôøèéåú";
$lang['Login_check_pm'] = "äúçáø ëãé ìáãå÷ äåãòåú ôøèéåú";
$lang['New_pms'] = "éù ìê %d äåãòåú çãùåú"; // You have 2 new messages
$lang['New_pm'] = "éù ìê äåãòä çãùä àçú"; // You have 1 new message
$lang['No_new_pm'] = "àéï ìê äåãòåú çãùåú";
$lang['Unread_pms'] = "éù ìê %d äåãòåú ùèøí ð÷øàå";
$lang['Unread_pm'] = "éù ìê äåãòä àçú ùèøí ð÷øàä";
$lang['No_unread_pm'] = "àéï ìê äåãòåú ùèøí ð÷øàå";
$lang['You_new_pm'] = "äåãòä ôøèéú çãùä îçëä ìê áúéáú äãåàø äðëðñ";
$lang['You_new_pms'] = "äåãòåú ôøèéåú çãùåú îçëåú ìê áúéáú äãåàø äðëðñ";
$lang['You_no_new_pm'] = "àéï äåãòåú ôøèéåú çãùåú äîçëåú ìê";
$lang['Inbox'] = "úéáú ãåàø ðëðñ";
$lang['Outbox'] = "úéáú ãåàø éåöà";
$lang['Savebox'] = "úéáú ãåàø ùîåø";
$lang['Sentbox'] = "úéáú ãåàø ðùìç";
$lang['Flag'] = "ãâì";
$lang['Subject'] = "ðåùà";
$lang['From'] = "îàú";
$lang['To'] = "ìîòï";
$lang['Date'] = "úàøéê";
$lang['Mark'] = "ñîï";
$lang['Sent'] = "ðùìç";
$lang['Saved'] = "ðùìç";
$lang['Delete_marked'] = "îç÷ îñåîðéí";
$lang['Delete_all'] = "îç÷ äëì";
$lang['Save_marked'] = "ùîåø îñåîðéí";
$lang['Save_message'] = "ùîåø äåãòä";
$lang['Delete_message'] = "îç÷ äåãòä";
$lang['Display_messages'] = "äöâ äåãòåú îìôðé"; // Followed by number of days/weeks/months
$lang['All_Messages'] = "ëì ääåãòåú";
$lang['No_messages_folder'] = "àéï ìê äåãòåú áúé÷ééä æå";
$lang['PM_disabled'] = "äåãòåú ôøèéåú ðçñîå áôåøåí æä";
$lang['Cannot_send_privmsg'] = "îöèòø, àê äîðäì îðò îîê ìùìåç äåãòåú ôøèéåú";
$lang['No_to_user'] = "éù ìöééï ùí îùúîù àìéå îéåòãú ääåãòä";
$lang['No_such_user'] = "îöèòø, àê ìà ÷ééí îùúîù ëæä";
$lang['Disable_HTML_pm'] = "ëáä HTML áäåãòä æå";
$lang['Disable_BBCode_pm'] = "ëáä BBCode áäåãòä æå";
$lang['Disable_Smilies_pm'] = "ëáä ñîééìéí áäåãòä æå";
$lang['Message_sent'] = "äåãòúê ðùìçä";
$lang['Click_return_inbox'] = "ìçõ %sëàï%s ëãé ìçæåø ìúéáú äãåàø äðëðñ ùìê";
$lang['Click_return_index'] = "ìçõ %sëàï%s ëãé ìçæåø ìàéðã÷ñ";
$lang['Send_a_new_message'] = "ùìç äåãòä ôøèéú çãùä";
$lang['Send_a_reply'] = "äâá ìäåãòä ôøèéú";
$lang['Edit_message'] = "òøåê äåãòä ôøèéú";
$lang['Notification_subject'] = "äåãòä ôøèéú çãùä äâéòä";
$lang['Find_username'] = "îöà ùí îùúîù";
$lang['Find'] = "îöà";
$lang['No_match'] = "ìà ðîöàå úåàîéí";
$lang['No_post_id'] = "ìà öåééï ID ääåãòä";
$lang['No_such_folder'] = "ìà ÷ééîú úé÷ééä ëæå";
$lang['No_folder'] = "ìà öåééðä úé÷ééä";
$lang['Mark_all'] = "ñîï äëì";
$lang['Unmark_all'] = "áèì àú ëì äñéîåðéí";
$lang['Confirm_delete_pm'] = "àúä áèåç ùáøöåðê ìîçå÷ äåãòä æå?";
$lang['Confirm_delete_pms'] = "àúä áèåç ùáøöåðê ìîçå÷ äåãòåú àìå?";
$lang['Inbox_size'] = "úéáú äãåàø äðëðñ ùìê %d%% îìàä"; // eg. Your Inbox is 50% full
$lang['Sentbox_size'] = "úéáú äãåàø äðùìç ùìê %d%% îìàä";
$lang['Savebox_size'] = "úéáú äãåàø äùîåø ùìê %d%% îìàä";
$lang['Click_view_privmsg'] = "ìçõ %sëàï%s ëãé ìá÷ø áúéáú äãåàø äðëðñ ùìê";
//
// Profiles/Registration
//
$lang['Viewing_user_profile'] = "öôééä áôøåôéì :: %s"; // %s is username
$lang['About_user'] = "äëì àåãåú %s"; // %s is username
$lang['Preferences'] = "òãéôåéåú";
$lang['Items_required'] = "ôøéèéí äîñåîðéí á * ãøåùéí àí ìà öåééï àçøú";
$lang['Registration_info'] = "îéãò øéùåí";
$lang['Profile_info'] = "îéãò ôøåôéì";
$lang['Profile_info_warn'] = "îéãò æä éäéä æîéï ìöéáåø";
$lang['Avatar_panel'] = "ìåç ðéäåì ñéîìåðéí";
$lang['Avatar_gallery'] = "âìøééú ñéîìåðéí";
$lang['Website'] = "àúø àéðèøðè";
$lang['Location'] = "îé÷åí";
$lang['Contact'] = "÷ùø";
$lang['Email_address'] = "ëúåáú ãåàø àì÷èøåðé";
$lang['Email'] = "ãåàø àì÷èøåðé";
$lang['Send_private_message'] = "ùìç äåãòä ôøèéú";
$lang['Hidden_email'] = "[ çáåé ]";
$lang['Search_user_posts'] = "çôù äåãòåú ùì îùúîù æä";
$lang['Interests'] = "úçáéáéí";
$lang['Occupation'] = "òéñå÷";
$lang['Poster_rank'] = "ãøâú îôøñí";
$lang['Total_posts'] = "ñê-ëì ääåãòåú";
$lang['User_post_pct_stats'] = "%.2f%% îñê-äëì"; // 1.25% of total
$lang['User_post_day_stats'] = "%.2f äåãòåú ìéåí"; // 1.5 posts per day
$lang['Search_user_posts'] = "îöà àú ëì ääåãòåú ùì %s"; // Find all posts by username
$lang['No_user_id_specified'] = "îöèòø, àê îùúîù æä àéðå ÷ééí";
$lang['Wrong_Profile'] = "àéðê éëåì ìòøåê ôøåôéì ùàéðå ùìê.";
$lang['Only_one_avatar'] = "ø÷ ñåâ àçã ùì ñéîìåï éëåì ìäáçø";
$lang['File_no_data'] = "ä÷åáõ áëúåáú ùñéô÷ú ìà îëéì îéãò";
$lang['No_connection_URL'] = "ìà ðéúï ìáöò ÷ùø òí äëúåáú ùñéô÷ú";
$lang['Incomplete_URL'] = "äëúåáú ùñéô÷ú àéðä âîåøä";
$lang['Wrong_remote_avatar_format'] = "äëúåáú ùì äñîìåï äîøåç÷ àéðä çå÷éú";
$lang['No_send_account_inactive'] = "îöèòø, àê ìà ðéúï ì÷áì àú ñéñîúê ëé çùáåðê ìà ôòéì. àðà öåø ÷ùø òí îðäì äôåøåí ìòåã îéãò";
$lang['Always_smile'] = "úîéã àôùø ñîééìéí";
$lang['Always_html'] = "úîéã àôùø HTML";
$lang['Always_bbcode'] = "úîéã àôùø BBCode";
$lang['Always_add_sig'] = "úîéã öøó àú çúéîúé";
$lang['Always_notify'] = "úîéã äåãò ìé òì úâåáåú";
$lang['Always_notify_explain'] = "ùåìç ìê ãåà\"ì ëùîéùäå îâéá ìðåùà ùôéøñîú áå äåãòä. ðéúï ìùðåú æàú âí áæîï ôøñåí ääåãòä";
$lang['Board_style'] = "ñâðåï äìåç";
$lang['Board_lang'] = "ùôú äìåç";
$lang['No_themes'] = "àéï úîåú áîñã äðúåðéí";
$lang['Timezone'] = "àæåø æîï";
$lang['Date_format'] = "ñâðåï úàøéê";
$lang['Date_format_explain'] = "äúçáéø æää ìæä ùì ôåð÷öééú PHP <a href=\"http://www.php.net/date\" target=\"_other\">date()</a>";
$lang['Signature'] = "çúéîä";
$lang['Signature_explain'] = "æäå áìå÷ ùì è÷ñè ùéëåì ìäúååñó ìäåãòåú ùàúä ëåúá. éùðä äâáìä ì %d úåéí";
$lang['Public_view_email'] = "úîéã äöâ àú ëúåáú äãåà\"ì ùìé";
$lang['Current_password'] = "ñéñîä ðåëçéú";
$lang['New_password'] = "ñéñîä çãùä";
$lang['Confirm_password'] = "àéùåø ñéñîä";
$lang['Confirm_password_explain'] = "àúä çééá ìñô÷ àú ñéñîúê äðåëçéú àí áøöåðê ìòøåê àå ìùðåú àú ëúåáú äãåà\"ì ùìê";
$lang['password_if_changed'] = "àúä öøéê ìñô÷ ñéñîä ø÷ àí áøöåðê ìùðåú àåúä";
$lang['password_confirm_if_changed'] = "àúä öøéê ìàùø àú ñéñîúê ø÷ àí áøöåðê ìùðåú àåúä";
$lang['Avatar'] = "ñéîìåï";
$lang['Avatar_explain'] = "îöéâ úîåðä âøôéú ÷èðä îúçú ìôøèéí áäåãòåú. ø÷ úîåðä àçú éëåìä ìäéåú îåöâú áæîï ðúåï, äòåáé ùìä ìà éëåì ìòìåú òì %d ôé÷ñìéí, åäâåáä ìà éåúø î %d ôé÷ñìéí åâåãì ä÷åáõ ìà éåúø î %dkB.";
$lang['Upload_Avatar_file'] = "èòï ñéîìåï îäîçùá ùìê";
$lang['Upload_Avatar_URL'] = "èòï ñéîìåï îëúåáú àéðèøðè";
$lang['Upload_Avatar_URL_explain'] = "äæï àú ëúåáú äàéðèøðè äîëéìä àú úîåðú äñéîìåï, äéà úåòú÷ ìàúø æä.";
$lang['Pick_local_Avatar'] = "áçø ñéîìåï îäâìøééä";
$lang['Link_remote_Avatar'] = "÷ùø ìñéîìåï îçåõ ìàúø";
$lang['Link_remote_Avatar_explain'] = "äæï àú ëúåáú äàéðèøðè ùîëéìä àú äîé÷åí ùì äñéîìåï ùàìéå àúä øåöä ì÷ùø.";
$lang['Avatar_URL'] = "ëúåáú àéðèøðè ùì úîåðú ñéîìåï";
$lang['Select_from_gallery'] = "áçø ñéîìåï îäâìøéä";
$lang['View_avatar_gallery'] = "äöâ àú äâìøéä";
$lang['Select_avatar'] = "áçø ñéîìåï";
$lang['Return_profile'] = "áèì ñéîìåï";
$lang['Select_category'] = "áçø ÷èâåøéä";
$lang['Delete_Image'] = "îç÷ úîåðä";
$lang['Current_Image'] = "úîåðä ðåëçéú";
$lang['Notify_on_privmsg'] = "äåãò òì äåãòä ôøèéú çãùä";
$lang['Popup_on_privmsg'] = "ä÷ôõ çìåï áäåãòä ôøèéú çãùä";
$lang['Popup_on_privmsg_explain'] = "îñôø úáðéåú òùåéåú ìôúåç çìåï äîåãéò ìê ëàùø äåãòä ôøèéú çãùä îâéòä";
$lang['Hide_user'] = "äñúø àú îöá äçéáåø ùìê";
$lang['Profile_updated'] = "äôøåôéì ùìê òåãëï";
$lang['Profile_updated_inactive'] = "äôøåôéì ùìê òåãëï, àê ùéðéú àú äôøèéí äôðéîééí ùìê ìîøåú ùäçùáåï ùìê òëùéå ìà ôòéì. áãå÷ àú äãåà\"ì ùìê ëãé ìáãå÷ àéê ìäôòéì àú äçùáåï ùìê, àå àí ãøåù àéùåø îðäì çëä ùîðäì éôòéì ìê àú äçùáåï";
$lang['Password_mismatch'] = "äñéñîàåú ùäæðú àéð...
[truncated message content] |
|
From: Paul S. O. <ps...@us...> - 2002-04-19 22:37:42
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew/email In directory usw-pr-cvs1:/tmp/cvs-serv5102/email Log Message: Directory /cvsroot/phpbb/phpBB2/language/lang_hebrew/email added to the repository --> Using per-directory sticky tag `phpBB-2_0_0' |
|
From: Paul S. O. <ps...@us...> - 2002-04-19 22:37:35
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew In directory usw-pr-cvs1:/tmp/cvs-serv5040/lang_hebrew Log Message: Directory /cvsroot/phpbb/phpBB2/language/lang_hebrew added to the repository --> Using per-directory sticky tag `phpBB-2_0_0' |
|
From: Paul S. O. <ps...@us...> - 2002-04-19 22:36:49
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_hebrew
In directory usw-pr-cvs1:/tmp/cvs-serv4606/templates/subSilver/images/lang_hebrew
Removed Files:
Tag: phpBB-2_0_0
icon_icq.gif
Log Message:
wrong name
--- icon_icq.gif DELETED ---
|
|
From: Paul S. O. <ps...@us...> - 2002-04-19 22:36:41
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_hebrew
In directory usw-pr-cvs1:/tmp/cvs-serv4535/templates/subSilver/images/lang_hebrew
Added Files:
Tag: phpBB-2_0_0
icon_icq_add.gif
Log Message:
wrong name
--- NEW FILE ---
GIF89a;
£ÄÕFõFÿÿÿÿÿ±R¸ééé½½»=
©îîîlÉÄÉ
#&2!/j +
<#
-
¥¦'¨©'¬h
4%4#`8 ±
(PÈ á
|T¤ò¼Ú¯ç¾
>§øýÙ
4´VγùÞçÔÃÿö ¦ 8lHpÀ¾½{÷0ÚÃO¿¾ýûøëë0ÏGÿÿ
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_hebrew
In directory usw-pr-cvs1:/tmp/cvs-serv3792
Added Files:
Tag: phpBB-2_0_0
icon_aim.gif icon_edit.gif icon_email.gif icon_icq.gif
icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif
icon_quote.gif icon_search.gif icon_www.gif icon_yim.gif
msg_newpost.gif post.gif reply-locked.gif reply.gif
Log Message:
Initial version by dolfin
--- NEW FILE ---
GIF89a;
$//¦w( $%ÀÁÂÂäÅ * #!
,ø8Á 9(
¨Txg
«$ÈH >yZÐmC7àÁô1@Ã
dø1 j µäDôC ñ
/ZPjn]»íâÐê» PpÁð`Ja À=a
--- NEW FILE ---
GIF89a;
5636+- $+ Ú,ß<
3îî Æ{
8.¯/6S3pXCÄbÂ&ð( %HX(¡À f(ب`A±@ØHq¯$5]°
fàV¸
ÞQÇ vØ¡A
--- NEW FILE ---
GIF89a;
eX- ;X6-«f ®¯ ²`¦ 32X4 55
f#7Ì°¯³Ò`'7*c
¤ 3f/$ê7# $®="6ú$ÜxÍA htó±!A
R,0Hq Ü9G ð
.À¡Ë3°Ax ,ØÙ!¢ ÿ·\é! BHà·` 7bÐ@Õ& h}Ó +<(PA³Xtbh³$!«Zµ$J¬ñ²&< A pà® ¶C 4$àâÂ4j1p Ë;Rô¡
Ø6° ß<°F$fÍzæÁÀºìFÚ9t~Ù°ð'àÂ@Ï
ø
®A
--- NEW FILE ---
GIF89a;
£ÄÕFõFÿÿÿÿÿ±R¸ééé½½»=
©îîîlÉÄÉ
#&2!/j +
<#
-
¥¦'¨©'¬h
4%4#`8 ±
(PÈ á
|T¤ò¼Ú¯ç¾
>§øýÙ
4´VγùÞçÔÃÿö ¦ 8lHpÀ¾½{÷0ÚÃO¿¾ýûøëë0ÏGÿÿ
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a;
%< b+ =7¯¡³¡ b<=9
8
$b(pà)Ã.`B¢ò,L` C
jp0vÃPhãe!#Àº8ȼy@Z½Põ¨
| ¡ Q1(
iP¡¿ÿþü àhàC~sÄáà¾!D
--- NEW FILE ---
GIF89a;
$"¡
?
4 »6¡£Ä§¯È®ËÌ
y2 Õ8«
t8í%
V¼
6á$&
--- NEW FILE ---
GIF89a;
# 1( ?l
!.6§ ª« ® )9omo$ ¨¬«¯Ã$j !2&Ï2='-Ø),1Õ , '6 Ø
0é(ÆóÉ9û4
<
P@° wkÏÕ¨
£é jÔ°áO
Ú-bHÞ¸ºrøö #;è OÎ
--- NEW FILE ---
GIF89a;
%* f(À0c_i
L8X, u#SÈÀ 7èÍ@. \(°
8pQÀ@`àHóM&"â Ãá 48ã©P¨ À"@ oâ$ÀµkwÆ ¨£B°/m
--- NEW FILE ---
GIF89a;
È`ãÆ 2l`Ð# ê|¨ B¯ÞBìÐÐCÑ¡^LpaÔ¤¾apááG
Âíù3OÐ:@%UªÚÊ}[!B« d0 0çcÃlÀç:³%¨a W® ýh(A 0ü¹`VƱ. MØp(
;à"÷àÜ2Äð±
¸eµa°
¤I¾¡ËZÖ®:ä¼3pààСo
--- NEW FILE ---
GIF89a;
9**-%¾ãå0çÁ "&/$$". * $ ðÀþJ¨HáÜ9L lrpðÀ<*4ó4l<|KPØ0:øs1°DD&ÌØIQÝ æv6lÌ@â£
èâÅÂ,¬Áh(ÍÃ
äÔ¹³«
¯= XQ`Ç
!¦8´T/róÐ!¢4 7T¤º³ó«ß¯ ÙeEO|èÀ£Ü$P Å3°%øP"¿CîI
FT
Ã-S#GÜÚÕëßëdz.1
¢O q:æê3®ÖÎþx
--- NEW FILE ---
GIF89a;
d
¤º» ½½&q*¡)V8$$ $ ¡ # #Ã#Ù #-¾ å1q£ 5{4 7Ð!7¡#ûF0 áC/
Ð!Cÿ =»ÐãåNÞ`4A ¦0^6:uÁ $hB'0¾@¡Ä ãÈAhà"B'ì0âÀ ,ØË×ÆÕ Ntè
(¡8`* àÀ vè
--- NEW FILE ---
GIF89aR
> büiÜ(£Ç
DêÌÀ3à ! x0E!Ç£
³cGÝR 3¦iÌQ¡ÿD c' »mÄ´¡1F1mÐíEgÍÁ :g à [!G¦°E]JIÈñÇ b0ÅùíÚR¿±Ah)-h NÝÂ@êÔ&" 72¿;DAÓ¡wï/ªL0.ÊxÊ7*L `Dï
Ê+¡J PXèôA@+°±Á5ø \@^l Åh H) ðA H0
ðÀ8< ÀN
¬BX@³'Ð
[´@B
--- NEW FILE ---
GIF89aR
sÎaîDôéR ¬±ÄJ#KÄФ æ1ÿ!,Rl×F@ 6mèJ3â@°0ÀL´
j7A¼¡$Ð VȺð
0¡ gØB.,$|
--- NEW FILE ---
GIF89aR
1éÒ¥Mÿ%KÀMe
#F¶ÈVb :aÑl°Ø=¤ =&0qÒCÁ } ù`à-Ó¦ ç ÍOp Áwï^"
¸A
âq âÊã®à ®¸fÈ 0, @P
4®B]ôק¹¼ 4 ï¾ÓYç(Á öÜ CA
@Ä0 !V !ì(s`8$®øâ94î¸ã)D.ùäWnyÆB
$hÃüAÅ dT :< úꬷîºê$Ä.ûì´×nûí@ÈÀ
--- NEW FILE ---
GIF89aR
å°Óå®5yò(ÀÐEA ®S@L `¸qÌ@SîÆDP!(%dÈ âL EJY¨aA1[qGݺ#Ib3åÊ£)RPð ãBRcÜfv謱+dP¡L,ziÒ
h7TØáÂÃ
RÿjP²!E
Ät©1ÀG1¡D
²Ä$Ô®¹Ä
I
%Ʀ,["i
%ÒnÐÀY
%Eõ¼Ë"x¤Pc¢Z4mfìf \haÀ@,H
\=ûd /@Bù?P£)`
Iì°ÃlL@ÅMtæÄvÚ-
Â
5
d@ 8pÇÉ)ß!#<
WȺð = BZ@ f¢ 7ÈA[Àà úð@ ¢HD ÚÁ; !
|
7 messages has been excluded from this view by a project administrator.
