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

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
adm/version.php
View File

@ -1,32 +1,32 @@
<?
<?
//
// 조병완(korone)님 , 남규아빠(eagletalon)님께서 만들어 주셨습니다.
//
$sub_menu = "100400";
include_once("./_common.php");
$sub_menu = "100400";
include_once("./_common.php");
auth_check($auth[$sub_menu], "r");
$g4[title] = "버전확인";
$g4[title] = "버전확인";
include_once("./admin.head.php");
include_once("$g4[path]/lib/mailer.lib.php");
include_once("./admin.head.php");
include_once("$g4[path]/lib/mailer.lib.php");
echo "현재버전 : <b>";
$args = "head -1 ".$g4[path]."/HISTORY";
system($args);
$args = "head -1 ".$g4[path]."/HISTORY";
system($args);
echo "</b>";
?>
?>
<table width=100% border="0" align="left" cellpadding="0" cellspacing="0">
<tr>
<td>
<textarea name="textarea" style='width:100%; line-height:150%; padding:10px;' rows="25" class=tx readonly><?=implode("", file("$g4[path]/HISTORY"));?></textarea>
</td>
</tr>
</table>
<table width=100% border="0" align="left" cellpadding="0" cellspacing="0">
<tr>
<td>
<textarea name="textarea" style='width:100%; line-height:150%; padding:10px;' rows="25" class=tx readonly><?php echo implode("", file(G4_PATH.'/HISTORY'));?></textarea>
</td>
</tr>
</table>
<?
include_once("./admin.tail.php");
?>
<?
include_once("./admin.tail.php");
?>