From 9199b7c986fe83d7a6d7da2a07825fe30ad18a7d Mon Sep 17 00:00:00 2001 From: kjh Date: Fri, 27 May 2022 06:50:13 +0000 Subject: [PATCH] Checked PSR-1: Basic Coding Standard & type error --- adm/browscap.php | 6 ++++-- adm/browscap_convert.php | 11 +++++++---- adm/browscap_converter.php | 33 ++++++++++++++++++++------------- adm/browscap_update.php | 8 +++++--- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/adm/browscap.php b/adm/browscap.php index d26fc6ab1..44ff64a48 100644 --- a/adm/browscap.php +++ b/adm/browscap.php @@ -2,11 +2,13 @@ $sub_menu = "100510"; include_once('./_common.php'); -if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) +if (!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) { alert('사용할 수 없는 기능입니다.', correct_goto_url(G5_ADMIN_URL)); +} -if ($is_admin != 'super') +if ($is_admin != 'super') { alert('최고관리자만 접근 가능합니다.'); +} $g5['title'] = 'Browscap 업데이트'; include_once('./admin.head.php'); diff --git a/adm/browscap_convert.php b/adm/browscap_convert.php index 9f0eac4ca..d3e2a2883 100644 --- a/adm/browscap_convert.php +++ b/adm/browscap_convert.php @@ -2,15 +2,18 @@ $sub_menu = "100520"; include_once('./_common.php'); -if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) +if (!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) { alert('사용할 수 없는 기능입니다.', correct_goto_url(G5_ADMIN_URL)); +} -if ($is_admin != 'super') +if ($is_admin != 'super') { alert('최고관리자만 접근 가능합니다.'); +} $rows = isset($_GET['rows']) ? preg_replace('#[^0-9]#', '', $_GET['rows']) : 0; -if(!$rows) +if (!$rows) { $rows = 100; +} $g5['title'] = '접속로그 변환'; include_once('./admin.head.php'); @@ -29,7 +32,7 @@ $(function() { $.ajax({ method: "GET", url: "./browscap_converter.php", - data: { rows: "" }, + data: { rows: "" }, async: true, cache: false, dataType: "html", diff --git a/adm/browscap_converter.php b/adm/browscap_converter.php index a89aca909..698790dcd 100644 --- a/adm/browscap_converter.php +++ b/adm/browscap_converter.php @@ -5,14 +5,16 @@ include_once('./_common.php'); // clean the output buffer ob_end_clean(); -if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) +if (!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) { die('사용할 수 없는 기능입니다.'); +} -if($is_admin != 'super') +if ($is_admin != 'super') { die('최고관리자로 로그인 후 실행해 주세요.'); +} // browscap cache 파일 체크 -if(!is_file(G5_DATA_PATH.'/cache/browscap_cache.php')) { +if (!is_file(G5_DATA_PATH.'/cache/browscap_cache.php')) { echo '

Browscap 정보가 없습니다. 아래 링크로 이동해 Browscap 정보를 업데이트 하세요.

'.PHP_EOL; echo '

Browscap 업데이트

'.PHP_EOL; exit; @@ -24,13 +26,14 @@ $browscap->doAutoUpdate = false; $browscap->cacheFilename = 'browscap_cache.php'; // 데이터 변환 -$rows = preg_replace('#[^0-9]#', '', $_GET['rows']); -if(!$rows) +$rows = isset($_GET['rows']) ? preg_replace('#[^0-9]#', '', $_GET['rows']) : 0; +if (!$rows) { $rows = 100; +} $sql_common = " from {$g5['visit_table']} where vi_agent <> '' and ( vi_browser = '' or vi_os = '' or vi_device = '' ) "; $sql_order = " order by vi_id desc "; -$sql_limit = " limit 0, $rows "; +$sql_limit = " limit 0, " . strval($rows) . " "; $sql = " select count(vi_id) as cnt $sql_common "; $row = sql_fetch($sql); @@ -43,20 +46,23 @@ $sql = " select vi_id, vi_agent, vi_browser, vi_os, vi_device $result = sql_query($sql); $cnt = 0; -for($i=0; $row=sql_fetch_array($result); $i++) { +for ($i = 0; $row = sql_fetch_array($result); $i++) { $info = $browscap->getBrowser($row['vi_agent']); $brow = $row['vi_browser']; - if(!$brow) + if (!$brow) { $brow = $info->Comment; + } $os = $row['vi_os']; - if(!$os) + if (!$os) { $os = $info->Platform; + } $device = $row['vi_device']; - if(!$device) + if (!$device) { $device = $info->Device_Type; + } $sql2 = " update {$g5['visit_table']} set vi_browser = '$brow', @@ -68,7 +74,8 @@ for($i=0; $row=sql_fetch_array($result); $i++) { $cnt++; } -if(($total_count - $cnt) == 0 || $total_count == 0) +if (($total_count - $cnt) == 0 || $total_count == 0) { echo '

변환완료

'; -else - echo '

총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료

접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.

'; \ No newline at end of file +} else { + echo '

총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료

접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.

'; +} diff --git a/adm/browscap_update.php b/adm/browscap_update.php index 2e7001018..b3938fcfa 100644 --- a/adm/browscap_update.php +++ b/adm/browscap_update.php @@ -7,11 +7,13 @@ include_once('./_common.php'); // clean the output buffer ob_end_clean(); -if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) +if (!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE)) { die('사용할 수 없는 기능입니다.'); +} -if ($is_admin != 'super') +if ($is_admin != 'super') { die('최고관리자만 접근 가능합니다.'); +} include_once(G5_PLUGIN_PATH.'/browscap/Browscap.php'); @@ -20,4 +22,4 @@ $browscap->updateMethod = 'cURL'; $browscap->cacheFilename = 'browscap_cache.php'; $browscap->updateCache(); -die(''); \ No newline at end of file +die('');