support Microsoft Edge

Joungkyun · Jan 15, 2016 · f5394d7 · f5394d7
1 parent a75b43e
commit f5394d7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/jsboard-2/INSTALLER/act.php b/jsboard-2/INSTALLER/act.php
@@ -1,5 +1,5 @@
 <?php
-# $Id: act.php,v 1.21 2014-03-06 17:31:40 oops Exp $
+# $Id: act.php,v 1.22 2016-01-15 12:16:01 oops Exp $
 
 /*
  * Local variables:
@@ -158,8 +158,10 @@
 $result['udata'] = sql_query($create['udata'], $c);
 
 # 설정 파일 위치
-mkdir("../data/test",0775);
-mkdir("../data/test/files",0770);
+if ( ! is_dir ('../data/test') )
+	mkdir("../data/test",0775);
+if ( ! is_dir ('../data/test/files') )
+	mkdir("../data/test/files",0770);
 copy("sample/data/config.php","../data/test/config.php");
 copy("sample/data/html_head.php","../data/test/html_head.php");
 copy("sample/data/html_tail.php","../data/test/html_tail.php");

diff --git a/jsboard-2/doc/en/Changelog b/jsboard-2/doc/en/Changelog
@@ -11,7 +11,7 @@ it as needed for himeself/herself and must read jsboard/README.OTHERS.OS
 file.
 
 ******************************************************************************
-$Id: Changelog,v 1.297 2016-01-15 08:39:14 oops Exp $
+$Id: Changelog,v 1.298 2016-01-15 12:16:01 oops Exp $
 
 
 -----------------------------------------------------------------------------
@@ -22,6 +22,7 @@ by Joungkyun.KIm
 	- [#318679] fixed db connect error with mysqli extension on INSTALLER
 	- [#318681] fixed PHP Fatal error: Function name must be a string
 	- [#318680] fixed print error messages When complete installation
+	- support Microsoft Edge
 
 
 -----------------------------------------------------------------------------

diff --git a/jsboard-2/doc/ko/Changelog b/jsboard-2/doc/ko/Changelog
@@ -11,7 +11,7 @@ Any one who wants install this package on any other platform must revise
 it as needed for himeself/herself and must read jsboard/README.OTHERS.OS
 file.
 
-$Id: Changelog,v 1.314 2016-01-15 08:39:14 oops Exp $
+$Id: Changelog,v 1.315 2016-01-15 12:16:01 oops Exp $
 
 ******************************************************************************
 
@@ -25,6 +25,7 @@ $Id: Changelog,v 1.314 2016-01-15 08:39:14 oops Exp $
 	- [#318679] INSTALLER에서 mysqli 확장 사용시에 DB 접속 안되는 문제 수정
 	- [#318681] fixed PHP Fatal error: Function name must be a string
 	- [#318680] install 정상 완료시에도 에러 메시지 출력되는 문제 수정
+	- support Microsoft Edge
 
 
 -----------------------------------------------------------------------------

diff --git a/jsboard-2/include/get.php b/jsboard-2/include/get.php
@@ -1,5 +1,5 @@
 <?php
-# $Id: get.php,v 1.23 2014-03-02 17:11:31 oops Exp $
+# $Id: get.php,v 1.24 2016-01-15 12:16:01 oops Exp $
 
 # // {{{ +-- public get_authinfo($id,$nocry='')
 # login 정보를 얻어오는 함수
@@ -89,6 +89,10 @@ function get_agent() {
     # version 정보
     $agent['vr'] = trim(preg_replace('/Mo.+MSIE ([^;]+);.+/i','\\1',$agent_env));
     $agent['vr'] = preg_replace('/[a-z]/i','',$agent['vr']);
+  } else if(preg_match ('/Edge\//', $agent_env)) {
+    $agent['br'] = 'Edge';
+    $agent['os'] = 'NT';
+    $agent['vr'] = preg_replace ('/.* Edge\/([0-9.]+).*/', '\\1', $agent_env);
   } else if(preg_match('/Gecko|Galeon/i',$agent_env) && !preg_match('/Netscape/i',$agent_env)) {
     if ( preg_match ('/Firefox/i', $agent_env) )
       $agent['br'] = 'Firefox';

diff --git a/jsboard-2/include/print.php b/jsboard-2/include/print.php
@@ -1,5 +1,5 @@
 <?php
-# $Id: print.php,v 1.44 2014-03-02 17:11:31 oops Exp $
+# $Id: print.php,v 1.45 2016-01-15 12:16:01 oops Exp $
 #
 # Wrapper function
 #
@@ -118,7 +118,7 @@ function form_size($size, $print = 0) {
   }
 
   # 인터넷 익스플로러
-  else if($agent['br'] == 'MSIE' || $agent['br'] == 'Firefox' || $agent['br'] == 'Chrome') {
+  else if($agent['br'] == 'MSIE' || $agent['br'] == 'Firefox' || $agent['br'] == 'Chrome' || $agent['br'] == 'Edge') {
     if ($agent['os'] == 'NT')
       if ($langs['code'] == 'ko') $size *= 2.3;
       else $size *= 2.0;