firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc5

Browse Source
This commit is contained in:
gnuboard
2013-10-15 17:58:11 +09:00
parent 7806eecc0e 64dad25ff3
commit dcbe989340
144 changed files with 3181 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
adm/config_form.php
View File

@ -25,19 +25,22 @@ if (!isset($config['cf_mobile_new_skin'])) {
ADD `cf_mobile_member_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_connect_skin` ", true);
}
if(!isset($config['cf_gcaptcha_mp3'])) {
if (isset($config['cf_gcaptcha_mp3'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
CHANGE `cf_gcaptcha_mp3` `cf_captcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' ", true);
} else if (!isset($config['cf_captcha_mp3'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_captcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
}
if(!isset($config['cf_editor'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_editor` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
ADD `cf_editor` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_captcha_mp3` ", true);
}
if(!isset($config['cf_googl_shorturl_apikey'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_googl_shorturl_apikey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
ADD `cf_googl_shorturl_apikey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_captcha_mp3` ", true);
}
if(!isset($config['cf_mobile_pages'])) {
@ -340,15 +343,15 @@ $pg_anchor = '<ul class="anchor">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_gcaptcha_mp3">음성캡챠 선택<strong class="sound_only">필수</strong></label></th>
<th scope="row"><label for="cf_captcha_mp3">음성캡챠 선택<strong class="sound_only">필수</strong></label></th>
<td colspan="3">
<?php echo help(G5_GCAPTCHA_URL.'/mp3 밑의 음성 폴더를 선택합니다.') ?>
<select name="cf_gcaptcha_mp3" id="cf_gcaptcha_mp3" required class="required">
<?php echo help(G5_CAPTCHA_URL.'/mp3 밑의 음성 폴더를 선택합니다.') ?>
<select name="cf_captcha_mp3" id="cf_captcha_mp3" required class="required">
<?php
$arr = get_skin_dir('mp3', G5_GCAPTCHA_PATH);
$arr = get_skin_dir('mp3', G5_CAPTCHA_PATH);
for ($i=0; $i<count($arr); $i++) {
if ($i == 0) echo "<option value=\"\">선택</option>";
echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_gcaptcha_mp3'], $arr[$i]).">".$arr[$i]."</option>\n";
echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_captcha_mp3'], $arr[$i]).">".$arr[$i]."</option>\n";
}
?>
</select>

2
adm/config_form_update.php
View File

@ -107,7 +107,7 @@ $sql = " update {$g5['config_table']}
cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
cf_gcaptcha_mp3 = '{$_POST['cf_gcaptcha_mp3']}',
cf_captcha_mp3 = '{$_POST['cf_captcha_mp3']}',
cf_editor = '{$_POST['cf_editor']}',
cf_cert_use = '{$_POST['cf_cert_use']}',
cf_cert_ipin = '{$_POST['cf_cert_ipin']}',

8
adm/shop_admin/categoryform.php
View File

@ -61,8 +61,8 @@ if ($w == "")
$ca['ca_mobile_list_row'] = 3;
$ca['ca_stock_qty'] = 99999;
}
$ca['ca_skin'] = "list.skin.10.php";
$ca['ca_mobile_skin'] = "list.skin.10.php";
$ca['ca_skin'] = "list.10.skin.php";
$ca['ca_mobile_skin'] = "list.10.skin.php";
}
else if ($w == "u")
{
@ -163,7 +163,7 @@ $pg_anchor .= '</ul>';
<td>
<?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', G5_SHOP_SKIN_PATH).'/list.*.skin.php 입니다.'); ?>
<select id="ca_skin" name="ca_skin">
<?php echo get_list_skin_options("^list.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $ca['ca_skin']); ?>
<?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $ca['ca_skin']); ?>
</select>
</td>
</tr>
@ -172,7 +172,7 @@ $pg_anchor .= '</ul>';
<td>
<?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', G5_MSHOP_SKIN_PATH).'/list.*.skin.php 입니다.'); ?>
<select id="ca_mobile_skin" name="ca_mobile_skin">
<?php echo get_list_skin_options("^list.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $ca['ca_mobile_skin']); ?>
<?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $ca['ca_mobile_skin']); ?>
</select>
</td>
</tr>

2
adm/shop_admin/categorylist.php
View File

@ -168,7 +168,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<td>
<label for="ca_skin<?php echo $i; ?>" class="sound_only">출력스킨</label>
<select id="ca_skin<?php echo $i; ?>" name="ca_skin[<?php echo $i; ?>]">
<?php echo get_list_skin_options("^list.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $row['ca_skin']); ?>
<?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $row['ca_skin']); ?>
</select>
</td>
<td class="td_mng" rowspan="2">

20
adm/shop_admin/configform.php
View File

@ -226,7 +226,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_type1_list_use" value="1" id="de_type1_list_use" <?php echo $default['de_type1_list_use']?"checked":""; ?>>
<label for="de_type1_list_skin">스킨</label>
<select name="de_type1_list_skin" id="de_type1_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type1_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type1_list_skin']); ?>
</select>
<label for="de_type1_list_row">출력할 줄 수</label>
<input type="text" name="de_type1_list_row" value="<?php echo $default['de_type1_list_row']; ?>" id="de_type1_list_row" class="frm_input" size="3">
@ -245,7 +245,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_type2_list_use" value="1" id="de_type2_list_use" <?php echo $default['de_type2_list_use']?"checked":""; ?>>
<label for="de_type2_list_skin">스킨</label>
<select name="de_type2_list_skin" id="de_type2_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type2_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type2_list_skin']); ?>
</select>
<label for="de_type2_list_row">출력할 줄 수</label>
<input type="text" name="de_type2_list_row" value="<?php echo $default['de_type2_list_row']; ?>" id="de_type2_list_row" class="frm_input" size="3">
@ -264,7 +264,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_type3_list_use" value="1" id="de_type3_list_use" <?php echo $default['de_type3_list_use']?"checked":""; ?>>
<label for="de_type3_list_skin">스킨</label>
<select name="de_type3_list_skin" id="de_type3_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type3_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type3_list_skin']); ?>
</select>
<label for="de_type3_list_row">출력할 줄 수</label>
<input type="text" name="de_type3_list_row" value="<?php echo $default['de_type3_list_row']; ?>" id="de_type3_list_row" class="frm_input" size="3">
@ -283,7 +283,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_type4_list_use" value="1" id="de_type4_list_use" <?php echo $default['de_type4_list_use']?"checked":""; ?>>
<label for="de_type4_list_skin">스킨</label>
<select name="de_type4_list_skin" id="de_type4_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type4_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type4_list_skin']); ?>
</select>
<label for="de_type4_list_row">출력할 줄 수</label>
<input type="text" name="de_type4_list_row" value="<?php echo $default['de_type4_list_row']; ?>" id="de_type4_list_row" class="frm_input" size="3">
@ -302,7 +302,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_type5_list_use" value="1" id="de_type5_list_use" <?php echo $default['de_type5_list_use']?"checked":""; ?>>
<label for="de_type5_list_skin">스킨</label>
<select name="de_type5_list_skin" id="de_type5_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type5_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type5_list_skin']); ?>
</select>
<label for="de_type5_list_row">출력할 줄 수</label>
<input type="text" name="de_type5_list_row" value="<?php echo $default['de_type5_list_row']; ?>" id="de_type5_list_row" class="frm_input" size="3">
@ -344,7 +344,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_mobile_type1_list_use" value="1" id="de_mobile_type1_list_use" <?php echo $default['de_mobile_type1_list_use']?"checked":""; ?>>
<label for="de_mobile_type1_list_skin">스킨</label>
<select name="de_mobile_type1_list_skin" id="de_mobile_type1_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type1_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type1_list_skin']); ?>
</select>
<label for="de_mobile_type1_list_mod">출력할 이미지 수</label>
<input type="text" name="de_mobile_type1_list_mod" value="<?php echo $default['de_mobile_type1_list_mod']; ?>" id="de_mobile_type1_list_mod" class="frm_input" size="3">
@ -360,7 +360,7 @@ $pg_anchor = '<ul class="anchor">
<label for="de_mobile_type2_list_use">출력</label> <input type="checkbox" name="de_mobile_type2_list_use" value="1" id="de_mobile_type2_list_use" <?php echo $default['de_mobile_type2_list_use']?"checked":""; ?>>
<label for="de_mobile_type2_list_skin">스킨 </label>
<select name="de_mobile_type2_list_skin" id="de_mobile_type2_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type2_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type2_list_skin']); ?>
</select>
<label for="de_mobile_type2_list_mod">출력할 이미지 수</label>
<input type="text" name="de_mobile_type2_list_mod" value="<?php echo $default['de_mobile_type2_list_mod']; ?>" id="de_mobile_type2_list_mod" class="frm_input" size="3">
@ -377,7 +377,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_mobile_type3_list_use" value="1" id="de_mobile_type3_list_use" <?php echo $default['de_mobile_type3_list_use']?"checked":""; ?>>
<label for="de_mobile_type3_list_skin">스킨</label>
<select name="de_mobile_type3_list_skin" id="de_mobile_type3_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type3_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type3_list_skin']); ?>
</select>
<label for="de_mobile_type3_list_mod">출력할 이미지 수</label>
<input type="text" name="de_mobile_type3_list_mod" value="<?php echo $default['de_mobile_type3_list_mod']; ?>" id="de_mobile_type3_list_mod" class="frm_input" size="3">
@ -394,7 +394,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_mobile_type4_list_use" value="1" id="de_mobile_type4_list_use" <?php echo $default['de_mobile_type4_list_use']?"checked":""; ?>>
<label for="de_mobile_type4_list_skin">스킨</label>
<select name="de_mobile_type4_list_skin" id="de_mobile_type4_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type4_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type4_list_skin']); ?>
</select>
<label for="de_mobile_type4_list_mod">출력할 이미지 수</label>
<input type="text" name="de_mobile_type4_list_mod" value="<?php echo $default['de_mobile_type4_list_mod']; ?>" id="de_mobile_type4_list_mod" class="frm_input" size="3">
@ -411,7 +411,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="de_mobile_type5_list_use" value="1" id="de_mobile_type5_list_use" <?php echo $default['de_mobile_type5_list_use']?"checked":""; ?>>
<label for="de_mobile_type5_list_skin">스킨</label>
<select id="de_mobile_type5_list_skin" name="de_mobile_type5_list_skin">
<?php echo get_list_skin_options("^main.[^\.]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type5_list_skin']); ?>
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $default['de_mobile_type5_list_skin']); ?>
</select>
<label for="de_mobile_type5_list_mod">출력할 이미지 수</label>
<input type="text" name="de_mobile_type5_list_mod" value="<?php echo $default['de_mobile_type5_list_mod']; ?>" id="de_mobile_type5_list_mod" class="frm_input" size="3">