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

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

Browse Source
This commit is contained in:
whitedot
2013-03-13 11:11:33 +09:00
parent bfce185539 5daf35f2fa
commit 69c251273a
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
install/install.inc.php
View File

@ -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;
}
}
?>

8
install/install_config.php
View File

@ -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;

7
install/install_db.php
View File

@ -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'];

5
lib/common.lib.php
View File

@ -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)) {