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

adm/config_form.php

@@ -385,7 +385,7 @@ $pg_anchor = "
             <?
             $arr = get_skin_dir('member', G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
             for ($i=0; $i<count($arr); $i++) {
-                echo '<option value="'.$arr[$i].'"'.get_selected($config['cf_member_skin'], $arr[$i]).'>'.$arr[$i].'</option>'."\n";
+                echo '<option value="'.$arr[$i].'"'.get_selected($config['cf_mobile_member_skin'], $arr[$i]).'>'.$arr[$i].'</option>'."\n";
             }
             ?>
             </select>

bbs/syndi/install.php

@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 if ($is_admin != 'super') {
-    alert('최소관리자만 설치가 가능합니다.');
+    alert('최고관리자만 설치가 가능합니다.');
 }
 
 $sql = " CREATE TABLE IF NOT EXISTS `{$g4['syndi_log_table']}` ( `content_id` int(11) NOT NULL, `bbs_id` varchar(50) NOT NULL, `title` text NOT NULL, `link_alternative` varchar(250) NOT NULL, `delete_date` varchar(14) NOT NULL, PRIMARY KEY  (`content_id`,`bbs_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ";

install/gnuboard4s.sql

@@ -460,89 +460,6 @@ CREATE TABLE IF NOT EXISTS `g4s_memo` (
 
 -- --------------------------------------------------------
 
---
--- Table structure for table `g4s_oneboard`
---
-
-DROP TABLE IF EXISTS `g4s_oneboard`;
-CREATE TABLE IF NOT EXISTS `g4s_oneboard` (
-  `ob_table` varchar(20) NOT NULL,
-  `ob_subject` varchar(255) NOT NULL,
-  `ob_admin` varchar(255) NOT NULL,
-  `ob_skin` varchar(255) NOT NULL,
-  `ob_write_level` tinyint(4) NOT NULL,
-  `ob_upload_level` tinyint(4) NOT NULL,
-  `ob_use_dhtml_editor` tinyint(4) NOT NULL,
-  `ob_use_email` tinyint(4) NOT NULL,
-  `ob_table_width` smallint(6) NOT NULL,
-  `ob_subject_len` smallint(6) NOT NULL,
-  `ob_page_rows` smallint(6) NOT NULL,
-  `ob_image_width` smallint(6) NOT NULL,
-  `ob_image_head` varchar(255) NOT NULL,
-  `ob_image_tail` varchar(255) NOT NULL,
-  `ob_include_head` varchar(255) NOT NULL,
-  `ob_include_tail` varchar(255) NOT NULL,
-  `ob_content_head` text NOT NULL,
-  `ob_content_tail` text NOT NULL,
-  `ob_insert_content` text NOT NULL,
-  `ob_1_subj` varchar(255) NOT NULL,
-  `ob_2_subj` varchar(255) NOT NULL,
-  `ob_3_subj` varchar(255) NOT NULL,
-  `ob_4_subj` varchar(255) NOT NULL,
-  `ob_5_subj` varchar(255) NOT NULL,
-  `ob_6_subj` varchar(255) NOT NULL,
-  `ob_7_subj` varchar(255) NOT NULL,
-  `ob_8_subj` varchar(255) NOT NULL,
-  `ob_9_subj` varchar(255) NOT NULL,
-  `ob_10_subj` varchar(255) NOT NULL,
-  `ob_1` varchar(255) NOT NULL,
-  `ob_2` varchar(255) NOT NULL,
-  `ob_3` varchar(255) NOT NULL,
-  `ob_4` varchar(255) NOT NULL,
-  `ob_5` varchar(255) NOT NULL,
-  `ob_6` varchar(255) NOT NULL,
-  `ob_7` varchar(255) NOT NULL,
-  `ob_8` varchar(255) NOT NULL,
-  `ob_9` varchar(255) NOT NULL,
-  `ob_10` varchar(255) NOT NULL,
-  PRIMARY KEY  (`ob_table`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `g4s_one_basic`
---
-
-DROP TABLE IF EXISTS `g4s_one_basic`;
-CREATE TABLE IF NOT EXISTS `g4s_one_basic` (
-  `on_id` int(11) NOT NULL auto_increment,
-  `mb_no` int(11) NOT NULL,
-  `on_subject` varchar(255) NOT NULL default '',
-  `on_question` mediumtext NOT NULL,
-  `on_answer` mediumtext NOT NULL,
-  `on_qfile` varchar(255) NOT NULL,
-  `on_qsource` varchar(255) NOT NULL,
-  `on_afile` varchar(255) NOT NULL,
-  `on_asource` varchar(255) NOT NULL,
-  `on_qdatetime` datetime NOT NULL,
-  `on_adatetime` datetime NOT NULL,
-  `on_1` text NOT NULL,
-  `on_2` text NOT NULL,
-  `on_3` text NOT NULL,
-  `on_4` text NOT NULL,
-  `on_5` text NOT NULL,
-  `on_6` text NOT NULL,
-  `on_7` text NOT NULL,
-  `on_8` text NOT NULL,
-  `on_9` text NOT NULL,
-  `on_10` text NOT NULL,
-  PRIMARY KEY  (`on_id`),
-  KEY `mb_no` (`mb_no`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
 --
 -- Table structure for table `g4s_point`
 --

install/install.inc.php

@@ -67,13 +67,15 @@ if (!is_dir($data_path))
 
 <?
 // data 디렉토리에 파일 생성 가능한지 검사.
-if (!(is_readable($data_path) && is_writeable($data_path) && is_executable($data_path)))
-{
-?>
-    <p><?=G4_DATA_DIR?> 디렉토리의 퍼미션을 707로 변경하여 주십시오.<br /><br />
-    $> chmod 707 <?=G4_DATA_DIR?> 또는 chmod uo+rwx <?=G4_DATA_DIR?><br /><br />
-    위 명령 실행후 브라우저를 새로고침 하십시오.</p>
-<?
-    exit;
+if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+    if (!(is_readable($data_path) && is_writeable($data_path) && is_executable($data_path)))
+    {
+    ?>
+        <p><?=G4_DATA_DIR?> 디렉토리의 퍼미션을 707로 변경하여 주십시오.<br /><br />
+        $> chmod 707 <?=G4_DATA_DIR?> 또는 chmod uo+rwx <?=G4_DATA_DIR?><br /><br />
+        위 명령 실행후 브라우저를 새로고침 하십시오.</p>
+    <?
+        exit;
+    }
 }
 ?>

install/install_config.php

@@ -1,8 +1,4 @@
 <?
-$title = "그누보드4s 설치 3단계 중 2단계 설정";
-include_once ('../config.php');
-include_once ('./install.inc.php');
-
 $gmnow = gmdate('D, d M Y H:i:s').' GMT';
 header('Expires: 0'); // rfc2616 - Section 14.21
 header('Last-Modified: ' . $gmnow);
@@ -10,6 +6,10 @@ header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
 header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
 
+$title = "그누보드4s 설치 3단계 중 2단계 설정";
+include_once ('../config.php');
+include_once ('./install.inc.php');
+
 if ($_POST['agree'] != '동의함') {
     echo "<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>".PHP_EOL;
     echo "<div><a href=\"./\">뒤로가기</a></div>".PHP_EOL;

install/install_db.php

@@ -1,9 +1,5 @@
 <?
 set_time_limit(0);
-
-include_once ('../config.php');
-include_once ('./install.inc.php');
-
 $gmnow = gmdate('D, d M Y H:i:s') . ' GMT';
 header('Expires: 0'); // rfc2616 - Section 14.21
 header('Last-Modified: ' . $gmnow);
@@ -11,6 +7,9 @@ header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
 header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
 
+include_once ('../config.php');
+include_once ('./install.inc.php');
+
 //print_r($_POST); exit;
 
 $mysql_host  = $_POST['mysql_host'];

lib/common.lib.php

@@ -1795,13 +1795,16 @@ function get_skin_stylesheet($skin_path)
     if(!$skin_path)
         return "";
 
+    $doc_root = realpath($_SERVER['DOCUMENT_ROOT']);
+    $skin_path = realpath($skin_path);
+
     $str = "";
 
     $p = parse_url(G4_URL);
     $skin_url = $p['scheme'].'://'.$p['host'];
     if(isset($p['port']))
         $skin_url .= ':'.$p['port'];
-    $skin_url .= str_replace($_SERVER['DOCUMENT_ROOT'], "", $skin_path);
+    $skin_url .= str_replace("\\", "/", str_replace($doc_root, "", $skin_path));
 
     if(is_dir($skin_path)) {
         if($dh = opendir($skin_path)) {

mobile/skin/popular/basic/popular.skin.php

@@ -2,6 +2,8 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
+<link rel="stylesheet" href="<?=$popular_skin_url?>/style.css">
+
 <section id="popular">
     <div>
         <h2>인기검색어</h2>

mobile/skin/visit/basic/visit.skin.php

@@ -4,6 +4,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 global $is_admin;
 ?>
 
+<link rel="stylesheet" href="<?=$visit_skin_url?>/style.css">
+
 <section id="visit">
     <div>
         <h2>방문자집계</h2>

test.php

@@ -1 +0,0 @@
-<embed height="50" width="100" src="/g4s/data/cache/gcaptcha-1890146535_50ecmttsoa8jl5214rqc7q18s2.wav" autostart="true">

test2.php

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="UTF-8">
-<title>margin 계산</title>
-<style>
-ul {list-style:none;width:200px}
-li {float:left;width:50px;height:50px}
-</style>
-</head>
-<body>
-
-<ul>
-    <li style="background:#eee">1</li>
-    <li style="background:#ddd">2</li>
-    <li style="background:#eee">3</li>
-    <li style="background:#ddd">4</li>
-    <li style="background:#ddd;clear:both">5</li>
-    <li style="background:#eee">6</li>
-    <li style="background:#ddd">7</li>
-    <li style="background:#eee">8</li>
-    <li style="background:#eee;clear:both">9</li>
-    <li style="background:#ddd">10</li>
-    <li style="background:#eee">11</li>
-    <li style="background:#ddd">12</li>
-    <li style="background:#ddd;clear:both">13</li>
-    <li style="background:#eee">14</li>
-    <li style="background:#ddd">15</li>
-    <li style="background:#eee">16</li>
-</ul>
-
-</body>
-</html>