diff --git a/.gitignore b/.gitignore index 2d7490ba7..ca766c016 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ g4s_tree itzimara* nemoluv* cheditor* +*.key diff --git a/adm/board_form.php b/adm/board_form.php index eb2e275be..dcbb6b4e3 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -54,21 +54,25 @@ if (!isset($board['bo_use_sns'])) { $result = sql_query(" select bo_table from `{$g4['board_table']}` "); for ($i=0; $row=sql_fetch_array($result); $i++) { - sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` + sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` ADD `wr_facebook_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_ip`, ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user`, ADD `wr_me2day_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_twitter_user` ", false); } } -sql_query(" ALTER TABLE `{$g4['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' ", false); +$sql = " SHOW COLUMNS FROM `{$g4['board_table']}` WHERE field = 'bo_use_cert' "; +$row = sql_fetch($sql); +if(strpos($row['Type'], 'hp-') === false) { + sql_query(" ALTER TABLE `{$g4['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult','hp-cert','hp-adult') NOT NULL DEFAULT '' ", false); +} if (!isset($board['bo_use_list_file'])) { sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_list_file` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_list_view` ", false); $result = sql_query(" select bo_table from `{$g4['board_table']}` "); for ($i=0; $row=sql_fetch_array($result); $i++) { - sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` + sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` ADD `wr_file` TINYINT NOT NULL DEFAULT '0' AFTER `wr_datetime` ", false); } } @@ -600,15 +604,17 @@ $pg_anchor = '