Yoshihisa Fukuhara
higef****@users*****
2006年 5月 19日 (金) 02:23:37 JST
Index: affelio/apps/bb/bb.pm
diff -u affelio/apps/bb/bb.pm:1.10 affelio/apps/bb/bb.pm:1.11
--- affelio/apps/bb/bb.pm:1.10 Wed May 17 11:30:32 2006
+++ affelio/apps/bb/bb.pm Fri May 19 02:23:37 2006
@@ -275,8 +275,8 @@
##############################################
sub sendBbMail {
my ($self,$msg,$msg_title) = @_;
- my $mailto = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'email'");
- my $bb_title = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'title'");
+ my $mailto = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key1 = 'email'");
+ my $bb_title = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key1 = 'title'");
Affelio::NetLib::Email::send_email($self->{afap}->{af}->{cmd__sendmail}, "$self->{afap}->{af}->{user__email1}", "$self->{uname}", $mailto, "$self->{uname}/$bb_title/$msg_title", "$msg", "", "", "ja");
}
@@ -475,8 +475,8 @@
############################################################################
sub checkContent {
my ($self, $title, $user, $afid, $description, $icon, $pwd) = @_;
- my $max_sbjlen = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'max_sbjlen'");
- my $max_textlen = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key = 'max_textlen'");
+ my $max_sbjlen = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key1 = 'max_sbjlen'");
+ my $max_textlen = $self->getColumn("SELECT value FROM $self->{pref_tb} WHERE key1 = 'max_textlen'");
$self->errorExit('<AF_M text="Too long title.">') if (length($title)>int($max_sbjlen));
$self->errorExit('<AF_M text="Too long content.">') if (length($description)>int($max_textlen));
$self->errorExit('<AF_M text="Too long nickname.">') if (length($user)>16);
@@ -534,9 +534,7 @@
user TEXT,
afid TEXT,
last_user TEXT,
- last_afid TEXT,
- lock INTEGER,
- ord INTEGER";
+ last_afid TEXT, locked INTEGER, ord INTEGER";
$self->{dbh}->do("CREATE TABLE $self->{category_tb} ($query)");
@@ -555,7 +553,7 @@
topics INTEGER,
posts INTEGER,
status INTEGER,
- lock INTEGER,
+ locked INTEGER,
ord INTEGER";
$self->{dbh}->do("CREATE TABLE $self->{forum_tb} ($query)");
@@ -574,23 +572,23 @@
view INTEGER,
posts INTEGER,
status INTEGER,
- lock INTEGER,
+ locked INTEGER,
timestamp INTEGER,
update_time INTEGER";
$self->{dbh}->do("CREATE TABLE $self->{topic_tb} ($query)");
#general setting table
- $query="key TEXT,value TEXT";
+ $query="key1 TEXT,value TEXT";
$self->{dbh}->do("CREATE TABLE $self->{pref_tb} ($query)");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('title', '$self->{header_title}')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_topics', '300')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_comments', '1000')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_topics', '50')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('num_comments', '50')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_sbjlen', '256')");
- $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key, value) VALUES ('max_textlen', '2000')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('title', '$self->{header_title}')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('max_topics', '300')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('max_comments', '1000')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('num_topics', '50')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('num_comments', '50')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('max_sbjlen', '256')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_tb} (key1, value) VALUES ('max_textlen', '2000')");
#SPAM keywords table
$query="spam_id INTEGER".get_query_primarykey($self)."
@@ -598,22 +596,22 @@
$self->{dbh}->do("CREATE TABLE $self->{spam_tb} ($query)");
#permission setting table
- $query="key TEXT, super BOOLEAN, user BOOLEAN";
+ $query="key1 TEXT, super BOOLEAN, user BOOLEAN";
$self->{dbh}->do("CREATE TABLE $self->{permission_tb} ($query)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_edit', 0,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_delete', 0,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('category_status', 0,0)");
-
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_edit', 1,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_delete', 0,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('forum_status', 0,0)");
-
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_edit', 1,1)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_delete', 1,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('topic_status', 1,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('category_edit', 0,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('category_delete', 0,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('category_status', 0,0)");
+
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('forum_edit', 1,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('forum_delete', 0,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('forum_status', 0,0)");
+
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('topic_edit', 1,1)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('topic_delete', 1,0)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('topic_status', 1,0)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('comment_edit', 1,1)");
- $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key, super, user) VALUES ('comment_delete', 1,1)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('comment_edit', 1,1)");
+ $self->{dbh}->do("INSERT INTO $self->{permission_tb} (key1, super, user) VALUES ('comment_delete', 1,1)");
}
@@ -626,9 +624,9 @@
if ($self->{afap}->get_visitor_info("type") eq "self"){
return 1;
}elsif ($self->{afap}->check_access("super")) {
- return 1 if ($self->getColumn("SELECT super FROM $self->{permission_tb} WHERE key = '$key'"));
+ return 1 if ($self->getColumn("SELECT super FROM $self->{permission_tb} WHERE key1 = '$key'"));
}elsif ($self->{afap}->check_access("user")) {
- return 1 if ($self->getColumn("SELECT user FROM $self->{permission_tb} WHERE key = '$key'"));
+ return 1 if ($self->getColumn("SELECT user FROM $self->{permission_tb} WHERE key1 = '$key'"));
}else{
return 0;
}