unmanaged codestyle update

2024-09-23 11:41:17 +09:00 · 2024-09-23 11:41:17 +09:00 · 529957883c
commit 529957883c
parent 0fa4762041
6 changed files with 30 additions and 52 deletions
--- a/AvocadoEdition_Light/install/index.php
+++ b/AvocadoEdition_Light/install/index.php
@ -10,13 +10,12 @@ $theme_5 = "#727F99";
 $theme_6 = "#7488B2";

 $title = G5_VERSION . " 라이센스 확인 1/3";
-include_once "./install.inc.php";
-?>

-<?php
+include_once "./install.inc.php";
+
 if ($exists_data_dir && $write_data_dir) {
  // 필수 모듈 체크
-  require_once('./library.check.php');
+  include_once "./library.check.php";
  ?>
  <div class="ins_inner">
    <p>
@ -55,8 +54,6 @@ if ($exists_data_dir && $write_data_dir) {
    }
  </script>
  <?php
-} // if
-?>
-<?php
+}
+
 include_once "./install.inc2.php";
-?>
--- a/AvocadoEdition_Light/install/install.inc.php
+++ b/AvocadoEdition_Light/install/install.inc.php
@ -38,9 +38,7 @@ if (!$title)
    <?php
    exit;
  }
-  ?>
  
-  <?php
  $exists_data_dir = true;
  // data 디렉토리가 있는가?
  if (!is_dir($data_path)) {
@ -59,9 +57,7 @@ if (!$title)
    <?php
    $exists_data_dir = false;
  }
-  ?>
  
-  <?php
  $write_data_dir = true;
  // data 디렉토리에 파일 생성 가능한지 검사.
  if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
@ -94,4 +90,3 @@ if (!$title)
      }
    }
  }
-  ?>
--- a/AvocadoEdition_Light/install/install.inc2.php
+++ b/AvocadoEdition_Light/install/install.inc2.php
@ -1,4 +1,6 @@
-<div id="ins_ft">
+<?php 
+
+?><div id="ins_ft">
  <strong>AVOCADO EDITION</strong>
  <p>GPL! OPEN SOURCE GNUBOARD</p>
 </div>
--- a/AvocadoEdition_Light/install/install_config.php
+++ b/AvocadoEdition_Light/install/install_config.php
@ -10,7 +10,6 @@ include_once "../config.php";
 $title = G5_VERSION . " 초기환경설정 2/3";
 include_once "./install.inc.php";

-
 if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') {
  echo "<div class=\"ins_inner\"><p>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</p>" . PHP_EOL;
  echo "<div class=\"inner_btn\"><a href=\"./\">뒤로가기</a></div></div>" . PHP_EOL;
@ -146,7 +145,6 @@ if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') {
      return true;
    }
  </script>
+<?php
+include_once "./install.inc2.php";
  
-  <?php
-  include_once "./install.inc2.php";
-  ?>
--- a/AvocadoEdition_Light/install/install_db.php
+++ b/AvocadoEdition_Light/install/install_db.php
@ -106,7 +106,7 @@ unset($row);
    //-------------------------------------------------------------------------------------------------
 // config 테이블 설정
    
-    $sql = " insert into `{$table_prefix}config`
+    $sql = "INSERT INTO `{$table_prefix}config`
            set cf_title = '" . G5_VERSION . "',
                cf_admin = '$admin_id',
                cf_admin_email = '$admin_email',
@ -174,26 +174,26 @@ unset($row);
    sql_query($sql, true, $dblink);

    // 1:1문의 설정
-    $sql = " insert into `{$table_prefix}qa_config`
+    $sql = "INSERT INTO `{$table_prefix}qa_config`
            ( qa_title, qa_category, qa_skin, qa_mobile_skin, qa_use_email, qa_req_email, qa_use_hp, qa_req_hp, qa_use_editor, qa_subject_len, qa_mobile_subject_len, qa_page_rows, qa_mobile_page_rows, qa_image_width, qa_upload_size, qa_insert_content )
          values
            ( '1:1문의', '회원|포인트', 'basic', 'basic', '1', '0', '1', '0', '1', '60', '30', '15', '15', '600', '1048576', '' ) ";
    sql_query($sql, true, $dblink);

    // 관리자 회원가입
