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

Browse Source
This commit is contained in:
sora90224
2015-08-26 10:23:22 +09:00
parent adeb007cb0 36e88a6a2d
commit 3b0744dcd3
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/config_form.php
View File

@ -209,7 +209,7 @@ $frm_submit = '<div class="btn_confirm01 btn_confirm">
if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124'; if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124';
if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
if ($config['cf_icode_id'] && $config['cf_icode_pw']) { if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
$userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
} }
?> ?>

2
adm/sms_admin/config.php
View File

@ -9,7 +9,7 @@ $g5['title'] = "SMS 기본설정";
if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124'; if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124';
if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
if ($config['cf_icode_id'] && $config['cf_icode_pw']) if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw'])
{ {
$userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
} }

4
install/install_db.php
View File

@ -53,10 +53,12 @@ if (!$select_db) {
$mysql_set_mode = 'false'; $mysql_set_mode = 'false';
@mysql_query('set names utf8'); @mysql_query('set names utf8');
if(version_compare(mysql_get_server_info(), '5.6.6', '>=') == 1) { $row = mysql_fetch_assoc(mysql_query(" SELECT @@sql_mode as mode "));
if($row['mode']) {
@mysql_query("SET SESSION sql_mode = ''"); @mysql_query("SET SESSION sql_mode = ''");
$mysql_set_mode = 'true'; $mysql_set_mode = 'true';
} }
unset($row);
?> ?>
<div class="ins_inner"> <div class="ins_inner">

6
lib/thumbnail.lib.php
View File

@ -59,15 +59,19 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
if($tname) { if($tname) {
if($edt) { if($edt) {
// 오리지날 이미지
$ori = G5_URL.$data_path;
// 썸네일 이미지
$src = G5_URL.str_replace($filename, $tname, $data_path); $src = G5_URL.str_replace($filename, $tname, $data_path);
} else { } else {
$ori = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename;
$src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname; $src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname;
} }
} else { } else {
return false; return false;
} }
$thumb = array("src"=>$src, "alt"=>$alt); $thumb = array("src"=>$src, "ori"=>$ori, "alt"=>$alt);
return $thumb; return $thumb;
} }

4
plugin/kcpcert/lib/ct_cli_lib.php
View File

@ -93,7 +93,9 @@ class C_CT_CLI
while ( list(,$i) = each($arg) ) while ( list(,$i) = each($arg) )
{ {
$exec_cmd .= " " . escapeshellarg( $i ); // 일부서버의 경우 빈값일때 '' 결과가 넘어오지 않는 버그가 있다. kagla 150820
//$exec_cmd .= " " . escapeshellarg( $i );
$exec_cmd .= " " . ( escapeshellarg($i) ? escapeshellarg($i) : "''" );
} }
$rt = exec( $exec_cmd ); $rt = exec( $exec_cmd );