From 308bd4a93bf941c5743a47b0009529833573bb0b Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 17 May 2001 16:37:45 +0000 Subject: [PATCH] Changed the allow/disallow fields to match the profile template git-svn-id: file:///svn/phpbb/trunk@313 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/db/mysql_schema.sql | 50 ++++++++++++++++----------------- phpBB/db/postgres_schema.sql | 50 ++++++++++++++++----------------- phpBB/language/lang_english.php | 6 ++-- phpBB/profile.php | 20 ++++++------- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql index 011b241910..0114912e9b 100644 --- a/phpBB/db/mysql_schema.sql +++ b/phpBB/db/mysql_schema.sql @@ -267,30 +267,30 @@ CREATE TABLE phpbb_themes ( themes_name varchar(30) NOT NULL, head_stylesheet varchar(100), body_background varchar(100), - body_bgcolor varchar(6), - body_text varchar(6), - body_link varchar(6), - body_vlink varchar(6), - body_alink varchar(6), - body_hlink varchar(6), - tr_color1 varchar(6), - tr_color2 varchar(6), - tr_color3 varchar(6), - th_color1 varchar(6), - th_color2 varchar(6), - th_color3 varchar(6), - td_color1 varchar(6), - td_color2 varchar(6), - td_color3 varchar(6), - fontface1 varchar(15), - fontface2 varchar(15), - fontface3 varchar(15), + body_bgcolor char(6), + body_text char(6), + body_link char(6), + body_vlink char(6), + body_alink char(6), + body_hlink char(6), + tr_color1 char(6), + tr_color2 char(6), + tr_color3 char(6), + th_color1 char(6), + th_color2 char(6), + th_color3 char(6), + td_color1 char(6), + td_color2 char(6), + td_color3 char(6), + fontface1 varchar(30), + fontface2 varchar(30), + fontface3 varchar(30), fontsize1 tinyint(4), fontsize2 tinyint(4), fontsize3 tinyint(4), - fontcolor1 varchar(6), - fontcolor2 varchar(6), - fontcolor3 varchar(6), + fontcolor1 char(6), + fontcolor2 char(6), + fontcolor3 char(6), img1 varchar(100), img2 varchar(100), img3 varchar(100), @@ -384,16 +384,16 @@ CREATE TABLE phpbb_users ( user_from varchar(100), user_interests varchar(255), user_sig varchar(255), - user_viewemail tinyint(3), user_theme int(11), user_aim varchar(255), user_yim varchar(255), user_msnm varchar(255), user_posts int(11) DEFAULT '0', + user_viewemail tinyint(3), user_attachsig tinyint(3), - user_desmile tinyint(3), - user_html tinyint(3), - user_bbcode tinyint(3), + user_allowhtml tinyint(3), + user_allowbbcode tinyint(3), + user_allowsmile tinyint(3), user_actkey varchar(32), user_newpasswd varchar(32), user_notify tinyint(3), diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql index 1972cdaaf5..64bf351b66 100644 --- a/phpBB/db/postgres_schema.sql +++ b/phpBB/db/postgres_schema.sql @@ -290,30 +290,30 @@ CREATE TABLE "phpbb_themes" ( "themes_name" varchar(30), "head_stylesheet" varchar(100), "body_background" varchar(100), - "body_bgcolor" varchar(6), - "body_text" varchar(6), - "body_link" varchar(6), - "body_vlink" varchar(6), - "body_alink" varchar(6), - "body_hlink" varchar(6), - "tr_color1" varchar(6), - "tr_color2" varchar(6), - "tr_color3" varchar(6), - "th_color1" varchar(6), - "th_color2" varchar(6), - "th_color3" varchar(6), - "td_color1" varchar(6), - "td_color2" varchar(6), - "td_color3" varchar(6), - "fontface1" varchar(15), - "fontface2" varchar(15), - "fontface3" varchar(15), + "body_bgcolor" char(6), + "body_text" char(6), + "body_link" char(6), + "body_vlink" char(6), + "body_alink" char(6), + "body_hlink" char(6), + "tr_color1" char(6), + "tr_color2" char(6), + "tr_color3" char(6), + "th_color1" char(6), + "th_color2" char(6), + "th_color3" char(6), + "td_color1" char(6), + "td_color2" char(6), + "td_color3" char(6), + "fontface1" varchar(30), + "fontface2" varchar(30), + "fontface3" varchar(30), "fontsize1" int2, "fontsize2" int2, "fontsize3" int2, - "fontcolor1" varchar(6), - "fontcolor2" varchar(6), - "fontcolor3" varchar(6), + "fontcolor1" char(6), + "fontcolor2" char(6), + "fontcolor3" char(6), "img1" varchar(100), "img2" varchar(100), "img3" varchar(100), @@ -399,16 +399,16 @@ CREATE TABLE "phpbb_users" ( "user_from" varchar(100), "user_interests" varchar(255), "user_sig" varchar(255), - "user_viewemail" int2, "user_theme" int4, "user_aim" varchar(255), "user_yim" varchar(255), "user_msnm" varchar(255), "user_posts" int4 DEFAULT '0', + "user_viewemail" int2, "user_attachsig" int2, - "user_desmile" int2, - "user_html" int2, - "user_bbcode" int2, + "user_allowhtml" int2, + "user_allowbbcode" int2, + "user_allowsmile" int2, "user_rank" int4 DEFAULT '0', "user_avatar" varchar(100), "user_level" int4 DEFAULT '1', diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index c3ebaa2df5..36dcf2fb61 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -299,9 +299,9 @@ $l_editprefs = "Edit Your $l_preferences"; $l_themecookie = "NOTE: In order to use themes you MUST have cookies enabled."; $l_alwayssig = "Always attach my signature"; $l_alwaysdisable= "Always disable"; // Only used for next three strings -$l_alwayssmile = "$l_alwaysdisable $l_smilies"; -$l_alwayshtml = "$l_alwaysdisable $l_html"; -$l_alwaysbbcode = "$l_alwaysdisable $l_bbcode"; +$l_alwayssmile = "Always allow $l_smilies"; +$l_alwayshtml = "Always allow $l_html"; +$l_alwaysbbcode = "Always allow $l_bbcode"; $l_boardtheme = "Board Theme"; $l_boardlang = "Board Language"; $l_nothemes = "No Themes In database"; diff --git a/phpBB/profile.php b/phpBB/profile.php index 76daf354b6..2bf1c1032f 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -395,7 +395,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) { $sql = "UPDATE ".USERS_TABLE." - SET username = '$username'".$passwd_sql.", user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occ', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_desmile = $allowsmilies, user_html = $allowhtml, user_bbcode = $allowbbcode, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_template = '$user_template', user_theme = $user_theme + SET username = '$username'".$passwd_sql.", user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occ', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_template = '$user_template', user_theme = $user_theme WHERE user_id = $user_id"; if($result = $db->sql_query($sql)) @@ -444,9 +444,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $viewemail = $userdata['user_viewemail']; $attachsig = $userdata['user_attachsig']; - $allowhtml = $userdata['user_html']; - $allowbbcode = $userdata['user_bbcode']; - $allowsmilies = $userdata['user_desmile']; + $allowhtml = $userdata['user_allowhtml']; + $allowbbcode = $userdata['user_allowbbcode']; + $allowsmilies = $userdata['user_allowsmile']; $user_theme = $userdata['user_theme']; $user_lang = $userdata['user_lang']; @@ -557,11 +557,11 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(addslashes($HTTP_POST_VARS['interests'])) : ""; $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(addslashes($HTTP_POST_VARS['signature'])) : ""; - $viewemail = $HTTP_POST_VARS['viewemail']; - $attachsig = $HTTP_POST_VARS['attachsig']; - $allowhtml = $HTTP_POST_VARS['allowhtml']; - $allowbbcode = $HTTP_POST_VARS['allowbbcode']; - $allowsmilies = $HTTP_POST_VARS['allowsmilies']; + $viewemail = (!empty($HTTP_POST_VARS['viewemail'])) ? $HTTP_POST_VARS['viewemail'] : 0; + $attachsig = (!empty($HTTP_POST_VARS['attachsig'])) ? $HTTP_POST_VARS['attachsig'] : 0; + $allowhtml = (!empty($HTTP_POST_VARS['allowhtml'])) ? $HTTP_POST_VARS['allowhtml'] : 0; + $allowbbcode = (!empty($HTTP_POST_VARS['allowbbcode'])) ? $HTTP_POST_VARS['allowbbcode'] : 1; + $allowsmilies = (!empty($HTTP_POST_VARS['allowsmilies'])) ? $HTTP_POST_VARS['allowsmilies'] : 1; $user_theme = ($HTTP_POST_VARS['theme']) ? $HTTP_POST_VARS['theme'] : $board_config['default_theme']; $user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; @@ -666,7 +666,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $md_pass = md5($password); $sql = "INSERT INTO ".USERS_TABLE." - (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_desmile, user_html, user_bbcode, user_timezone, user_dateformat, user_lang, user_template, user_theme, user_active, user_actkey) + (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_timezone, user_dateformat, user_lang, user_template, user_theme, user_active, user_actkey) VALUES ($new_user_id, '$username', '$regdate', '$md_pass', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$viewemail', '$aim', '$yim', '$msn', $attachsig, $allowsmilies, '$allowhtml', $allowbbcode, $user_timezone, '$user_dateformat', '$user_lang', '$user_template', $user_theme, "; if($require_activation || $coppa == 1)