-    $sql = " insert into `{$table_prefix}member`
-            set mb_id = '{$admin_id}',
-                 mb_password = '" . get_encrypt_string($admin_pass) . "',
-                 mb_name = '{$admin_name}',
-                 mb_nick = '{$admin_name}',
-                 mb_email = '{$admin_email}',
-                 mb_level = '10',
-                 mb_mailling = '1',
-                 mb_open = '1',
-                 mb_email_certify = '" . G5_TIME_YMDHIS . "',
-                 mb_datetime = '" . G5_TIME_YMDHIS . "',
-                 mb_ip = '{$_SERVER['REMOTE_ADDR']}'
-                 ";
+    $sql = "INSERT INTO `{$table_prefix}member`
+              SET mb_id = '{$admin_id}',
+                mb_password = '" . get_encrypt_string($admin_pass) . "',
+                mb_name = '{$admin_name}',
+                mb_nick = '{$admin_name}',
+                mb_email = '{$admin_email}',
+                mb_level = '10',
+                mb_mailling = '1',
+                mb_open = '1',
+                mb_email_certify = '" . G5_TIME_YMDHIS . "',
+                mb_datetime = '" . G5_TIME_YMDHIS . "',
+                mb_ip = '{$_SERVER['REMOTE_ADDR']}'
+                ";
    sql_query($sql, true, $dblink);

    // 게시판 그룹 추가
@ -203,7 +203,6 @@ unset($row);
 					gr_device = 'both'";
    sql_query($sql, true, $dblink);

-    // 디자인 설정 파일
    function g5_path_temp()
    {
      $result['path'] = str_replace('\\', '/', dirname(__FILE__));
@ -353,7 +352,7 @@ unset($row);
    <li>DB설정 파일 생성 완료 (<?php echo $file ?>)</li>

    <?php
-    // data 디렉토리 및 하위 디렉토리에서는 .htaccess .htpasswd .php .phtml .html .htm .inc .cgi .pl 파일을 실행할수 없게함.
+    // data 디렉토리 및 하위 디렉토리에서는 .htaccess .htpasswd .php .phtml .html .htm .inc .cgi .pl .phar 파일을 실행할수 없게함.
    $f = fopen($data_path . '/.htaccess', 'w');
    $str = <<<EOD
 <FilesMatch "\.(htaccess|htpasswd|[Pp][Hh][Pp]|[Pp]?[Hh][Tt][Mm][Ll]?|[Ii][Nn][Cc]|[Cc][Gg][Ii]|[Pp][Ll]|[Pp][Hh][Aa][Rr])">
@ -365,14 +364,11 @@ EOD;
    fclose($f);
    //-------------------------------------------------------------------------------------------------
    
-
    // CSS 설정 파일 생성
    $css_data_path = $g5_path['path'] . "/css";
    $css_data_url = $g5_path['url'] . "/css";
-
    @mkdir($css_data_path, G5_DIR_PERMISSION);
    @chmod($css_data_path, G5_DIR_PERMISSION);
-
    $file = '../' . G5_CSS_DIR . '/_design.config.css';
    $file_path = $css_data_path . '/_design.config.css';
    @unlink($file_path);
@ -387,32 +383,22 @@ EOD;
      fwrite($f, $css);
      fclose($f);
      @chmod($file, G5_FILE_PERMISSION);
-
      ?>
    </li>
  </ol>
-
  <p>축하합니다. <?php echo G5_VERSION ?> 설치가 완료되었습니다.</p>
-
 </div>
-
 <div class="ins_inner">
-
  <h2>환경설정 변경은 다음의 과정을 따르십시오.</h2>
-
  <ol>
    <li>메인화면으로 이동</li>
    <li>관리자 로그인</li>
    <li>관리자 모드 접속</li>
    <li>환경설정 메뉴의 기본환경설정 페이지로 이동</li>
  </ol>
-
  <div class="inner_btn">
    <a href="../adm/">아보카도 에디션 관리자 페이지로 이동</a>
  </div>
-
 </div>
-
 <?php
 include_once "./install.inc2.php";
-?>
--- a/AvocadoEdition_Light/install/library.check.php
+++ b/AvocadoEdition_Light/install/library.check.php
@ -1,6 +1,6 @@
 <?php
 if (!defined('_GNUBOARD_'))
-  exit; // 개별 페이지 접근 불가
+  exit;

 if (!extension_loaded('gd') || !function_exists('gd_info')) {
  echo '<script>' . PHP_EOL;