Commit graph

178 commits

Author SHA1 Message Date
bnu
194ce8614a NOISSUE remove reference operator. 2013-12-30 17:35:02 +09:00
bnu
e49c7265ff NOISSUE 테스트 코드 제거. 2013-12-19 15:29:28 +09:00
khongchi
8a7e5a8794 Merge branch 'feature/ipfilter' into develop 2013-12-05 10:40:11 +09:00
ngleader
4c1ba64d25 NOISSUE, trivial code change 2013-11-30 07:06:08 +09:00
khongchi
5fae27d53c isCrawler, 관리자페이지 IP잠금, 사이트잠금 기능에서 ipfilter를 사용하도록 변경 2013-11-29 19:24:07 +09:00
bnu
e9dacc6cdf substr_compare()에서 문제를 일으킬 수 있는 부분 보완. 2013-11-27 15:16:26 +09:00
bnu
4d9e68b9e4 substr_compare() 사용에 대한 보완 2013-11-27 14:18:09 +09:00
khongchi
540da2c75c #85, time()을 $_SERVER['REQUEST_TIME']으로 대체 2013-11-21 16:14:13 +09:00
khongchi
71c8a0b99f fixed #50, file_put_contents함수에 LOCK_EX flag 적 2013-11-15 12:56:29 +09:00
khongchi
5693e340fe issue 3645, php5 대응, 함수 대체
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13202 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-13 01:40:53 +00:00
khongchi
d9f001266c issue 3644, php5대응 file_put_contents 함수 적용
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13199 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-12 02:17:35 +00:00
akasima
bce0a0b6d4 copyright add to php files
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13186 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 05:52:51 +00:00
khongchi
acd89ccd9a issue 3633, protect from file upload hacking
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13182 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 03:44:04 +00:00
ngleader
dbc18a4f99 change author
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13180 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-07 02:42:42 +00:00
misol
f70ce644ce Close Connection when there is no connection value.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-25 15:29:32 +00:00
ovclas
c657a0f2c1 issue 2933 add isShow column and check isShow and unset menu item
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12731 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-12 05:37:45 +00:00
flyskyko
8a7c28babc issue 2119. supporting php 5.4. modules and widgets.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12706 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-05 09:45:04 +00:00
flyskyko
9f0e24d59b issue 2119. supporting php 5.4. config
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12698 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-05 04:36:52 +00:00
flyskyko
0f04bd3f92 merge changes of luminous to maserati (~r12676)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12680 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-04 08:09:07 +00:00
ovclas
f69cfd442b XSS Defence
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12560 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-16 01:14:06 +00:00
ovclas
ef5aa0b93f CSRF defence modify
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12511 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-04 03:05:16 +00:00
ovclas
2d90e77046 issue 2775 if use vid, check virtual site
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12502 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 06:17:06 +00:00
ovclas
15698ded4c issue 2775 compare with lower case
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12501 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 05:38:28 +00:00
ovclas
95690a41b5 issue 2775 if virtual site, check CSRF change
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12498 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 01:59:00 +00:00
ovclas
a1cd4df78e merge from 1.5.3.2 (r12460 ~ r12482)
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12491 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-28 02:34:15 +00:00
ovclas
a3266c1c53 CSRF defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12460 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-26 04:52:07 +00:00
ovclas
8327266214 issue 2740 rollback json_encode2 function (Because in other feature error )
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12383 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-12 01:44:52 +00:00
ovclas
c7fb2d5ae8 issue 2740 add unique visitor statistics api
json_encode2 function modify (Because Maserati only supports php5.2.4 above)


git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12374 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-11 04:55:34 +00:00
ovclas
7928ad163b issue 2662 conding convention in config
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12232 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-15 08:04:47 +00:00
ovclas
7486e78757 issue 2652 getRequestUriByServerEnviroment method bug fix
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12050 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-02 10:51:13 +00:00
ovclas
86011ab063 merge from luminous (11139-12038)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12040 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-02 07:20:00 +00:00
ovclas
a6261c58d7 issue 1860 add htmlpurifier to core
support for editor component, widget
check safe iframe in htmlpurifier instead of Embed class


git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11812 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-22 02:45:58 +00:00
ovclas
fa882475d1 XSS defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11733 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-16 06:05:25 +00:00
flyskyko
51bb8d1985 merger from branch luminous (~r11576)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-04 05:04:23 +00:00
flyskyko
9f5e25a15e merge from branch 1.5.3.2 (~r11282)
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-19 07:56:40 +00:00
flyskyko
bcd610fd9f rollback r11012
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11223 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-13 02:49:17 +00:00
devjin
42eb19ae10 merge from 1.5.3.2(r11162 ~ r11201)
and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-11 02:52:49 +00:00
ovclas
5da785312c issue 2347 fix admin menu bug
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11177 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-07 00:47:15 +00:00
ovclas
d884a771ca XSS Defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11091 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-27 06:16:41 +00:00
devjin
e10897f8b9 issue 2239 moved a include code to func.inc.php.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11031 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-16 04:48:03 +00:00
ovclas
927c944ff3 issue 2239 Object, Embed, Iframe source allow by white list
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11024 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-13 02:19:17 +00:00
ChanMyeong
b041550c53 issue 2033 fixed. HTML DTD choosing option is removed. Support only HTML5.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11012 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 07:36:25 +00:00
ovclas
7c5ed1b2b5 XSS Defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10794 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-26 01:02:16 +00:00
flyskyko
86296c899e adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10745 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-29 03:26:40 +00:00
ovclas
57a0cc59b1 reverse merge from 1.6.0 (r10156, r10469, r10370, r10369, r10365, r10111, r10110, r10108, r10064, r10063, r10060, r10054, r10052, r10051, r10050, r10049, r10044, r10042, r10041, r10030, r10029, r10024, r10014, r10013)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10715 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 05:52:06 +00:00
ovclas
3afad81016 reverse merge rollback
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10714 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 02:38:33 +00:00
ovclas
696a3164c3 reverse merge from 1.6.0 (r10054)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10700 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-16 09:48:38 +00:00
ovclas
ab0d78ffde issue 1860 rollback apply purifier
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10645 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-04-30 08:25:36 +00:00
ovclas
682466a46b isseu 1860 change cache directory path
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10639 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-04-27 08:49:04 +00:00
ovclas
ac5953ab63 XSS Defense for PHP4
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10616 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-04-25 10:08:42 +00:00