fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-20 03:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.3.7'

Browse source
This commit is contained in:
bnu 2014-01-06 10:49:22 +09:00
commit 3b7c5d77e4
6 changed files with 95 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

33
classes/security/EmbedFilter.class.php
View file

@ -347,14 +347,9 @@ class EmbedFilter
}
}
if(!$isWhiteDomain && !$isWhiteMimetype && $ext)
if(!$isWhiteDomain || !$isWhiteMimetype)
{
$isWhiteExt = $this->isWhiteExt($ext);
}
if(!$isWhiteDomain && !$isWhiteMimetype && !$isWhiteExt)
{
$content = str_replace($objectTag, htmlspecialchars($objectTag), $content);
$content = str_replace($objectTag, htmlspecialchars($objectTag, ENT_COMPAT, 'UTF-8', false), $content);
}
}
}
@ -400,14 +395,9 @@ class EmbedFilter
}
}
if(!$isWhiteDomain && !$isWhiteMimetype && $ext)
if(!$isWhiteDomain || !$isWhiteMimetype)
{
$isWhiteExt = $this->isWhiteExt($ext);
}
if(!$isWhiteDomain && !$isWhiteMimetype && !$isWhiteExt)
{
$content = str_replace($embedTag, htmlspecialchars($embedTag), $content);
$content = str_replace($embedTag, htmlspecialchars($embedTag, ENT_COMPAT, 'UTF-8', false), $content);
}
}
}
@ -450,7 +440,7 @@ class EmbedFilter
if(!$isWhiteDomain)
{
$content = str_replace($iframeTag, htmlspecialchars($iframeTag), $content);
$content = str_replace($iframeTag, htmlspecialchars($iframeTag, ENT_COMPAT, 'UTF-8', false), $content);
}
}
}
@ -483,14 +473,9 @@ class EmbedFilter
$ext = strtolower(substr(strrchr($parser->iNodeAttributes['value'], "."), 1));
$isWhiteDomain = $this->isWhiteDomain($parser->iNodeAttributes['value']);
if(!$isWhiteDomain && $ext)
if(!$isWhiteDomain)
{
$isWhiteExt = $this->isWhiteExt($ext);
}
if(!$isWhiteDomain && !$isWhiteExt)
{
$content = str_replace($paramTag, htmlspecialchars($paramTag), $content);
$content = str_replace($paramTag, htmlspecialchars($paramTag, ENT_COMPAT, 'UTF-8', false), $content);
}
}
}
@ -568,7 +553,7 @@ class EmbedFilter
if($m[1] == 'param')
{
if(strpos(strtolower($m[0]), 'allowscriptaccess'))
if(stripos($m[0], 'allowscriptaccess'))
{
$m[0] = '<param name="allowscriptaccess" value="never"';
if(substr($m[0], -1) == '/')
@ -580,7 +565,7 @@ class EmbedFilter
}
else if($m[1] == 'embed')
{
if(strpos(strtolower($m[0]), 'allowscriptaccess'))
if(stripos($m[0], 'allowscriptaccess'))
{
$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
}

2
classes/security/conf/embedWhiteUrl.xml
View file

@ -38,6 +38,7 @@
<pattern>http://www.youtube-nocookie.com/</pattern>
<pattern>//www.youtube.com/v/</pattern>
<pattern>//www.youtube-nocookie.com/</pattern>
<pattern>//www.youtube.com/embed/</pattern>
</domain>
<domain name="http://www.mgoon.com" desc="엠군">
<pattern>http://play.mgoon.com/Video/</pattern>
@ -203,6 +204,7 @@
<pattern>https://www.youtube-nocookie.com/</pattern>
<pattern>//www.youtube.com/v/</pattern>
<pattern>//www.youtube-nocookie.com/</pattern>
<pattern>//www.youtube.com/embed/</pattern>
</domain>
<domain name="http://maps.google.com" desc="구글맵스" mobile="true">
<pattern>http://maps.google.com/</pattern>

5
common/js/common.js
View file

@ -136,11 +136,6 @@ if(jQuery) jQuery.noConflict();
/* jQuery(document).ready() */
jQuery(function($) {
// Anchor: focus move to target
$('a[href^="#"]').click(function(){
$($(this).attr('href')).attr('tabindex','0').focus();
});
/* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
if($.browser.msie) {
$('select').each(function(i, sels) {

14
common/js/x.min.js vendored
View file

@ -10,8 +10,8 @@ function xResizeEvent(){xDeprecate("xResizeEvent");window.xREL&&setTimeout("xRes
function xAppendChild(a,b){xDeprecate("xAppendChild");return a.appendChild?a.appendChild(b):null}
function xClientHeight(){xDeprecate("xClientHeight");var a=0;xOp6Dn?a=window.innerHeight:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientHeight?a=document.documentElement.clientHeight:document.body&&document.body.clientHeight?a=document.body.clientHeight:xDef(window.innerWidth,window.innerHeight,document.width)&&(a=window.innerHeight,document.width>window.innerWidth&&(a-=16));return a}
function xClientWidth(){xDeprecate("xClientWidth");var a=0;xOp6Dn?a=window.innerWidth:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientWidth?a=document.documentElement.clientWidth:document.body&&document.body.clientWidth?a=document.body.clientWidth:xDef(window.innerWidth,window.innerHeight,document.height)&&(a=window.innerWidth,document.height>window.innerHeight&&(a-=16));return a}
function xCreateElement(a){xDeprecate("xCreateElement");return document.createElement?document.createElement(a):null}function xDef(){xDeprecate("xDef");for(var a=0;a<arguments.length;++a)if("undefined"==typeof arguments[a])return!1;return!0}function xDeleteCookie(a,b){xDeprecate("xDeleteCookie");xGetCookie(a)&&(document.cookie=a+"=; path="+(!b?"/":b)+"; expires="+(new Date(0)).toGMTString())}
function xDisplay(a,b){xDeprecate("xDisplay");return!(a=xGetElementById(a))?null:a.style&&xDef(a.style.display)?(xStr(b)&&(a.style.display=b),a.style.display):null}
function xCreateElement(a){xDeprecate("xCreateElement");return document.createElement?document.createElement(a):null}function xDef(){xDeprecate("xDef");for(var a=0;a<arguments.length;++a)if("undefined"==typeof arguments[a])return!1;return!0}function xDeleteCookie(a,b){xDeprecate("xDeleteCookie");xGetCookie(a)&&(document.cookie=a+"=; path="+(b?b:"/")+"; expires="+(new Date(0)).toGMTString())}
function xDisplay(a,b){xDeprecate("xDisplay");return(a=xGetElementById(a))?a.style&&xDef(a.style.display)?(xStr(b)&&(a.style.display=b),a.style.display):null:null}
function xEvent(a){xDeprecate("xEvent");if(a=a||window.event)a.type&&(this.type=a.type),a.target?this.target=a.target:a.srcElement&&(this.target=a.srcElement),a.relatedTarget?this.relatedTarget=a.relatedTarget:"mouseover"==a.type&&a.fromElement?this.relatedTarget=a.fromElement:"mouseout"==a.type&&(this.relatedTarget=a.toElement),xOp6Dn?(this.pageX=a.clientX,this.pageY=a.clientY):xDef(a.pageX,a.pageY)?(this.pageX=a.pageX,this.pageY=a.pageY):xDef(a.clientX,a.clientY)&&(this.pageX=a.clientX+xScrollLeft(),
this.pageY=a.clientY+xScrollTop()),xDef(a.offsetX,a.offsetY)?(this.offsetX=a.offsetX,this.offsetY=a.offsetY):xDef(a.layerX,a.layerY)?(this.offsetX=a.layerX,this.offsetY=a.layerY):(this.offsetX=this.pageX-xPageX(this.target),this.offsetY=this.pageY-xPageY(this.target)),a.keyCode?this.keyCode=a.keyCode:xDef(a.which)&&-1!=a.type.indexOf("key")&&(this.keyCode=a.which),this.shiftKey=a.shiftKey,this.ctrlKey=a.ctrlKey,this.altKey=a.altKey}
function xFirstChild(a,b){xDeprecate("xFirstChild");var d=a?a.firstChild:null;if(b)for(;d&&d.nodeName!=b;)d=d.nextSibling;else for(;d&&1!=d.nodeType;)d=d.nextSibling;return d}function xGetBodyWidth(){xDeprecate("xGetBodyWidth");var a=xClientWidth(),b=window.document.body.scrollWidth;return a>b?a:b}function xGetBodyHeight(){xDeprecate("xGetBodyHeight");var a=xClientHeight(),b=window.document.body.scrollHeight;return a>b?a:b}
@ -24,15 +24,15 @@ function xHeight(a,b){xDeprecate("xHeight");if(!(a=xGetElementById(a)))return 0;
a.style.height)&&(a.style.height=b+"px",d=a.offsetHeight-b)}b-=d+e+f+h;if(isNaN(b)||0>b)return null;a.style.height=b+"px"}b=a.offsetHeight}else d&&xDef(a.style.pixelHeight)&&(0<=b&&(a.style.pixelHeight=b),b=a.style.pixelHeight);return b}function xHex(a,b,d){xDeprecate("xHex");var e="";a=Math.ceil(a);d&&(e=d);a=a.toString(16);for(d=0;d<b-a.length;++d)e+="0";return e+a}function xHide(a){xDeprecate("xHide");return xVisibility(a,0)}
function xInnerHtml(a,b){xDeprecate("xInnerHtml");if(!(a=xGetElementById(a))||!xStr(a.innerHTML))return null;var d=a.innerHTML;xStr(b)&&(a.innerHTML=b);return d}function xLeft(a,b){xDeprecate("xLeft");if(!(a=xGetElementById(a)))return 0;var d=xDef(a.style);d&&xStr(a.style.left)?xNum(b)?a.style.left=b+"px":(b=parseInt(a.style.left),isNaN(b)&&(b=0)):d&&xDef(a.style.pixelLeft)&&(xNum(b)?a.style.pixelLeft=b:b=a.style.pixelLeft);return b}
function xMoveTo(a,b,d){xDeprecate("xMoveTo");xLeft(a,b);xTop(a,d)}function xName(a){xDeprecate("xName");return a?a.id&&""!=a.id?a.id:a.name&&""!=a.name?a.name:a.nodeName&&""!=a.nodeName?a.nodeName:a.tagName&&""!=a.tagName?a.tagName:a:a}function xNextSib(a,b){xDeprecate("xNextSib");var d=a?a.nextSibling:null;if(b)for(;d&&d.nodeName!=b;)d=d.nextSibling;else for(;d&&1!=d.nodeType;)d=d.nextSibling;return d}
function xNum(){xDeprecate("xNum");for(var a=0;a<arguments.length;++a)if(isNaN(arguments[a])||"number"!=typeof arguments[a])return!1;return!0}function xOffsetLeft(a){xDeprecate("xOffsetLeft");return!(a=xGetElementById(a))?0:xDef(a.offsetLeft)?a.offsetLeft:0}function xOffsetTop(a){xDeprecate("xOffsetTop");return!(a=xGetElementById(a))?0:xDef(a.offsetTop)?a.offsetTop:0}
function xNum(){xDeprecate("xNum");for(var a=0;a<arguments.length;++a)if(isNaN(arguments[a])||"number"!=typeof arguments[a])return!1;return!0}function xOffsetLeft(a){xDeprecate("xOffsetLeft");return(a=xGetElementById(a))?xDef(a.offsetLeft)?a.offsetLeft:0:0}function xOffsetTop(a){xDeprecate("xOffsetTop");return(a=xGetElementById(a))?xDef(a.offsetTop)?a.offsetTop:0:0}
function xPad(a,b,d,e){xDeprecate("xPad");"string"!=typeof a&&(a+="");if(e)for(e=a.length;e<b;++e)a=d+a;else for(e=a.length;e<b;++e)a+=d;return a}function xPageX(a){xDeprecate("xPageX");if(!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetLeft)&&(b+=a.offsetLeft),a=xDef(a.offsetParent)?a.offsetParent:null;return b}
function xPageY(a){xDeprecate("xPageY");if(!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetTop)&&(b+=a.offsetTop),a=xDef(a.offsetParent)?a.offsetParent:null;return b}function xParent(a,b){xDeprecate("xParent");if(!(a=xGetElementById(a)))return null;var d=null;!b&&xDef(a.offsetParent)?d=a.offsetParent:xDef(a.parentNode)?d=a.parentNode:xDef(a.parentElement)&&(d=a.parentElement);return d}
function xPreventDefault(a){xDeprecate("xPreventDefault");a&&a.preventDefault?a.preventDefault():window.event&&(window.event.returnValue=!1)}function xPrevSib(a,b){xDeprecate("xPrevSib");var d=a?a.previousSibling:null;if(b)for(;d&&d.nodeName!=b;)d=d.previousSibling;else for(;d&&1!=d.nodeType;)d=d.previousSibling;return d}
function xRemoveEventListener(a,b,d,e){xDeprecate("xRemoveEventListener");if(a=xGetElementById(a)){b=b.toLowerCase();if(!xIE4Up&&!xOp7Up&&a==window){if("resize"==b){window.xREL=null;return}if("scroll"==b){window.xSEL=null;return}}var f="e.on"+b+"=null";a.removeEventListener?a.removeEventListener(b,d,e):a.detachEvent?a.detachEvent("on"+b,d):eval(f)}}function xResizeTo(a,b,d){xDeprecate("xResizeTo");xWidth(a,b);xHeight(a,d)}
function xScrollLeft(a,b){xDeprecate("xScrollLeft");var d=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var e=window;b&&a&&(e=a);e.document.documentElement&&e.document.documentElement.scrollLeft?d=e.document.documentElement.scrollLeft:e.document.body&&xDef(e.document.body.scrollLeft)&&(d=e.document.body.scrollLeft)}else if((a=xGetElementById(a))&&xNum(a.scrollLeft))d=a.scrollLeft;return d}
function xScrollTop(a,b){xDeprecate("xScrollTop");var d=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var e=window;b&&a&&(e=a);e.document.documentElement&&e.document.documentElement.scrollTop?d=e.document.documentElement.scrollTop:e.document.body&&xDef(e.document.body.scrollTop)&&(d=e.document.body.scrollTop)}else if((a=xGetElementById(a))&&xNum(a.scrollTop))d=a.scrollTop;return d}
function xSetCookie(a,b,d,e){xDeprecate("xSetCookie");document.cookie=a+"="+escape(b)+(!d?"":"; expires="+d.toGMTString())+"; path="+(!e?"/":e)}function xShow(a){xDeprecate("xShow");return xVisibility(a,1)}function xStr(a){xDeprecate("xStr");for(var b=0;b<arguments.length;++b)if("string"!=typeof arguments[b])return!1;return!0}
function xTop(a,b){xDeprecate("xTop");if(!(a=xGetElementById(a)))return 0;var d=xDef(a.style);d&&xStr(a.style.top)?xNum(b)?a.style.top=b+"px":(b=parseInt(a.style.top),isNaN(b)&&(b=0)):d&&xDef(a.style.pixelTop)&&(xNum(b)?a.style.pixelTop=b:b=a.style.pixelTop);return b}function xVisibility(a,b){xDeprecate("xVisibility");return!(a=xGetElementById(a))?null:a.style&&xDef(a.style.visibility)?(xDef(b)&&(a.style.visibility=b?"visible":"hidden"),a.style.visibility):null}
function xScrollLeft(a,b){xDeprecate("xScrollLeft");var d=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var e=window;b&&a&&(e=a);e.document.documentElement&&e.document.documentElement.scrollLeft?d=e.document.documentElement.scrollLeft:e.document.body&&xDef(e.document.body.scrollLeft)&&(d=e.document.body.scrollLeft)}else(a=xGetElementById(a))&&xNum(a.scrollLeft)&&(d=a.scrollLeft);return d}
function xScrollTop(a,b){xDeprecate("xScrollTop");var d=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var e=window;b&&a&&(e=a);e.document.documentElement&&e.document.documentElement.scrollTop?d=e.document.documentElement.scrollTop:e.document.body&&xDef(e.document.body.scrollTop)&&(d=e.document.body.scrollTop)}else(a=xGetElementById(a))&&xNum(a.scrollTop)&&(d=a.scrollTop);return d}
function xSetCookie(a,b,d,e){xDeprecate("xSetCookie");document.cookie=a+"="+escape(b)+(d?"; expires="+d.toGMTString():"")+"; path="+(e?e:"/")}function xShow(a){xDeprecate("xShow");return xVisibility(a,1)}function xStr(a){xDeprecate("xStr");for(var b=0;b<arguments.length;++b)if("string"!=typeof arguments[b])return!1;return!0}
function xTop(a,b){xDeprecate("xTop");if(!(a=xGetElementById(a)))return 0;var d=xDef(a.style);d&&xStr(a.style.top)?xNum(b)?a.style.top=b+"px":(b=parseInt(a.style.top),isNaN(b)&&(b=0)):d&&xDef(a.style.pixelTop)&&(xNum(b)?a.style.pixelTop=b:b=a.style.pixelTop);return b}function xVisibility(a,b){xDeprecate("xVisibility");return(a=xGetElementById(a))?a.style&&xDef(a.style.visibility)?(xDef(b)&&(a.style.visibility=b?"visible":"hidden"),a.style.visibility):null:null}
function xWidth(a,b){xDeprecate("xWidth");if(!(a=xGetElementById(a)))return 0;b=xNum(b)?0>b?0:Math.round(b):-1;var d=xDef(a.style);if(a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase())b=xClientWidth();else if(d&&xDef(a.offsetWidth)&&xStr(a.style.width)){if(0<=b){var e=d=0,f=0,h=0;if("CSS1Compat"==document.compatMode){var g=xGetComputedStyle,d=g(a,"padding-left",1);null!==d?(e=g(a,"padding-right",1),f=g(a,"border-left-width",1),h=g(a,"border-right-width",1)):xDef(a.offsetWidth,
a.style.width)&&(a.style.width=b+"px",d=a.offsetWidth-b)}b-=d+e+f+h;if(isNaN(b)||0>b)return null;a.style.width=b+"px"}b=a.offsetWidth}else d&&xDef(a.style.pixelWidth)&&(0<=b&&(a.style.pixelWidth=b),b=a.style.pixelWidth);return b}function xZIndex(a,b){xDeprecate("xZIndex");if(!(a=xGetElementById(a)))return 0;a.style&&xDef(a.style.zIndex)&&(xNum(b)&&(a.style.zIndex=b),b=parseInt(a.style.zIndex));return b}
function xStopPropagation(a){xDeprecate("xStopPropagation");a&&a.stopPropagation?a.stopPropagation():window.event&&(window.event.cancelBubble=!0)};

77
common/js/xe.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
config/config.inc.php
View file

@ -42,7 +42,7 @@ define('__ZBXE__', __XE__);
* '2' means 'release candidate' status.
* '3' means 'final' status.
*/
define('__XE_VERSION__', '1.7.3.6');
define('__XE_VERSION__', '1.7.3.7');
/**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.