diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-10-04 21:57:08 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-10-04 21:57:08 +0000 |
| commit | 7dbb4fd6ecf442ade53874e832d71d158791c05e (patch) | |
| tree | 475176c221da59d174d0d43cad2619b2d41cf482 | |
| parent | 30aeac65dccceab18e19318e5981118f150c0647 (diff) | |
| download | forums-7dbb4fd6ecf442ade53874e832d71d158791c05e.tar forums-7dbb4fd6ecf442ade53874e832d71d158791c05e.tar.gz forums-7dbb4fd6ecf442ade53874e832d71d158791c05e.tar.bz2 forums-7dbb4fd6ecf442ade53874e832d71d158791c05e.tar.xz forums-7dbb4fd6ecf442ade53874e832d71d158791c05e.zip | |
Now this build can be installed without any error.
git-svn-id: file:///svn/phpbb/trunk@2924 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_basic.sql | 24 |
2 files changed, 10 insertions, 18 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 779244a32d..5639861ad1 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -193,7 +193,7 @@ class session { $sql = "INSERT INTO " . SESSIONS_TABLE . " (session_id, session_user_id, session_last_visit, session_start, session_time, session_ip, session_browser, session_page) - VALUES ('" . $this->session_id . "', $user_id, " . $userdata['user_lastvisit'] . ", $current_time, $current_time, '$user_ip', '$this->browser', '$this->page')"; + VALUES ('" . $this->session_id . "', $user_id, " . intval($userdata['user_lastvisit']) . ", $current_time, $current_time, '$user_ip', '$this->browser', '$this->page')"; $db->sql_query($sql); } $db->sql_return_on_error(false); @@ -229,7 +229,7 @@ class session { // Delete existing session, update last visit info first! $sql = "UPDATE " . USERS_TABLE . " - SET user_lastvisit = " . $userdata['session_time'] . ", user_session_page = '" . $userdata['session_page'] . "' + SET user_lastvisit = " . intval($userdata['session_time']) . ", user_session_page = '" . $userdata['session_page'] . "' WHERE user_id = " . $userdata['user_id']; $db->sql_query($sql); diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql index 6bb4065264..53a9482c29 100644 --- a/phpBB/install/schemas/mysql_basic.sql +++ b/phpBB/install/schemas/mysql_basic.sql @@ -25,7 +25,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_lang','english'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0'); @@ -57,8 +56,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_last_gc', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '4'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.0 [20020926]'); - +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.0 [20021004]'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255'); @@ -87,8 +85,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.0 [20021004]'); - # -- auth options INSERT INTO phpbb_auth_options (auth_value) VALUES ('forum_list'); INSERT INTO phpbb_auth_options (auth_value) VALUES ('forum_read'); @@ -151,12 +147,8 @@ INSERT INTO phpbb_styles_template (template_id, template_name, template_path, po INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'th { background-image: url(templates/subSilver/images/cellpic3.gif) }\r\ntd.cat { background-image: url(templates/subSilver/images/cellpic1.gif) }\r\ntd.rowpic { background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }\r\ntd.icqback { background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }\r\ntd.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }\r\nth.thTop { background-image: url(templates/subSilver/images/cellpic3.gif) }', 'subSilver/subSilver.css'); -# -- Categories -INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10); - - # -- Forums -INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 10, 1, 1, 1); +INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, left_id, right_id, parent_id, forum_posts, forum_topics, forum_last_post_id) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 2, 0, 1, 1, 1); # -- Users @@ -187,14 +179,14 @@ INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (5, 2, 0); # -- User auth # -- Group auth -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 1, auth_option_id, 4 FROM phpbb_auth_options WHERE auth_type IN ('forum') AND auth_option IN ('list', 'read', 'post', 'reply'); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 8 FROM phpbb_auth_options WHERE auth_type IN ('forum'); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 5, 0, auth_option_id, 8 FROM phpbb_auth_options WHERE auth_type IN ('admin'); +INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 1, auth_option_id, 4 FROM phpbb_auth_options WHERE auth_value IN ('forum_list', 'forum_read', 'forum_post', 'forum_reply'); +INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 8 FROM phpbb_auth_options WHERE auth_value LIKE 'forum%'; +INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 5, 0, auth_option_id, 8 FROM phpbb_auth_options WHERE auth_value LIKE 'admin%'; # -- Prefetch auth -INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT -1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type LIKE 'forum' AND auth_option IN ('list', 'read', 'post', 'reply'); -INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('admin'); -INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('forum_mod'); +INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT -1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('forum_list', 'forum_read', 'forum_post', 'forum_reply'); +INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value LIKE 'admin%'; +INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value LIKE 'forum_mod%'; # -- Demo Topic |