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

Merge branch 'master' of github.com:gnuboard/g5 into g5

Browse Source
This commit is contained in:
chicpro
2014-07-28 11:39:09 +09:00
parent 5d1545dd2a 3c104111a0
commit 8705232ea3
13 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/qatail.php
View File

@ -8,7 +8,7 @@ if (G5_IS_MOBILE) {
} else { } else {
echo stripslashes($qaconfig['qa_mobile_content_tail']); echo stripslashes($qaconfig['qa_mobile_content_tail']);
if($qaconfig['qa_include_tail']) if($qaconfig['qa_include_tail'])
@include ($qaconfig['bo_include_tail']); @include ($qaconfig['qa_include_tail']);
else else
include ('./_tail.php'); include ('./_tail.php');
} }

2
bbs/write_update.php
View File

@ -361,7 +361,7 @@ if ($w == '' || $w == 'r') {
// 쓰기 포인트 부여 // 쓰기 포인트 부여
if ($w == '') { if ($w == '') {
if ($notice) { if ($notice) {
$bo_notice = $wr_id.",".$board['bo_notice']; $bo_notice = $wr_id.($board['bo_notice'] ? ",".$board['bo_notice'] : '');
sql_query(" update {$g5['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' "); sql_query(" update {$g5['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' ");
} }

2
common.php
View File

@ -35,7 +35,7 @@ function g5_path()
$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : ''; $port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
$http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://';
$user = str_replace(str_replace($document_root, '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']); $user = str_replace(str_replace($document_root, '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']);
$result['url'] = $http.$_SERVER['SERVER_NAME'].$port.$user.$root; $result['url'] = $http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']).$port.$user.$root;
return $result; return $result;
} }

4
mobile/skin/member/basic/register_form.skin.php
View File

@ -52,10 +52,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<tr> <tr>
<th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th> <th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
<td> <td>
<?php if ($w=="u" && $config['cf_cert_use']) { ?> <?php if ($config['cf_cert_use']) { ?>
<span class="frm_info">아이핀 본인확인 후에는 이름이 자동 입력되고 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되어 수동으로 입력할수 없게 됩니다.</span> <span class="frm_info">아이핀 본인확인 후에는 이름이 자동 입력되고 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되어 수동으로 입력할수 없게 됩니다.</span>
<?php } ?> <?php } ?>
<input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>"> <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php echo $readonly; ?> class="frm_input <?php echo $required ?> <?php echo $readonly ?>">
<?php <?php
if($config['cf_cert_use']) { if($config['cf_cert_use']) {
if($config['cf_cert_ipin']) if($config['cf_cert_ipin'])

6
plugin/editor/smarteditor2/editor.lib.php
View File

@ -38,7 +38,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
} }
$smarteditor_class = $is_dhtml_editor ? "smarteditor2" : ""; $smarteditor_class = $is_dhtml_editor ? "smarteditor2" : "";
$html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$smarteditor_class\" maxlength=\"65536\">$content</textarea>"; $html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$smarteditor_class\" maxlength=\"65536\" style=\"width:100%\">$content</textarea>";
$html .= "\n<span class=\"sound_only\">웹 에디터 끝</span>"; $html .= "\n<span class=\"sound_only\">웹 에디터 끝</span>";
return $html; return $html;
} }
@ -48,7 +48,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
function get_editor_js($id, $is_dhtml_editor=true) function get_editor_js($id, $is_dhtml_editor=true)
{ {
if ($is_dhtml_editor) { if ($is_dhtml_editor) {
return "var {$id}_editor_data = oEditors.getById['{$id}'].getIR();\noEditors.getById['{$id}'].exec('UPDATE_CONTENTS_FIELD', []);\n"; return "var {$id}_editor_data = oEditors.getById['{$id}'].getIR();\noEditors.getById['{$id}'].exec('UPDATE_CONTENTS_FIELD', []);\nif(jQuery.inArray(document.getElementById('{$id}').value.toLowerCase().replace(/^\s*|\s*$/g, ''), ['&nbsp;','<p>&nbsp;</p>','<p><br></p>','<div><br></div>','<p></p>','<br>','']) != -1){document.getElementById('{$id}').value='';}\n";
} else { } else {
return "var {$id}_editor = document.getElementById('{$id}');\n"; return "var {$id}_editor = document.getElementById('{$id}');\n";
} }
@ -59,7 +59,7 @@ function get_editor_js($id, $is_dhtml_editor=true)
function chk_editor_js($id, $is_dhtml_editor=true) function chk_editor_js($id, $is_dhtml_editor=true)
{ {
if ($is_dhtml_editor) { if ($is_dhtml_editor) {
return "if (!{$id}_editor_data || {$id}_editor_data == '&nbsp;' || {$id}_editor_data == '<p>&nbsp;</p>' || {$id}_editor_data == '<p><br></p>' || {$id}_editor_data == '<p></p>') { alert(\"내용을 입력해 주십시오.\"); oEditors.getById['{$id}'].exec('FOCUS'); return false; }\n"; return "if (!{$id}_editor_data || jQuery.inArray({$id}_editor_data.toLowerCase(), ['&nbsp;','<p>&nbsp;</p>','<p><br></p>','<p></p>','<br>']) != -1) { alert(\"내용을 입력해 주십시오.\"); oEditors.getById['{$id}'].exec('FOCUS'); return false; }\n";
} else { } else {
return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n"; return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
} }

4
plugin/editor/smarteditor2/js/smarteditor2.js
View File

@ -6852,7 +6852,9 @@ nhn.husky.SE_EditingArea_WYSIWYG = jindo.$Class({
var sContent, var sContent,
oNavigator = this.oApp.oNavigator, oNavigator = this.oApp.oNavigator,
bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만 tmp_htBrowser = jindo.$Agent().navigator(),
//bUnderIE11 = oNavigator.ie && document.documentMode < 11, // IE11미만
bUnderIE11 = oNavigator.ie && tmp_htBrowser.nativeVersion < 11, // IE11미만
sCursorHolder = bUnderIE11 ? "" : "<br>"; sCursorHolder = bUnderIE11 ? "" : "<br>";
if(this.oApp.applyConverter){ if(this.oApp.applyConverter){

2
plugin/editor/smarteditor2/js/smarteditor2.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js
View File

@ -32,7 +32,8 @@ nhn.husky.SE2M_AttachQuickPhoto = jindo.$Class({
*/ */
$ON_ATTACHPHOTO_OPEN_WINDOW : function(){ $ON_ATTACHPHOTO_OPEN_WINDOW : function(){
this.htPopupOption.sUrl = this.makePopupURL(); this.htPopupOption.sUrl = this.makePopupURL();
this.htPopupOption.sProperties = "left=0,top=0,width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no"; //this.htPopupOption.sProperties = "left=0,top=0,width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no";
this.htPopupOption.sProperties = "left="+(screen.width-640)/2+", top="+(screen.height-459)/2+",width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no";
this.oPopupWindow = this.oPopupMgr.openWindow(this.htPopupOption); this.oPopupWindow = this.oPopupMgr.openWindow(this.htPopupOption);

2
plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js
View File

@ -152,7 +152,7 @@ jQuery(function ($) {
_done : function(e, data){ _done : function(e, data){
var othis = this; var othis = this;
$.each(data.result.files, function (index, file) { $.each(data.result.files, function (index, file) {
if (file.url) { if (file.url && !file.error) {
var ret = othis.get_ratio( file.width, file.height ), var ret = othis.get_ratio( file.width, file.height ),
node = $(data.context.children()[index]), node = $(data.context.children()[index]),
size_text = file.width+" x "+file.height, size_text = file.width+" x "+file.height,

3
plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php
View File

@ -1086,6 +1086,9 @@ class UploadHandler
$image_width_height = $this->get_image_size($file_path); $image_width_height = $this->get_image_size($file_path);
$file->width = $image_width_height[0]; $file->width = $image_width_height[0];
$file->height = $image_width_height[1]; $file->height = $image_width_height[1];
} else { //로빈아빠님이 알려주심, 이미지 업로드 체크
unlink($file_path);
$file->error = $this->get_error_message('accept_file_types');
} }
} else { } else {
$file->size = $file_size; $file->size = $file_size;

10
plugin/jquery-ui/datepicker.php
View File

@ -1,14 +1,10 @@
<?php <?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
add_stylesheet('<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />', 0);
add_stylesheet('<link type="text/css" href="'.G5_PLUGIN_URL.'/jquery-ui/style.css">', 0);
?> ?>
<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />
<style>
.ui-datepicker { font:12px dotum; }
.ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year { width: 70px;}
.ui-datepicker-trigger { margin:0 0 -5px 2px; }
</style>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
<script> <script>
jQuery(function($){ jQuery(function($){

6
plugin/jquery-ui/style.css Normal file
View File

@ -0,0 +1,6 @@
@charset "utf-8";
.ui-datepicker { font:12px dotum; }
.ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year { width: 70px;}
.ui-datepicker-trigger { margin:0 0 -5px 2px; }

4
skin/member/basic/register_form.skin.php
View File

@ -57,10 +57,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<tr> <tr>
<th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th> <th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
<td> <td>
<?php if ($w=="u" && $config['cf_cert_use']) { ?> <?php if ($config['cf_cert_use']) { ?>
<span class="frm_info">아이핀 본인확인 후에는 이름이 자동 입력되고 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되어 수동으로 입력할수 없게 됩니다.</span> <span class="frm_info">아이핀 본인확인 후에는 이름이 자동 입력되고 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되어 수동으로 입력할수 없게 됩니다.</span>
<?php } ?> <?php } ?>
<input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>" size="10"> <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php echo $readonly; ?> class="frm_input <?php echo $required ?> <?php echo $readonly ?>" size="10">
<?php <?php
if($config['cf_cert_use']) { if($config['cf_cert_use']) {
if($config['cf_cert_ipin']) if($config['cf_cert_ipin'])