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

Merge branch 'develop' into feature/pwhash

Browse source
This commit is contained in:
bnu 2015-01-15 16:46:17 +09:00
commit a837f1e00a
156 changed files with 10370 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/admin/admin.admin.model.php
View file

@ -935,17 +935,17 @@ class adminAdminModel extends admin
return $output->data->count;
}
function getFaviconUrl()
function getFaviconUrl($default = true)
{
return $this->iconUrlCheck('favicon.ico', 'faviconSample.png');
return $this->iconUrlCheck('favicon.ico', 'faviconSample.png', $default);
}
function getMobileIconUrl()
function getMobileIconUrl($default = true)
{
return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png');
return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $default);
}
function iconUrlCheck($iconname, $default_icon_name)
function iconUrlCheck($iconname, $default_icon_name, $default)
{
$site_info = Context::get('site_module_info');
$virtual_site = '';
@ -955,11 +955,11 @@ class adminAdminModel extends admin
}
$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
if(!$file_exsit)
{
$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
}
else
if(!$file_exsit && $default === true)
{
$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
}
elseif($file_exsit)
{
$default_url = Context::getDefaultUrl();
$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;

3
modules/admin/tpl/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/admin/tpl/js/admin.min.map Normal file
View file

File diff suppressed because one or more lines are too long

3
modules/admin/tpl/js/config.min.js vendored
View file

@ -1 +1,2 @@
function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);b.ftp_root_path.value="undefined"!=typeof a?a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?xe_root:"/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;
function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);b.ftp_root_path.value="undefined"!=typeof a?a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?xe_root:"/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;
//# sourceMappingURL=config.min.map

1
modules/admin/tpl/js/config.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"config.min.js","sources":["config.js"],"names":["setStartModule","target_module","jQuery","text","index_module_srl","val","css","viewSiteSearch","getFTPList","pwd","form","get","ftp_root_path","value","sftp","checked","xe_root","params","ftp_user","ftp_password","ftp_host","ftp_port","exec_xml","completeGetFtpInfo","removeFTPInfo","filterAlertMessage","ret_obj","error","alert","message","e","empty","list","isArray","item","arr","split","pop","push","target","join","i","length","v","append","deleteIcon","iconname","iconDeleteMessage","icon","attr","doRecompileCacheFile","confirm","xe","lang","confirm_run","completeCacheMessage","doResetAdminMenu","confirm_reset_admin_menu","menu_srl","admin_menu_srl","completeResetAdminMenu","document","location","reload","$","bind"],"mappings":"AAMA,QAASA,kBACR,GAAIC,GAAgBC,OAAO,iCAAiCC,OACxDC,EAAmBF,OAAO,iBAAiBG,KAC/CH,QAAO,mBAAmBG,IAAIJ,GAC9BC,OAAO,qBAAqBG,IAAID,GAChCF,OAAO,qEAAqEI,IAAI,UAAU,QAG3F,QAASC,kBACRL,OAAO,wBAAwBI,IAAI,UAAU,IAG9C,QAASE,YAAWC,GAEnB,GAAIC,GAAOR,OAAO,aAAaS,IAAI,EAGlCD,GAAKE,cAAcC,MAFF,mBAAT,GAEmBJ,GAIvBC,EAAKE,cAAcC,OAA8B,mBAAdH,GAAS,MAAoBA,EAAKI,KAAKC,QAElDC,QAIA,GAI7B,IAAIC,KAEJA,GAAOC,SAAWhB,OAAO,aAAaG,MACtCY,EAAOE,aAAcjB,OAAO,iBAAiBG,MAC7CY,EAAOG,SAAWlB,OAAO,aAAaG,MACtCY,EAAOI,SAAWnB,OAAO,aAAaG,MACtCY,EAAOL,cAAgBV,OAAO,kBAAkBG,MAChDY,EAAOH,KAAOZ,OAAO,4BAA4BG,MAEjDiB,SAAS,QAAS,kBAAmBL,EAAQM,oBAAqB,OAAQ,QAAS,WAAYN,EAAQP,GAGxG,QAASc,iBAER,GAAIP,KACJK,UAAS,UAAW,gCAAiCL,EAAQQ,oBAAqB,QAAS,WAAYR,GAGxG,QAASM,oBAAmBG,GAE3B,GAAqB,IAAlBA,EAAQC,MAIV,MAFAC,OAAMF,EAAQC,WACdC,OAAMF,EAAQG,QAGf,IAAIC,GAAI5B,OAAO,kBAAkB6B,QAE7BC,EAAO,EACP9B,QAAO+B,QAAQP,EAAQM,KAAKE,QAE/BR,EAAQM,KAAKE,MAAQR,EAAQM,KAAKE,OAGnCzB,IAAMP,OAAO,aAAaS,IAAI,GAAGC,cAAcC,MACrC,KAAPJ,MAEF0B,IAAM1B,IAAI2B,MAAM,KAChBD,IAAIE,MACJF,IAAIE,MACJF,IAAIG,KAAK,IACTC,OAASJ,IAAIK,KAAK,KAClBR,EAAOA,EAAO,mDAAmDO,OAAO,yBAGzE,KAAI,GAAIE,GAAE,EAAEA,EAAEf,EAAQM,KAAKE,KAAKQ,OAAOD,IACvC,CACC,GAAIE,GAAIjB,EAAQM,KAAKE,KAAKO,EAClB,QAALE,GAIW,MAALA,IAMRX,EAAOA,EAAO,mDAAmDvB,IAAIkC,EAAE,QAAQA,EAAE,kBAGnFX,EAAO,OAAOA,EAAK,QACnBF,EAAEc,OAAO1C,OAAO8B,IAIjB,QAASa,YAAWC,GACnB,GAAI7B,KACJA,GAAO6B,SAAWA,EAClBxB,SAAS,QAAS,uBAAwBL,EAAQ8B,mBAAoB,QAAS,WAAY9B,GAC3F+B,KAAOF,EAER,QAASC,mBAAkBrB,GAC1BE,MAAMF,EAAQG,SAEO,KAAjBH,EAAQC,QAEC,eAARqB,KACH9C,OAAO,uBAAuB+C,KAAK,MAAO,2CACzB,eAARD,MACT9C,OAAO,uBAAuB+C,KAAK,MAAO,4CAI7C,QAASC,wBACR,GAAKC,QAAQC,GAAGC,KAAKC,aAArB,CACA,GAAIrC,KACJK,UAAS,QAAQ,8BAA+BL,EAAQsC,uBAEzD,QAASA,sBAAqB7B,GAC7BE,MAAMF,EAAQG,SAGf,QAAS2B,oBACR,GAAKL,QAAQC,GAAGC,KAAKI,0BAArB,CACA,GAAIxC,KACJA,GAAOyC,SAAWC,eAClBrC,SAAS,QAAQ,qBAAsBL,EAAQ2C,yBAEhD,QAASA,0BACRC,SAASC,SAASC,SAzInB7D,OAAO,SAAS8D,GACfA,EAAE,iBAAiBC,KAAK,QAAS,WAChCD,EAAE,oBAAoB1D,IAAI,UAAU,OAoGtC,IAAI0C,MAAO"}

3
modules/admin/tpl/js/menu_setup.min.js vendored
View file

@ -1 +1,2 @@
jQuery(function(a){function b(b){var c;if(moduleList=b.menuList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,b.val(c?d.parent("ul").parent("li").find(">input._item_key").val():"0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(){if(f[0]===this||f.has(this).length)return!0;var c=b(this,h.get(0));m.push({top:c.top,bottom:c.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(){var b,e;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),e=a("<li />").height(f.height()),o&&(b=a(o.element),f.before(e),"prepend"==o.state?(b.find(">ul").length||b.find(">.side").after("<ul>"),b.find(">ul").prepend(f.hide())):b[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),e.slideUp(100,function(){var a=e.parent();e.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});
jQuery(function(a){function b(b){var c;if(moduleList=b.menuList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,b.val(c?d.parent("ul").parent("li").find(">input._item_key").val():"0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(){if(f[0]===this||f.has(this).length)return!0;var c=b(this,h.get(0));m.push({top:c.top,bottom:c.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(){var b,e;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),e=a("<li />").height(f.height()),o&&(b=a(o.element),f.before(e),"prepend"==o.state?(b.find(">ul").length||b.find(">.side").after("<ul>"),b.find(">ul").prepend(f.hide())):b[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),e.slideUp(100,function(){var a=e.parent();e.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});
//# sourceMappingURL=menu_setup.min.map

1
modules/admin/tpl/js/menu_setup.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"menu_setup.min.js","sources":["menu_setup.js"],"names":["jQuery","$","completeGetActList","obj","$optgroup","moduleList","menuList","menuNameList","x","appendTo","y","append","title","parentSrl","editForm","listForm","click","this","parent","prevAll","val","find","params","response_tags","exec_xml","menu_item_srl","submit","closest","getOffset","elem","offsetParent","top","left","offsetTop","offsetLeft","delegate","$pkey","is_child","$this","length","dragging","$holder","mousedown.st","event","$uls","$ul","width","height","offset","position","offsets","i","dropzone","target","is","which","parentsUntil","filter","eq","pageX","pageY","get","$clone","clone","attr","wrap","each","has","o","push","bottom","$item","remove","end","addClass","css","opacity","zIndex","document","unbind","bind","diff","nTop","c","element","hasClass","state","$dropzone","$li","before","after","prepend","hide","slideDown","removeClass","slideUp","$par","children","trigger","mouseover.st","mouseout.st","display","backgroundColor"],"mappings":"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"}

2
modules/autoinstall/autoinstall.lib.php
View file

@ -124,7 +124,7 @@ class ModuleInstaller
}
else
{
$subpath = substr($this->package->path, 2);
$subpath = trim(substr($this->package->path, 2), '/');
$this->download_file = $this->temp_dir . $subpath . ".tar";
$subpatharr = explode("/", $subpath);
array_pop($subpatharr);

2
modules/board/board.admin.controller.php
View file

@ -19,7 +19,7 @@ class boardAdminController extends board {
* @brief insert borad module
**/
function procBoardAdminInsertBoard($args = null) {
// igenerate module model/controller object
// generate module model/controller object
$oModuleController = getController('module');
$oModuleModel = getModel('module');

3
modules/board/m.skins/default/category.html
View file

@ -1,4 +1,5 @@
<!--%import("css/mboard.css")-->
<load target="css/mboard.css" />
<div class="bd">
<div class="hx h2">
<h2><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a> &rsaquo; {$lang->category}</h2>

10
modules/board/m.skins/default/comment_form.html
View file

@ -1,10 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd rd">
<div class="hx h2">
<h2><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a></h2>

6
modules/board/m.skins/default/css/mboard.css
View file

@ -378,8 +378,10 @@ input[type=radio] {
}
.rp .btn {
display: inline-block;
width: 15px;
height: 15px;
width: 15px !important;
height: 15px !important;
padding: 0 !important;
border: 0 !important;
overflow: hidden;
vertical-align: middle;
text-indent: 15px;

2
modules/board/m.skins/default/css/mboard.min.css vendored
View file

File diff suppressed because one or more lines are too long

10
modules/board/m.skins/default/delete_comment_form.html
View file

@ -1,10 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->confirm_delete}</h2>

10
modules/board/m.skins/default/delete_form.html
View file

@ -1,10 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->confirm_delete}</h2>

8
modules/board/m.skins/default/input_password_form.html
View file

@ -1,9 +1,5 @@
<!--%import("css/mboard.css")-->
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<load target="css/mboard.css" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->msg_input_password}</h2>

3
modules/board/m.skins/default/js/mboard.min.js vendored
View file

@ -1 +1,2 @@
function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeGetPage(a){jQuery("#cl").remove(),jQuery("#clpn").remove(),jQuery("#clb").parent().after(a.html)}function loadPage(a,b){var c={};c.cpage=b,c.document_srl=a,c.mid=current_mid,jQuery.exec_json("board.getBoardCommentPage",c,completeGetPage)}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}
function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeGetPage(a){jQuery("#cl").remove(),jQuery("#clpn").remove(),jQuery("#clb").parent().after(a.html)}function loadPage(a,b){var c={};c.cpage=b,c.document_srl=a,c.mid=current_mid,jQuery.exec_json("board.getBoardCommentPage",c,completeGetPage)}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}
//# sourceMappingURL=mboard.min.map

1
modules/board/m.skins/default/js/mboard.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"mboard.min.js","sources":["mboard.js"],"names":["completeInsertComment","ret_obj","mid","error","message","document_srl","comment_srl","url","current_url","setQuery","location","href","completeDocumentInserted","category_srl","completeGetPage","ret_val","jQuery","remove","parent","after","html","loadPage","page","params","cpage","current_mid","exec_json","completeDeleteComment","completeDeleteDocument"],"mappings":"AAAA,QAASA,uBAAsBC,GAE9B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBC,EAAcL,EAAQK,YAEtBC,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,GAC5FH,KAAaC,EAAMA,EAAIE,SAAS,MAAMH,GAAa,YAAYA,GAElEI,SAASC,KAAOJ,EAGjB,QAASK,0BAAyBX,GAEjC,GAMIM,GAJAL,GAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBQ,EAAeZ,EAAQY,YAS1BN,GANGF,EAMGG,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,IAJrFD,YAAYC,SAAS,MAAMP,GAAKO,SAAS,MAAM,IAMnDI,IAAcN,EAAMA,EAAIE,SAAS,WAAWI,IAE/CH,SAASC,KAAOJ,EAGjB,QAASO,iBAAgBC,GAExBC,OAAO,OAAOC,SACdD,OAAO,SAASC,SAChBD,OAAO,QAAQE,SAASC,MAAMJ,EAAQK,MAGvC,QAASC,UAAShB,EAAciB,GAE/B,GAAIC,KACJA,GAAOC,MAAQF,EACfC,EAAOlB,aAAeA,EACtBkB,EAAOrB,IAAMuB,YACbT,OAAOU,UAAU,4BAA6BH,EAAQT,iBAGvD,QAASa,uBAAsB1B,GAE9B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBiB,EAAOrB,EAAQqB,KAEff,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,GAC5Fa,KAAMf,EAAMA,EAAIE,SAAS,OAAOa,IAEnCZ,SAASC,KAAOJ,EAGjB,QAASqB,wBAAuB3B,GAE/B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdoB,EAAOrB,EAAQqB,KAEff,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,MAAM,IAAIA,SAAS,eAAe,GAClFa,KAAMf,EAAMA,EAAIE,SAAS,OAAOa,IAEnCZ,SAASC,KAAOJ"}

7
modules/board/m.skins/default/lang/lang.xml
View file

@ -1,7 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<lang>
<item name="skip_to_content">
<value xml:lang="ko"><![CDATA[본문 건너뛰기]]></value>
<value xml:lang="en"><![CDATA[Skip to content]]></value>
</item>
</lang>

12
modules/board/m.skins/default/list.html
View file

@ -1,13 +1,9 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("css/mboard.css")-->
<load target="css/mboard.css" />
<div class="bd">
<!--@if($oDocument->isExists())-->
<!--#include("read.html")-->
<include target="read.html" />
<!--@else-->
<!--#include("_list.html")-->
<include target="_list.html" />
<!--@end-->
</div>

13
modules/board/m.skins/default/read.html
View file

@ -1,11 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
{@ Context::loadLang('./modules/board/m.skins/default/lang')}
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="hx h2">
<h2><a href="{getUrl('document_srl','','category','','page','')}">{$module_info->browser_title}</a>
<!--@if($module_info->use_category == "Y" && $oDocument->get('category_srl'))-->&rsaquo; <a href="{getUrl('document_srl','','category',$oDocument->get('category_srl'))}">{$category_list[$oDocument->get('category_srl')]->title}</a><!--@end--> &rsaquo; {$oDocument->getTitle()}</h2>
@ -62,7 +57,7 @@
<em>{htmlspecialchars($val->title)} - {htmlspecialchars($val->blog_name)}</em>
<span class="time">{zdate($val->regdate, "Y.m.d")}</span>
<!--@if($grant->manager)-->
<a href="07_password.html" class="btn de">삭제</a>
<a href="07_password.html" class="btn de">{$lang->cmd_delete}</a>
<!--@endif-->
</span>
</li>

10
modules/board/m.skins/default/skin.xml
View file

@ -22,10 +22,10 @@
</description>
<version>0.1</version>
<date>2010-06-10</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="en">NHN</name>
<name xml:lang="zh-TW">NHN</name>
<name xml:lang="tr">NHN</name>
<author email_address="developers@xpressengine.com" link="http://www.xpressengine.com/">
<name xml:lang="ko">NAVER</name>
<name xml:lang="en">NAVER</name>
<name xml:lang="zh-TW">NAVER</name>
<name xml:lang="tr">NAVER</name>
</author>
</skin>

11
modules/board/m.skins/default/write_form.html
View file

@ -1,11 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/x.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<div class="hx h2">
<h2><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a></h2>

3
modules/board/m.skins/simpleGray/category.html
View file

@ -1,4 +1,5 @@
<!--%import("css/mboard.css")-->
<load target="css/mboard.css" />
<div class="bd">
<h2 class="h2"><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a> &rsaquo; {$lang->category}</h2>
<ul class="gn">

11
modules/board/m.skins/simpleGray/comment_form.html
View file

@ -1,12 +1,7 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<div class="bd rd">
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd rd">
<!--@if($oSourceComment->isExists())-->
<div class="origin">{$oSourceComment->getContent(false)}</div>
<!--@end-->

10
modules/board/m.skins/simpleGray/delete_comment_form.html
View file

@ -1,10 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<h2 class="ac">{$lang->confirm_delete}</h2>
<form action="./" method="get" onsubmit="return procFilter(this, delete_comment)">

10
modules/board/m.skins/simpleGray/delete_form.html
View file

@ -1,10 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<h2 class="ac">{$lang->confirm_delete}</h2>
<form action="./" method="get" onsubmit="return procFilter(this, delete_document)">

8
modules/board/m.skins/simpleGray/input_password_form.html
View file

@ -1,9 +1,5 @@
<!--%import("css/mboard.css")-->
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<load target="css/mboard.css" />
<div class="bd">
<h2 class="h2">{$lang->msg_input_password}</h2>
<form action="./" method="POST" onsubmit="return procFilter(this, input_password)" class="requirePassword">

3
modules/board/m.skins/simpleGray/js/mboard.min.js vendored
View file

@ -1 +1,2 @@
function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeGetPage(a){jQuery("#cl").remove(),jQuery("#clpn").remove(),jQuery("#clb").after(a.html)}function loadPage(a,b){var c={};c.cpage=b,c.document_srl=a,c.mid=current_mid,jQuery.exec_json("board.getBoardCommentPage",c,completeGetPage)}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}
function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeGetPage(a){jQuery("#cl").remove(),jQuery("#clpn").remove(),jQuery("#clb").after(a.html)}function loadPage(a,b){var c={};c.cpage=b,c.document_srl=a,c.mid=current_mid,jQuery.exec_json("board.getBoardCommentPage",c,completeGetPage)}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}
//# sourceMappingURL=mboard.min.map

1
modules/board/m.skins/simpleGray/js/mboard.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"mboard.min.js","sources":["mboard.js"],"names":["completeInsertComment","ret_obj","mid","error","message","document_srl","comment_srl","url","current_url","setQuery","location","href","completeDocumentInserted","category_srl","completeGetPage","ret_val","jQuery","remove","after","html","loadPage","page","params","cpage","current_mid","exec_json","completeDeleteComment","completeDeleteDocument"],"mappings":"AAAA,QAASA,uBAAsBC,GAE9B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBC,EAAcL,EAAQK,YAEtBC,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,GAC5FH,KAAaC,EAAMA,EAAIE,SAAS,MAAMH,GAAa,YAAYA,GAElEI,SAASC,KAAOJ,EAGjB,QAASK,0BAAyBX,GAEjC,GAKIM,GAHAL,GAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBQ,EAAeZ,EAAQY,YAS1BN,GANGF,EAMGG,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,IAJrFD,YAAYC,SAAS,MAAMP,GAAKO,SAAS,MAAM,IAMnDI,IAAcN,EAAMA,EAAIE,SAAS,WAAWI,IAC/CH,SAASC,KAAOJ,EAGjB,QAASO,iBAAgBC,GAExBC,OAAO,OAAOC,SACdD,OAAO,SAASC,SAChBD,OAAO,QAAQE,MAAMH,EAAQI,MAG9B,QAASC,UAASf,EAAcgB,GAE/B,GAAIC,KAEJA,GAAOC,MAAQF,EACfC,EAAOjB,aAAeA,EACtBiB,EAAOpB,IAAMsB,YACbR,OAAOS,UAAU,4BAA6BH,EAAQR,iBAGvD,QAASY,uBAAsBzB,GAE9B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdG,EAAeJ,EAAQI,aACvBgB,EAAOpB,EAAQoB,KAEfd,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,eAAeJ,GAAcI,SAAS,MAAM,GAC5FY,KAAMd,EAAMA,EAAIE,SAAS,OAAOY,IAEnCX,SAASC,KAAOJ,EAGjB,QAASoB,wBAAuB1B,GAE/B,GAEIC,IAFQD,EAAQE,MACNF,EAAQG,QACZH,EAAQC,KACdmB,EAAOpB,EAAQoB,KAEfd,EAAMC,YAAYC,SAAS,MAAMP,GAAKO,SAAS,MAAM,IAAIA,SAAS,eAAe,GAClFY,KAAMd,EAAMA,EAAIE,SAAS,OAAOY,IAEnCX,SAASC,KAAOJ"}

8
modules/board/m.skins/simpleGray/list.html
View file

@ -1,9 +1,5 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("css/mboard.css")-->
<load target="css/mboard.css" />
<div class="bd">
<!--@if($oDocument->isExists())-->
<!--#include("read.html")-->

12
modules/board/m.skins/simpleGray/read.html
View file

@ -1,13 +1,9 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="rd">
<div class="hx">
<h2><a href="{getUrl('document_srl','','category','','page','')}">{$module_info->browser_title}</a>
<h2><a href="{getUrl('document_srl','','category','','page','')}">{$module_info->browser_title}</a>
<!--@if($module_info->use_category == "Y" && $oDocument->get('category_srl'))-->&rsaquo; <a href="{getUrl('document_srl','','category',$oDocument->get('category_srl'))}">{$category_list[$oDocument->get('category_srl')]->title}</a><!--@end--> &rsaquo; {$oDocument->getTitle()}</h2>
<em><a href="#">{$oDocument->getNickName()}</a></em>
<span>{$oDocument->getRegdate()}</span>

8
modules/board/m.skins/simpleGray/skin.xml
View file

@ -14,9 +14,9 @@
</description>
<version>0.1</version>
<date>2010-06-10</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="en">NHN</name>
<name xml:lang="zh-TW">NHN</name>
<author email_address="developers@xpressengine.com" link="http://www.xpressengine.com/">
<name xml:lang="ko">NAVER</name>
<name xml:lang="en">NAVER</name>
<name xml:lang="zh-TW">NAVER</name>
</author>
</skin>

11
modules/board/m.skins/simpleGray/write_form.html
View file

@ -1,11 +1,6 @@
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/x.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("js/mboard.js")-->
<!--%import("css/mboard.css")-->
<load target="js/mboard.js" />
<load target="css/mboard.css" />
<div class="bd">
<h2 class="h2"><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a> &rsaquo; {$lang->cmd_write}</h2>
<form action="./" method="POST" onsubmit="return procFilter(this, insert)">

3
modules/board/skins/default/board.default.min.js vendored
View file

@ -1 +1,2 @@
jQuery(function(a){a(".board_list tr:last-child>td").css("border","0"),a(".read_footer .tags span:last-child").hide();var b=a(".board_search");b.hide().addClass("off"),a(".bsToggle").click(function(){b.hasClass("off")?b.show().removeClass("off").find(".iText").focus():b.hide().addClass("off")});var c=a(".item .iLabel").next(".iText");a(".item .iLabel").css("position","absolute"),c.focus(function(){a(this).prev(".iLabel").css("visibility","hidden")}).blur(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).change(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).blur(),a(".cTab>li>ul>li.on_").parents("li:first").addClass("on"),a(".feedback .xe_content>*:first-child").css("margin-top","0")}),function(a){a.fn.snspost=function(b){var c="";switch(b=a.extend({},{type:"twitter",event:"click",content:""},b),b.content=encodeURIComponent(b.content),b.type){case"facebook":c="http://www.facebook.com/share.php?t="+b.content+"&u="+encodeURIComponent(b.url||location.href);break;case"delicious":c="http://www.delicious.com/save?v=5&noui&jump=close&url="+encodeURIComponent(b.url||location.href)+"&title="+b.content;break;case"twitter":c="http://twitter.com/home?status="+b.content}this.bind(b.event,function(){return window.open(c),!1})},a.snspost=function(b,c){a.each(b,function(b,d){a(d).snspost(a.extend({},c,{type:b}))})}}(jQuery);
jQuery(function(a){a(".board_list tr:last-child>td").css("border","0"),a(".read_footer .tags span:last-child").hide();var b=a(".board_search");b.hide().addClass("off"),a(".bsToggle").click(function(){b.hasClass("off")?b.show().removeClass("off").find(".iText").focus():b.hide().addClass("off")});var c=a(".item .iLabel").next(".iText");a(".item .iLabel").css("position","absolute"),c.focus(function(){a(this).prev(".iLabel").css("visibility","hidden")}).blur(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).change(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).blur(),a(".cTab>li>ul>li.on_").parents("li:first").addClass("on"),a(".feedback .xe_content>*:first-child").css("margin-top","0")}),function(a){a.fn.snspost=function(b){var c="";switch(b=a.extend({},{type:"twitter",event:"click",content:""},b),b.content=encodeURIComponent(b.content),b.type){case"facebook":c="http://www.facebook.com/share.php?t="+b.content+"&u="+encodeURIComponent(b.url||location.href);break;case"delicious":c="http://www.delicious.com/save?v=5&noui&jump=close&url="+encodeURIComponent(b.url||location.href)+"&title="+b.content;break;case"twitter":c="http://twitter.com/home?status="+b.content}this.bind(b.event,function(){return window.open(c),!1})},a.snspost=function(b,c){a.each(b,function(b,d){a(d).snspost(a.extend({},c,{type:b}))})}}(jQuery);
//# sourceMappingURL=board.default.min.map

1
modules/board/skins/default/board.default.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"board.default.min.js","sources":["board.default.js"],"names":["jQuery","$","css","hide","bs","addClass","click","hasClass","show","removeClass","find","focus","iText","next","this","prev","blur","val","change","parents","fn","snspost","opts","loc","extend","type","event","content","encodeURIComponent","url","location","href","bind","window","open","selectors","action","each","key"],"mappings":"AAAAA,OAAO,SAASC,GAEfA,EAAE,gCAAgCC,IAAI,SAAS,KAE/CD,EAAE,sCAAsCE,MAExC,IAAIC,GAAKH,EAAE,gBACXG,GAAGD,OAAOE,SAAS,OACnBJ,EAAE,aAAaK,MAAM,WACjBF,EAAGG,SAAS,OACdH,EAAGI,OAAOC,YAAY,OAAOC,KAAK,UAAUC,QAE5CP,EAAGD,OAAOE,SAAS,QAIrB,IAAIO,GAAQX,EAAE,iBAAiBY,KAAK,SACpCZ,GAAE,iBAAiBC,IAAI,WAAW,YAClCU,EACED,MAAM,WACNV,EAAEa,MAAMC,KAAK,WAAWb,IAAI,aAAa,YAEzCc,KAAK,WACDf,EAAEa,MAAMG,MAGXhB,EAAEa,MAAMC,KAAK,WAAWb,IAAI,aAAa,UAFzCD,EAAEa,MAAMC,KAAK,WAAWb,IAAI,aAAa,aAK1CgB,OAAO,WACHjB,EAAEa,MAAMG,MAGXhB,EAAEa,MAAMC,KAAK,WAAWb,IAAI,aAAa,UAFzCD,EAAEa,MAAMC,KAAK,WAAWb,IAAI,aAAa,aAK1Cc,OAEFf,EAAE,sBAAsBkB,QAAQ,YAAYd,SAAS,MAErDJ,EAAE,uCAAuCC,IAAI,aAAa,OAI3D,SAAUD,GACTA,EAAEmB,GAAGC,QAAU,SAASC,GACvB,GAAIC,GAAM,EAGV,QAFAD,EAAOrB,EAAEuB,WAAYC,KAAK,UAAWC,MAAM,QAASC,QAAQ,IAAKL,GACjEA,EAAKK,QAAUC,mBAAmBN,EAAKK,SAChCL,EAAKG,MACX,IAAK,WACJF,EAAM,uCAAuCD,EAAKK,QAAQ,MAAMC,mBAAmBN,EAAKO,KAAKC,SAASC,KACtG,MACD,KAAK,YACJR,EAAM,yDAAyDK,mBAAmBN,EAAKO,KAAKC,SAASC,MAAM,UAAUT,EAAKK,OAC1H,MACD,KAAK,UACJJ,EAAM,kCAAkCD,EAAKK,QAG/Cb,KAAKkB,KAAKV,EAAKI,MAAO,WAErB,MADAO,QAAOC,KAAKX,IACL,KAGTtB,EAAEoB,QAAU,SAASc,EAAWC,GAC/BnC,EAAEoC,KAAKF,EAAW,SAASG,EAAIrB,GAC9BhB,EAAEgB,GAAKI,QAASpB,EAAEuB,UAAWY,GAASX,KAAKa,SAG3CtC"}

3
modules/board/tpl/js/board.min.js vendored
View file

@ -1 +1,2 @@
function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function completeSearch(a,b,c,d){d.submit()}function completeVote(a){var b=(a.error,a.message);alert(b),location.href=location.href}function completeReload(a){a.error,a.message;location.href=location.href}function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteTrackback(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function doChangeCategory(){var a=jQuery("#board_category option:selected").val();location.href=decodeURI(current_url).setQuery("category",a).setQuery("page","")}function doScrap(a){var b=[];b.document_srl=a,jQuery.exec_json("member.procMemberScrapDocument",b)}jQuery(function(a){a(document.body).click(function(b){var c,d=a(b.target),e={};if(0!==d.parents(".layer_voted_member").length||d.is(".layer_voted_member")||a(".layer_voted_member").hide().remove(),d.is("a[class^=voted_member_]")){var f=parseInt(d.attr("class").replace(/[^0-9]/g,""));f&&(d.hasClass("comment")?(c="comment.getCommentVotedMemberList",e={comment_srl:f,point:d.hasClass("votedup")?1:-1}):(c="document.getDocumentVotedMemberList",e={document_srl:f,point:d.hasClass("votedup")?1:-1}),a.exec_json(c,e,function(c){var e=c.voted_member_list,f=[];e&&0!==e.length&&(a.each(e,function(){f.push(this.nick_name)}),d.after(a("<ul>").addClass("layer_voted_member").css({position:"absolute",top:b.pageY+5,left:b.pageX}).append("<li>"+f.join("</li><li>")+"</li>")))}))}})});
function completeDocumentInserted(a){var b,c=(a.error,a.message,a.mid),d=a.document_srl,e=a.category_srl;b=d?current_url.setQuery("mid",c).setQuery("document_srl",d).setQuery("act",""):current_url.setQuery("mid",c).setQuery("act",""),e&&(b=b.setQuery("category",e)),location.href=b}function completeDeleteDocument(a){var b=(a.error,a.message,a.mid),c=a.page,d=current_url.setQuery("mid",b).setQuery("act","").setQuery("document_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function completeSearch(a,b,c,d){d.submit()}function completeVote(a){var b=(a.error,a.message);alert(b),location.href=location.href}function completeReload(a){a.error,a.message;location.href=location.href}function completeInsertComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.comment_srl,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("rnd",d)+"#comment_"+d),location.href=e}function completeDeleteComment(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function completeDeleteTrackback(a){var b=(a.error,a.message,a.mid),c=a.document_srl,d=a.page,e=current_url.setQuery("mid",b).setQuery("document_srl",c).setQuery("act","");d&&(e=e.setQuery("page",d)),location.href=e}function doChangeCategory(){var a=jQuery("#board_category option:selected").val();location.href=decodeURI(current_url).setQuery("category",a).setQuery("page","")}function doScrap(a){var b=[];b.document_srl=a,jQuery.exec_json("member.procMemberScrapDocument",b)}jQuery(function(a){a(document.body).click(function(b){var c,d=a(b.target),e={};if(0!==d.parents(".layer_voted_member").length||d.is(".layer_voted_member")||a(".layer_voted_member").hide().remove(),d.is("a[class^=voted_member_]")){var f=parseInt(d.attr("class").replace(/[^0-9]/g,""));f&&(d.hasClass("comment")?(c="comment.getCommentVotedMemberList",e={comment_srl:f,point:d.hasClass("votedup")?1:-1}):(c="document.getDocumentVotedMemberList",e={document_srl:f,point:d.hasClass("votedup")?1:-1}),a.exec_json(c,e,function(c){var e=c.voted_member_list,f=[];e&&0!==e.length&&(a.each(e,function(){f.push(this.nick_name)}),d.after(a("<ul>").addClass("layer_voted_member").css({position:"absolute",top:b.pageY+5,left:b.pageX}).append("<li>"+f.join("</li><li>")+"</li>")))}))}})});
//# sourceMappingURL=board.min.map

1
modules/board/tpl/js/board.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"board.min.js","sources":["board.js"],"names":["completeDocumentInserted","ret_obj","url","mid","error","message","document_srl","category_srl","current_url","setQuery","location","href","completeDeleteDocument","page","completeSearch","response_tags","params","fo_obj","submit","completeVote","alert","completeReload","completeInsertComment","comment_srl","completeDeleteComment","completeDeleteTrackback","doChangeCategory","jQuery","val","decodeURI","doScrap","exec_json","$","document","body","click","e","act","t","target","parents","length","is","hide","remove","srl","parseInt","attr","replace","hasClass","point","data","l","voted_member_list","ul","each","push","this","nick_name","after","addClass","css","position","top","pageY","left","pageX","append","join"],"mappings":"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"}

3
modules/board/tpl/js/board_admin.min.js vendored
View file

@ -1 +1,2 @@
function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");{new Array("error","message")}exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}
function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");{new Array("error","message")}exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}
//# sourceMappingURL=board_admin.min.map

1
modules/board/tpl/js/board_admin.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"board_admin.min.js","sources":["board_admin.js"],"names":["completeInsertBoard","ret_obj","message","error","page","module_srl","alert","url","current_url","setQuery","location","href","completeDeleteBoard","doUpdateCategory","category_srl","mode","confirm","fo_obj","xGetElementById","value","procFilter","update_category","completeUpdateCategory","doCartSetup","jQuery","each","length","this","val","join","popopen","doInsertItem","target_obj","display_obj","text","options","selectedIndex","i","obj","Option","doDeleteItem","sel_obj","idx","remove","doMoveUpItem","doMoveDownItem","doSaveListConfig","list","params","Array","exec_json","reload"],"mappings":"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"}

2
modules/comment/comment.controller.php
View file

@ -908,7 +908,7 @@ class commentController extends comment
* Remove all comment relation log
* @return Object
*/
function deleteCommentLog()
function deleteCommentLog($args)
{
$this->_deleteDeclaredComments($args);
$this->_deleteVotedComments($args);

2
modules/communication/communication.controller.php
View file

@ -162,7 +162,7 @@ class communicationController extends communication
}
/**
* Send a message (DB controll)
* Send a message (DB control)
* @param int $sender_srl member_srl of sender
* @param int $receiver_srl member_srl of receiver_srl
* @param string $title

12
modules/document/document.admin.controller.php
View file

@ -83,12 +83,19 @@ class documentAdminController extends document
unset($obj);
$obj = $oDocument->getObjectVars();
// ISSUE https://github.com/xpressengine/xe-core/issues/32
$args_doc_origin->document_srl = $document_srl;
$output_ori = executeQuery('document.getDocument', $args_doc_origin, array('content'));
$obj->content = $output_ori->data->content;
// Move the attached file if the target module is different
if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
{
$oFileController = getController('file');
$files = $oDocument->getUploadedFiles();
$delete_file_srls = array();
if(is_array($files))
{
foreach($files as $val)
@ -113,9 +120,10 @@ class documentAdminController extends document
$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
}
}
// Delete an existing file
$oFileController->deleteFile($val->file_srl);
$delete_file_srls[] = $val->file_srl;
}
// Delete an existing file
$oFileController->deleteFile($delete_file_srls);
}
// Set the all files to be valid
$oFileController->setFilesValid($obj->document_srl);

15
modules/document/document.controller.php
View file

@ -2482,18 +2482,13 @@ class documentController extends document
if(is_array($documentSrlList))
{
$documentSrlList = array_unique($documentSrlList);
foreach($documentSrlList AS $key=>$documentSrl)
foreach($documentSrlList AS $key => $documentSrl)
{
$oldDocument = $oDocumentModel->getDocument($documentSrl);
$fileCount = $oFileModel->getFilesCount($documentSrl);
if($oldDocument != null)
{
$newDocumentArray = $oldDocument->variables;
$newDocumentArray['uploaded_count'] = $fileCount;
$newDocumentObject = (object) $newDocumentArray;
$this->updateDocument($oldDocument, $newDocumentObject);
}
$args = new stdClass();
$args->document_srl = $documentSrl;
$args->uploaded_count = $fileCount;
executeQuery('document.updateUploadedCount', $args);
}
}
}

6
modules/document/document.model.php
View file

@ -232,7 +232,7 @@ class documentModel extends document
{
// document.getDocumentList query execution
// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1);
$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
if(isset($groupByQuery[$query_id]))
{
$group_args = clone($args);
@ -1417,6 +1417,10 @@ class documentModel extends document
$args->s_tags = str_replace(' ','%',$search_keyword);
$query_id = 'document.getDocumentListWithinTag';
break;
case 'extra_vars':
$args->var_value = str_replace(' ', '%', $search_keyword);
$query_id = 'document.getDocumentListWithinExtraVars';
break;
default :
if(strpos($search_target,'extra_vars')!==false) {
$args->var_idx = substr($search_target, strlen('extra_vars'));

27
modules/document/queries/getDocumentListWithinExtraVars.xml Normal file
View file

@ -0,0 +1,27 @@
<query id="getDocumentListWithinExtraVars" action="select">
<tables>
<table name="documents" />
<table name="document_extra_vars" alias="extra_vars" />
</tables>
<columns>
<column name="documents.*" />
</columns>
<conditions>
<condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
<condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
<condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
<condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
<condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
<condition operation="in" column="documents.status" var="statusList" pipe="and" />
<condition operation="like" column="extra_vars.value" var="var_value" notnull="notnull" pipe="and" />
</conditions>
<groups>
<group column="extra_vars.document_srl" />
</groups>
<navigation>
<index var="sort_index" default="documents.list_order" order="order_type" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
</navigation>
</query>

11
modules/document/queries/updateUploadedCount.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="updateUploadedCount" action="update">
<tables>
<table name="documents" />
</tables>
<columns>
<column name="uploaded_count" var="uploaded_count" default="0" filter="number" />
</columns>
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>
</query>

3
modules/editor/components/image_gallery/tpl/gallery.min.js vendored
View file

@ -1 +1,2 @@
!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(){var b,c,d,e,f=this._imgs;for(d in f)if(f.hasOwnProperty(d))for(b=0,c=f[d].length;c>b;b++)e=f[d][b],e.$obj=a("<img />").attr("src",e.path),e.$obj.load({img:e},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);
!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(){var b,c,d,e,f=this._imgs;for(d in f)if(f.hasOwnProperty(d))for(b=0,c=f[d].length;c>b;b++)e=f[d][b],e.$obj=a("<img />").attr("src",e.path),e.$obj.load({img:e},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);
//# sourceMappingURL=gallery.min.map

1
modules/editor/components/image_gallery/tpl/gallery.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"gallery.min.js","sources":["gallery.js"],"names":["$","g","xe","createApp","_imgs","_styles","init","this","API_ADD_IMAGE","sender","params","srl","path","key","test","request_uri","is_def","push","loaded","API_ONREADY","i","c","img","imgs","hasOwnProperty","length","$obj","attr","load","event","im","data","unbind","API_GET_IMAGES","API_SET_STYLE","sty","API_ONLOAD","cast","toUpperCase","substr","registerApp","jQuery"],"mappings":"CAGA,SAAUA,GAEV,GAAIC,GAAIC,GAAGC,UAAU,WACpBC,SACAC,WAEAC,KAAO,WACNC,KAAKH,UAENI,cAAgB,SAASC,EAAQC,GAChC,GAAIC,GAAMD,EAAO,GAAIE,EAAOF,EAAO,GAAIG,EAAM,IAAIF,CAE9C,UAASG,KAAKF,KAAOA,EAAOG,YAAcH,GACzCI,OAAOT,KAAKH,MAAMS,MAAON,KAAKH,MAAMS,OAExCN,KAAKH,MAAMS,GAAKI,MAAML,KAAKA,EAAKM,QAAO,KAExCC,YAAc,WACb,GAAIC,GAAGC,EAAGR,EAAKS,EAAKC,EAAOhB,KAAKH,KAGhC,KAAIS,IAAOU,GACV,GAAIA,EAAKC,eAAeX,GAExB,IAAIO,EAAE,EAAEC,EAAEE,EAAKV,GAAKY,OAAYJ,EAAJD,EAAOA,IAClCE,EAAMC,EAAKV,GAAKO,GAChBE,EAAII,KAAO1B,EAAE,WAAW2B,KAAK,MAAOL,EAAIV,MACxCU,EAAII,KAAKE,MAAMN,IAAIA,GAAM,SAASO,GACjC,GAAIC,GAAKD,EAAME,KAAKT,GAEpBQ,GAAGZ,QAAS,EACZY,EAAGJ,KAAKM,OAAO,WAKnBC,eAAiB,SAASxB,EAAQC,GACjC,GAAIC,GAAMD,EAAO,EAEjB,OAAOH,MAAKH,MAAM,IAAIO,QAEvBuB,cAAgB,SAASzB,EAAQC,GAChC,GAAIC,GAAMD,EAAO,GAAIyB,EAAMzB,EAAO,EAElCH,MAAKF,QAAQ,IAAIM,GAAOwB,GAEzBC,WAAa,WACZ,GAAIvB,GAAKsB,CAET,KAAItB,IAAON,MAAKH,MACXG,KAAKH,MAAMoB,eAAeX,KAC9BsB,EAAM5B,KAAKF,QAAQQ,IAAQ,OAE3BN,KAAK8B,KAAK,QAAQF,EAAIG,eAAgBzB,EAAI0B,OAAO,QAKpDrC,IAAGsC,YAAY,GAAIvC,KAEhBwC"}

3
modules/editor/components/image_gallery/tpl/list_gallery.min.js vendored
View file

@ -1 +1,2 @@
!function(a){var b=xe.createPlugin("list",{API_SHOW_LIST:function(b,c){var d,e,f,g,h,i,j,k,l,m,n=c[0];if(d=this.cast("GET_IMAGES",[n]),d.length)for(e=a("#zone_list_gallery_"+n).empty(),width=e.innerWidth(),f=0,g=d.length;g>f;f++)h=d[f],j=h.$obj.prop("width"),l=h.$obj.prop("height"),0==j&&(j=h.$obj.attr("width")),0==l&&(l=h.$obj.attr("height")),j>width-25&&(k=width-25,i=k/j,m=Math.floor(l*i),j=k,l=m,h.$obj.attr("rel","xe_gallery")),e.append(h.$obj),h.$obj.css({width:j+"px",height:l,margin:"0 10px",display:"block"})}}),c=xe.getApp("Gallery")[0];c&&c.registerPlugin(new b)}(jQuery);
!function(a){var b=xe.createPlugin("list",{API_SHOW_LIST:function(b,c){var d,e,f,g,h,i,j,k,l,m,n=c[0];if(d=this.cast("GET_IMAGES",[n]),d.length)for(e=a("#zone_list_gallery_"+n).empty(),width=e.innerWidth(),f=0,g=d.length;g>f;f++)h=d[f],j=h.$obj.prop("width"),l=h.$obj.prop("height"),0==j&&(j=h.$obj.attr("width")),0==l&&(l=h.$obj.attr("height")),j>width-25&&(k=width-25,i=k/j,m=Math.floor(l*i),j=k,l=m,h.$obj.attr("rel","xe_gallery")),e.append(h.$obj),h.$obj.css({width:j+"px",height:l,margin:"0 10px",display:"block"})}}),c=xe.getApp("Gallery")[0];c&&c.registerPlugin(new b)}(jQuery);
//# sourceMappingURL=list_gallery.min.map

1
modules/editor/components/image_gallery/tpl/list_gallery.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"list_gallery.min.js","sources":["list_gallery.js"],"names":["$","listShow","xe","createPlugin","API_SHOW_LIST","sender","params","imgs","$zone","i","c","im","scale","w1","w2","h1","h2","srl","this","cast","length","empty","width","innerWidth","$obj","prop","attr","Math","floor","append","css","height","margin","display","gallery","getApp","registerPlugin","jQuery"],"mappings":"CAMA,SAAUA,GAEV,GAAIC,GAAWC,GAAGC,aAAa,QAC9BC,cAAgB,SAASC,EAAQC,GAChC,GAAqBC,GAAMC,EAAOC,EAAGC,EAAGC,EAAIC,EAAOC,EAAIC,EAAIC,EAAIC,EAA3DC,EAAMX,EAAO,EAIjB,IAFAC,EAAOW,KAAKC,KAAK,cAAeF,IAE5BV,EAAKa,OAKT,IAHAZ,EAAQR,EAAE,sBAAsBiB,GAAKI,QACrCC,MAAQd,EAAMe,aAEVd,EAAE,EAAEC,EAAEH,EAAKa,OAAYV,EAAJD,EAAOA,IAC7BE,EAAKJ,EAAKE,GACVI,EAAKF,EAAGa,KAAKC,KAAK,SAClBV,EAAKJ,EAAGa,KAAKC,KAAK,UAER,GAANZ,IACHA,EAAKF,EAAGa,KAAKE,KAAK,UAEX,GAALX,IACFA,EAAKJ,EAAGa,KAAKE,KAAK,WAGhBb,EAAKS,MAAQ,KACfR,EAAKQ,MAAQ,GACbV,EAASE,EAAKD,EACdG,EAAKW,KAAKC,MAAMb,EAAKH,GAErBC,EAAKC,EAAIC,EAAKC,EACdL,EAAGa,KAAKE,KAAK,MAAO,eAGrBlB,EAAMqB,OAAOlB,EAAGa,MAChBb,EAAGa,KAAKM,KAAKR,MAAMT,EAAG,KAAMkB,OAAOhB,EAAIiB,OAAO,SAAUC,QAAQ,aAK/DC,EAAUhC,GAAGiC,OAAO,WAAW,EAChCD,IAASA,EAAQE,eAAe,GAAInC,KAEpCoC"}

3
modules/editor/components/image_gallery/tpl/popup.min.js vendored
View file

@ -1 +1,2 @@
function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=opener.get_by_id("uploaded_file_list_"+k);if(l)for(var m=get_by_id("image_list"),n=0;n<l.length;n++){var o=l.options[n],p=o.value;if(!p)return;var q=opener.uploadedFiles[p],r=q.download_url.replace(request_uri,"");if(/(jpg|jpeg|gif|png)$/i.test(r)){var s=!1;-1!=i.indexOf(r)&&(s=!0);var o=new Option(o.text,o.value,!1,s);m.options.add(o)}}}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=opener.uploadedFiles[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null;jQuery(function(){getSlideShow()});
function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=opener.get_by_id("uploaded_file_list_"+k);if(l)for(var m=get_by_id("image_list"),n=0;n<l.length;n++){var o=l.options[n],p=o.value;if(!p)return;var q=opener.uploadedFiles[p],r=q.download_url.replace(request_uri,"");if(/(jpg|jpeg|gif|png)$/i.test(r)){var s=!1;-1!=i.indexOf(r)&&(s=!0);var o=new Option(o.text,o.value,!1,s);m.options.add(o)}}}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=opener.uploadedFiles[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null;jQuery(function(){getSlideShow()});
//# sourceMappingURL=popup.min.map

1
modules/editor/components/image_gallery/tpl/popup.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"popup.min.js","sources":["popup.js"],"names":["getSlideShow","node","$node","width","style","align","border_color","bg_color","thickness","selected_images","opener","editorPrevNode","jQuery","is","selected_node","attr","get_by_id","value","selectedIndex","fo","editor_sequence","parent_list_obj","list_obj","i","length","opt","options","file_srl","file_obj","uploadedFiles","filename","download_url","replace","request_uri","test","selected","indexOf","Option","text","add","insertSlideShow","list","Array","window","close","gallery_style","gallery_align","border_thickness","images_list","trim","setAttribute","editorFocus","editorPrevSrl","iframe_obj","editorGetIFrame","editorReplaceHTML","select_color","type","code","backgroundColor"],"mappings":"AACA,QAASA,gBACR,GAAIC,GAAMC,EAA6BC,EAAOC,EAAOC,EAAOC,EAAcC,EAAUC,EAAnEC,EAAkB,EAGhC,IAAmB,mBAAV,QAAT,CAGAR,EAAQS,OAAOC,eAClBT,EAAQU,OAAOX,GACTC,EAAMW,GAAG,SACRC,cAAgBb,EAEhBE,EAAQD,EAAMC,QACdC,EAAQF,EAAMa,KAAK,iBACnBV,EAAQH,EAAMa,KAAK,kBAAoB,SACvCT,EAAeJ,EAAMa,KAAK,gBAC1BR,EAAYL,EAAMa,KAAK,YACvBP,EAAYN,EAAMa,KAAK,qBAAuB,EAE9CC,UAAU,SAASC,MAAQd,EACjCa,UAAU,iBAAiBE,cAAwB,QAAPd,EAAe,EAAE,EAC7DY,UAAU,iBAAiBE,cAAwB,QAAPb,EAAe,EAAU,SAAPA,EAAgB,EAAE,EAC1EW,UAAU,oBAAoBC,MAAQT,EAEtCQ,UAAU,sBAAsBC,MAAQX,EAExCU,UAAU,kBAAkBC,MAAQV,EAEpCE,EAAkBP,EAAMa,KAAK,eAIjC,IAAII,GAAKH,UAAU,MACfI,EAAkBD,EAAGC,gBAAgBH,MAErCI,EAAkBX,OAAOM,UAAU,sBAAsBI,EAC7D,IAAGC,EAIC,IAAI,GAFAC,GAAWN,UAAU,cAEjBO,EAAE,EAAEA,EAAEF,EAAgBG,OAAOD,IAAK,CACtC,GAAIE,GAAMJ,EAAgBK,QAAQH,GAC9BI,EAAWF,EAAIR,KACnB,KAAIU,EAAU,MACd,IAAIC,GAAWlB,OAAOmB,cAAcF,GAChCG,EAAWF,EAASG,aAAaC,QAAQC,YAAY,GACzD,IAAG,uBAAyBC,KAAKJ,GAAW,CACxC,GAAIK,IAAW,CACuB,KAAnC1B,EAAgB2B,QAAQN,KAAeK,GAAW,EACrD,IAAIV,GAAM,GAAIY,QAAOZ,EAAIa,KAAMb,EAAIR,OAAO,EAAOkB,EACjDb,GAASI,QAAQa,IAAId,MAOrC,QAASe,mBACL,GAAmB,mBAAV,QAAT,CAIA,IAAI,GAFAC,GAAO,GAAIC,OACXpB,EAAWN,UAAU,cACjBO,EAAE,EAAEA,EAAED,EAASE,OAAOD,IAAK,CAC/B,GAAIE,GAAMH,EAASI,QAAQH,EAC3B,IAAGE,EAAIU,SAAU,CACb,GAAIR,GAAWF,EAAIR,MACfW,EAAWlB,OAAOmB,cAAcF,GAChCG,EAAWF,EAASG,aAAaC,QAAQC,YAAY,GACzDQ,GAAKA,EAAKjB,QAAUM,GAI5B,IAAIW,EAAKjB,OAEL,WADAmB,QAAOC,OAaX,KAAI,GATAzC,GAAQa,UAAU,SAASC,MAE3B4B,EAAgB7B,UAAU,iBAAiBU,QAAQV,UAAU,iBAAiBE,eAAeD,MAC7F6B,EAAgB9B,UAAU,iBAAiBU,QAAQV,UAAU,iBAAiBE,eAAeD,MAC7F8B,EAAmB/B,UAAU,oBAAoBC,MACjDX,EAAeU,UAAU,sBAAsBC,MAC/CV,EAAWS,UAAU,kBAAkBC,MAEvC+B,EAAc,GACVzB,EAAE,EAAGA,EAAEkB,EAAKjB,OAAOD,IACvByB,GAAeP,EAAKlB,GAAG0B,OAAO,GAElC,IAAGnC,cACCA,cAAcoC,aAAa,QAAS/C,GACpCW,cAAcoC,aAAa,gBAAiBL,GAC5C/B,cAAcoC,aAAa,QAASJ,GACpChC,cAAcoC,aAAa,gBAAiBJ,GAC5ChC,cAAcoC,aAAa,mBAAoBH,GAC/CjC,cAAcoC,aAAa,eAAgB5C,GAC3CQ,cAAcoC,aAAa,WAAY3C,GACvCO,cAAcoC,aAAa,cAAeF,GAC1ClC,cAAcV,MAAMD,MAAQA,EAAM,SAC/B,CACH,GAAImC,GAAO,uFAA4FnC,EAAM,oBAAsB0C,EAAc,YAAcC,EAAc,oBAAsBA,EAAc,uBAAyBC,EAAiB,mBAAqBzC,EAAa,eAAiBC,EAAS,kBAAoBJ,EAAM,0JAA4J6C,EAAY,MACzftC,QAAOyC,YAAYzC,OAAO0C,cAC1B,IAAIC,GAAa3C,OAAO4C,gBAAgB5C,OAAO0C,cAC/C1C,QAAO6C,kBAAkBF,EAAYf,GAGzC5B,OAAOyC,YAAYzC,OAAO0C,eAE1BT,OAAOC,SAIX,QAASY,cAAaC,EAAMC,GAC1B1C,UAAUyC,EAAK,kBAAkBrD,MAAMuD,gBAAkB,IAAID,EAC7D1C,UAAUyC,EAAK,gBAAgBxC,MAAQyC,EAnHzC,GAAI5C,eAAgB,IAsHpBF,QAAO,WACNZ"}

3
modules/editor/components/image_gallery/tpl/slide_gallery.min.js vendored
View file

@ -1 +1,2 @@
!function(a){var b=xe.createPlugin("slideShow",{_holders:{},_thumbs:{},_current:{},init:function(){this._holders={},this._thumbs={},this._current={}},API_SHOW_SLIDE:function(b,c){var d,e,f,g,h,i,j=this,k=c[0],l="@"+k;if(d=this.cast("GET_IMAGES",[k]),d.length){for(var h=0,m=d.length;m>h;h++)if(!d[h].loaded)return void setTimeout(function(){j.cast("SHOW_SLIDE",c)},200);for(e=a("#zone_slide_gallery_"+k),g=e.find(".slide_gallery_placeholder").css("overflow","hidden"),e.find(".slide_gallery_loading_text").remove(),f=e.find(".slide_gallery_thumbnail_image_box").show(),h=0,i=d.length;i>h;h++)d[h].$obj.clone().css({cursor:"pointer",width:"60px",height:"60px",margin:"5px",opacity:.5}).click({idx:h},function(a){j.cast("SET_SLIDE",[k,a.data.idx])}).appendTo(f);a("#zone_gallery_navigator_status_"+k).click(function(){f.toggle()}),e.find(".__prev").click(function(){return j.cast("PREV_SLIDE",[k]),!1}).end().find(".__next").click(function(){return j.cast("NEXT_SLIDE",[k]),!1}),this._holders[l]=g,this._thumbs[l]=f,this._current[l]=0,this.cast("SET_SLIDE",[k,0])}},_showSideSlide:function(a,b){var c,d,e;c=this.cast("GET_IMAGES",[a]),c.length&&(d=this._current["@"+a],e=d+b,0>e?e=c.length-1:e>=c.length&&(e=0),this.cast("SET_SLIDE",[a,e]))},API_NEXT_SLIDE:function(a,b){this._showSideSlide(b[0],1)},API_PREV_SLIDE:function(a,b){this._showSideSlide(b[0],-1)},API_SET_SLIDE:function(b,c){var d,e,f,g,h,i,j,k,l,m=c[0],n=c[1];d=this.cast("GET_IMAGES",[m]),d.length&&is_def(e=d[n])&&(this._current["@"+m]=n,a("#zone_gallery_navigator_status_"+m).text(n+1+"/"+d.length),this._thumbs["@"+m].find("img").eq(n).animate({opacity:1}).end().not(":eq("+n+")").animate({opacity:.5}),f=this._holders["@"+m],g=f.parent().innerWidth(),h=e.$obj.prop("width"),j=e.$obj.prop("height"),0==h&&(h=e.$obj.attr("width")),0==j&&(j=e.$obj.attr("height")),h>g-20&&(i=g-20,l=i/h,k=Math.floor(j*l),h=i,j=k,e.$obj.css("cursor","pointer"),e.$obj.attr("rel","xe_gallery")),e.$obj.css({width:h,height:j,margin:"0 10px"}),f.empty().append(e.$obj))}}),c=xe.getApp("Gallery")[0];c&&c.registerPlugin(new b)}(jQuery);
!function(a){var b=xe.createPlugin("slideShow",{_holders:{},_thumbs:{},_current:{},init:function(){this._holders={},this._thumbs={},this._current={}},API_SHOW_SLIDE:function(b,c){var d,e,f,g,h,i,j=this,k=c[0],l="@"+k;if(d=this.cast("GET_IMAGES",[k]),d.length){for(var h=0,m=d.length;m>h;h++)if(!d[h].loaded)return void setTimeout(function(){j.cast("SHOW_SLIDE",c)},200);for(e=a("#zone_slide_gallery_"+k),g=e.find(".slide_gallery_placeholder").css("overflow","hidden"),e.find(".slide_gallery_loading_text").remove(),f=e.find(".slide_gallery_thumbnail_image_box").show(),h=0,i=d.length;i>h;h++)d[h].$obj.clone().css({cursor:"pointer",width:"60px",height:"60px",margin:"5px",opacity:.5}).click({idx:h},function(a){j.cast("SET_SLIDE",[k,a.data.idx])}).appendTo(f);a("#zone_gallery_navigator_status_"+k).click(function(){f.toggle()}),e.find(".__prev").click(function(){return j.cast("PREV_SLIDE",[k]),!1}).end().find(".__next").click(function(){return j.cast("NEXT_SLIDE",[k]),!1}),this._holders[l]=g,this._thumbs[l]=f,this._current[l]=0,this.cast("SET_SLIDE",[k,0])}},_showSideSlide:function(a,b){var c,d,e;c=this.cast("GET_IMAGES",[a]),c.length&&(d=this._current["@"+a],e=d+b,0>e?e=c.length-1:e>=c.length&&(e=0),this.cast("SET_SLIDE",[a,e]))},API_NEXT_SLIDE:function(a,b){this._showSideSlide(b[0],1)},API_PREV_SLIDE:function(a,b){this._showSideSlide(b[0],-1)},API_SET_SLIDE:function(b,c){var d,e,f,g,h,i,j,k,l,m=c[0],n=c[1];d=this.cast("GET_IMAGES",[m]),d.length&&is_def(e=d[n])&&(this._current["@"+m]=n,a("#zone_gallery_navigator_status_"+m).text(n+1+"/"+d.length),this._thumbs["@"+m].find("img").eq(n).animate({opacity:1}).end().not(":eq("+n+")").animate({opacity:.5}),f=this._holders["@"+m],g=f.parent().innerWidth(),h=e.$obj.prop("width"),j=e.$obj.prop("height"),0==h&&(h=e.$obj.attr("width")),0==j&&(j=e.$obj.attr("height")),h>g-20&&(i=g-20,l=i/h,k=Math.floor(j*l),h=i,j=k,e.$obj.css("cursor","pointer"),e.$obj.attr("rel","xe_gallery")),e.$obj.css({width:h,height:j,margin:"0 10px"}),f.empty().append(e.$obj))}}),c=xe.getApp("Gallery")[0];c&&c.registerPlugin(new b)}(jQuery);
//# sourceMappingURL=slide_gallery.min.map

1
modules/editor/components/image_gallery/tpl/slide_gallery.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"slide_gallery.min.js","sources":["slide_gallery.js"],"names":["$","slideShow","xe","createPlugin","_holders","_thumbs","_current","init","this","API_SHOW_SLIDE","sender","params","imgs","$zone","$thumb","$holder","i","c","self","srl","key","cast","length","nLen","loaded","setTimeout","find","css","remove","show","$obj","clone","cursor","width","height","margin","opacity","click","idx","event","data","appendTo","toggle","end","_showSideSlide","pos","cur","side","API_NEXT_SLIDE","API_PREV_SLIDE","API_SET_SLIDE","im","iwidth","w1","w2","h1","h2","scale","is_def","text","eq","animate","not","parent","innerWidth","prop","attr","Math","floor","empty","append","gallery","getApp","registerPlugin","jQuery"],"mappings":"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"}

2
modules/editor/components/poll_maker/tpl/filter/insert_poll.xml
View file

@ -1,4 +1,4 @@
<filter name="insert_poll" module="poll" act="procInsert" confirm_msg_code="confirm_submit">
<filter name="insert_poll" module="poll" act="procPollInsert" confirm_msg_code="confirm_submit">
<form />
<parameter />
<response callback_func="completeInsertPoll">

3
modules/editor/skins/xpresseditor/js/xe_textarea.min.js vendored
View file

@ -1 +1,2 @@
function editorStartTextarea(a,b,c){var d=xGetElementById("editor_"+a),e=xGetElementById("htm_"+a).value;d.form.setAttribute("editor_sequence",a),d.style.width="100%",editorRelKeys[a]=new Array,editorRelKeys[a].primary=d.form[c],editorRelKeys[a].content=d.form[b],editorRelKeys[a].func=editorGetContentTextarea;var f=d.form[b].value;e&&(f=f.replace(/<br([^>]*)>/gi,"\n"),"br"!=e&&(f=f.replace(/&lt;/g,"<"),f=f.replace(/&gt;/g,">"),f=f.replace(/&quot;/g,'"'),f=f.replace(/&amp;/g,"&"))),d.value=f}function editorGetContentTextarea(a){var b=xGetElementById("editor_"+a),c=xGetElementById("htm_"+a).value,d=b.value.trim();return c&&("br"!=c&&(d=d.replace(/&/g,"&amp;"),d=d.replace(/</g,"&lt;"),d=d.replace(/>/g,"&gt;"),d=d.replace(/\"/g,"&quot;")),d=d.replace(/(\r\n|\n)/g,"<br />")),d}
function editorStartTextarea(a,b,c){var d=xGetElementById("editor_"+a),e=xGetElementById("htm_"+a).value;d.form.setAttribute("editor_sequence",a),d.style.width="100%",editorRelKeys[a]=new Array,editorRelKeys[a].primary=d.form[c],editorRelKeys[a].content=d.form[b],editorRelKeys[a].func=editorGetContentTextarea;var f=d.form[b].value;e&&(f=f.replace(/<br([^>]*)>/gi,"\n"),"br"!=e&&(f=f.replace(/&lt;/g,"<"),f=f.replace(/&gt;/g,">"),f=f.replace(/&quot;/g,'"'),f=f.replace(/&amp;/g,"&"))),d.value=f}function editorGetContentTextarea(a){var b=xGetElementById("editor_"+a),c=xGetElementById("htm_"+a).value,d=b.value.trim();return c&&("br"!=c&&(d=d.replace(/&/g,"&amp;"),d=d.replace(/</g,"&lt;"),d=d.replace(/>/g,"&gt;"),d=d.replace(/\"/g,"&quot;")),d=d.replace(/(\r\n|\n)/g,"<br />")),d}
//# sourceMappingURL=xe_textarea.min.map

1
modules/editor/skins/xpresseditor/js/xe_textarea.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"xe_textarea.min.js","sources":["xe_textarea.js"],"names":["editorStartTextarea","editor_sequence","content_key","primary_key","obj","xGetElementById","use_html","value","form","setAttribute","style","width","editorRelKeys","Array","editorGetContentTextarea","content","replace","trim"],"mappings":"AAAA,QAASA,qBAAoBC,EAAiBC,EAAaC,GACvD,GAAIC,GAAMC,gBAAgB,UAAUJ,GAChCK,EAAWD,gBAAgB,OAAOJ,GAAiBM,KACvDH,GAAII,KAAKC,aAAa,kBAAmBR,GAEzCG,EAAIM,MAAMC,MAAQ,OAElBC,cAAcX,GAAmB,GAAIY,OACrCD,cAAcX,GAA0B,QAAIG,EAAII,KAAKL,GACrDS,cAAcX,GAA0B,QAAIG,EAAII,KAAKN,GACrDU,cAAcX,GAAuB,KAAIa,wBAEzC,IAAIC,GAAUX,EAAII,KAAKN,GAAaK,KACjCD,KACCS,EAAUA,EAAQC,QAAQ,gBAAgB,MAC7B,MAAVV,IACCS,EAAUA,EAAQC,QAAQ,QAAS,KACnCD,EAAUA,EAAQC,QAAQ,QAAS,KACnCD,EAAUA,EAAQC,QAAQ,UAAW,KACrCD,EAAUA,EAAQC,QAAQ,SAAU,OAG5CZ,EAAIG,MAAQQ,EAGhB,QAASD,0BAAyBb,GAC9B,GAAIG,GAAMC,gBAAgB,UAAUJ,GAChCK,EAAWD,gBAAgB,OAAOJ,GAAiBM,MACnDQ,EAAUX,EAAIG,MAAMU,MAUxB,OATGX,KACc,MAAVA,IACCS,EAAUA,EAAQC,QAAQ,KAAM,SAChCD,EAAUA,EAAQC,QAAQ,KAAM,QAChCD,EAAUA,EAAQC,QAAQ,KAAM,QAChCD,EAAUA,EAAQC,QAAQ,MAAO,WAErCD,EAAUA,EAAQC,QAAQ,aAAc,WAErCD"}

4
modules/editor/skins/xpresseditor/js/xpresseditor.js
View file

@ -1,7 +1,5 @@
/*! Copyright (C) NAVER <http://www.navercorp.com> */
/**!
* @file common.js + js_app.js + xml_handler.js + xml_js_filter.js
* @brief XE Common JavaScript
* @concat Xpress_Editor.js + xe_interface.js
**/
(function($){

3
modules/editor/skins/xpresseditor/js/xpresseditor.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/skins/xpresseditor/js/xpresseditor.min.map Normal file
View file

File diff suppressed because one or more lines are too long

3
modules/editor/tpl/js/editor.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/js/editor.min.map Normal file
View file

File diff suppressed because one or more lines are too long

3
modules/editor/tpl/js/editor_common.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/js/editor_common.min.map Normal file
View file

File diff suppressed because one or more lines are too long

3
modules/editor/tpl/js/editor_module_config.min.js vendored
View file

@ -1 +1,2 @@
function getEditorSkinColorList(a,b,c,d){if(a.length>0){c=c||"document";var e=new Array("error","message","colorset");exec_xml("editor","dispEditorSkinColorset",{skin:a},resultGetEditorSkinColorList,e,{selected_colorset:b,type:c,testid:d})}}function resultGetEditorSkinColorList(a,b,c){var d=null;jQuery(function(b){if(d=c.testid?b("#"+c.testid).next("label").children("select"):b("document"==c.type?"select[name=sel_editor_colorset]":"select[name=sel_comment_editor_colorset]"),d.html(""),"document"==c.type?(b("select[name=sel_editor_colorset]").hide().removeAttr("name"),d.attr("name","sel_editor_colorset")):(b("select[name=sel_comment_editor_colorset]").hide().removeAttr("name"),d.attr("name","sel_comment_editor_colorset")),0==a.error&&a.colorset){var e=[],f=a.colorset.item;"undefined"==typeof f[0]?e[0]=f:e=f;for(var g=0;g<e.length;g++){var h=b('<option value="'+e[g].name+'" >'+e[g].title+"</option>");c.selected_colorset==e[g].name&&h.attr("selected","selected"),d.append(h)}d.show()}else d.hide(),d.html("")})}
function getEditorSkinColorList(a,b,c,d){if(a.length>0){c=c||"document";var e=new Array("error","message","colorset");exec_xml("editor","dispEditorSkinColorset",{skin:a},resultGetEditorSkinColorList,e,{selected_colorset:b,type:c,testid:d})}}function resultGetEditorSkinColorList(a,b,c){var d=null;jQuery(function(b){if(d=c.testid?b("#"+c.testid).next("label").children("select"):b("document"==c.type?"select[name=sel_editor_colorset]":"select[name=sel_comment_editor_colorset]"),d.html(""),"document"==c.type?(b("select[name=sel_editor_colorset]").hide().removeAttr("name"),d.attr("name","sel_editor_colorset")):(b("select[name=sel_comment_editor_colorset]").hide().removeAttr("name"),d.attr("name","sel_comment_editor_colorset")),0==a.error&&a.colorset){var e=[],f=a.colorset.item;"undefined"==typeof f[0]?e[0]=f:e=f;for(var g=0;g<e.length;g++){var h=b('<option value="'+e[g].name+'" >'+e[g].title+"</option>");c.selected_colorset==e[g].name&&h.attr("selected","selected"),d.append(h)}d.show()}else d.hide(),d.html("")})}
//# sourceMappingURL=editor_module_config.min.map

1
modules/editor/tpl/js/editor_module_config.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"editor_module_config.min.js","sources":["editor_module_config.js"],"names":["getEditorSkinColorList","skin_name","selected_colorset","type","testid","length","response_tags","Array","exec_xml","skin","resultGetEditorSkinColorList","ret_obj","params","selectbox","jQuery","$","next","children","html","hide","removeAttr","attr","error","colorset","it","items","item","i","$options","name","title","append","show"],"mappings":"AAAA,QAASA,wBAAuBC,EAAUC,EAAkBC,EAAKC,GAChE,GAAGH,EAAUI,OAAO,EAAE,CACrBF,EAAOA,GAAQ,UACf,IAAIG,GAAgB,GAAIC,OAAM,QAAQ,UAAU,WAChDC,UAAS,SAAS,0BAA0BC,KAAKR,GAAWS,6BAA6BJ,GAAeJ,kBAAoBA,EAAkBC,KAAOA,EAAKC,OAASA,KAIrK,QAASM,8BAA6BC,EAAQL,EAAeM,GAC5D,GAAIC,GAAY,IAChBC,QAAO,SAASC,GAmBf,GAjBCF,EADED,EAAOR,OACGW,EAAE,IAAIH,EAAOR,QAAQY,KAAK,SAASC,SAAS,UAEdF,EAAd,YAAfH,EAAOT,KAAwB,mCAAwC,4CAErFU,EAAUK,KAAK,IAEG,YAAfN,EAAOT,MACTY,EAAE,oCAAoCI,OACpCC,WAAW,QACbP,EAAUQ,KAAK,OAAO,yBAEtBN,EAAE,4CAA4CI,OAC5CC,WAAW,QACbP,EAAUQ,KAAK,OAAO,gCAIH,GAAjBV,EAAQW,OAAcX,EAAQY,SAAS,CACzC,GAAIC,MACAC,EAAQd,EAAQY,SAASG,IACN,oBAAbD,GAAM,GACfD,EAAG,GAAKC,EAERD,EAAKC,CAIN,KAAI,GAAIE,GAAE,EAAEA,EAAEH,EAAGnB,OAAOsB,IAAI,CAC3B,GAAIC,GAAWb,EAAE,kBAAkBS,EAAGG,GAAGE,KAAK,MAAML,EAAGG,GAAGG,MAAM,YAE7DlB,GAAOV,mBAAqBsB,EAAGG,GAAGE,MACpCD,EAASP,KAAK,WAAY,YAG3BR,EAAUkB,OAAOH,GAElBf,EAAUmB,WAEVnB,GAAUM,OACVN,EAAUK,KAAK"}

3
modules/editor/tpl/js/swfupload.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/js/swfupload.min.map Normal file
View file

File diff suppressed because one or more lines are too long

3
modules/editor/tpl/js/uploader.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/js/uploader.min.map Normal file
View file

File diff suppressed because one or more lines are too long

51
modules/file/file.controller.php
View file

@ -626,6 +626,25 @@ class fileController extends file
{
$oFileModel = getModel('file');
$config = $oFileModel->getFileConfig($module_srl);
// check file type
if(isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
{
$filetypes = explode(';', $config->allowed_filetypes);
$ext = array();
foreach($filetypes as $item) {
$item = explode('.', $item);
$ext[] = strtolower($item[1]);
}
$uploaded_ext = explode('.', $file_info['name']);
$uploaded_ext = strtolower(array_pop($uploaded_ext));
if(!in_array($uploaded_ext, $ext))
{
return $this->stop('msg_not_allowed_filetype');
}
}
$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
// An error appears if file size exceeds a limit
@ -758,25 +777,30 @@ class fileController extends file
{
if(!$file_srl) return;
$srls = explode(',',$file_srl);
$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
if(!count($srls)) return;
$oDocumentController = getController('document');
$documentSrlList = array();
for($i=0, $c=count($srls); $i<$c; $i++)
foreach($srls as $srl)
{
$srl = (int)$srls[$i];
if(!$srl) continue;
$srl = (int)$srl;
if(!$srl)
{
continue;
}
$args = new stdClass;
$args = new stdClass();
$args->file_srl = $srl;
$output = executeQuery('file.getFile', $args);
if(!$output->toBool()) continue;
if(!$output->toBool() || !$output->data)
{
continue;
}
$file_info = $output->data;
if(!$file_info) continue;
if($file_info->upload_target_srl)
{
@ -823,12 +847,6 @@ class fileController extends file
// Success returned if no attachement exists
if(!is_array($file_list)||!count($file_list)) return new Object();
// Remove from the DB
$args = new stdClass();
$args->upload_target_srl = $upload_target_srl;
$output = executeQuery('file.deleteFiles', $args);
if(!$output->toBool()) return $output;
// Delete the file
$path = array();
$file_count = count($file_list);
@ -840,6 +858,13 @@ class fileController extends file
$path_info = pathinfo($uploaded_filename);
if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
}
// Remove from the DB
$args = new stdClass();
$args->upload_target_srl = $upload_target_srl;
$output = executeQuery('file.deleteFiles', $args);
if(!$output->toBool()) return $output;
// Remove a file directory of the document
for($i=0, $c=count($path); $i<$c; $i++)
{

3
modules/file/lang/lang.xml
View file

@ -331,6 +331,9 @@
<value xml:lang="tr"><![CDATA[Ek dosya boyutu, izin verilen boyuttan büyük.]]></value>
<value xml:lang="vi"><![CDATA[Dung lượng File quá lớn.]]></value>
</item>
<item name="msg_not_allowed_filetype">
<value xml:lang="ko"><![CDATA[업로드할 수 없는 파일 형식입니다.]]></value>
</item>
<item name="msg_file_not_found">
<value xml:lang="ko"><![CDATA[요청한 파일을 찾을 수 없습니다.]]></value>
<value xml:lang="en"><![CDATA[Could not find requested file.]]></value>

3
modules/importer/tpl/js/importer_admin.min.js vendored
View file

@ -1 +1,2 @@
function doSync(){return exec_xml("importer","procImporterAdminSync",[],function(a){alert(a.message),location.href=location.href}),!1}function doPreProcessing(a,b){function c(a){var c,d,e,g,i,j,k;if(h=!0,-1==a.status)return alert(a.message);for(c=get_by_id("fo_process"),d=c.elements,e=0,g=f.length;g>e;e++)i=f[e],d[i]?d[i].value=a[i]:0;if(k=get_by_id(b))for(j=["target_module","guestbook_target_module","user_id","unit_count"],e=0,g=j.length;g>e;e++)i=j[e],k.elements[i]&&(c.elements[i].value=k.elements[i].value);jQuery("#preProgressMsg").hide(),jQuery("#progressMsg").show(),doImport(b)}var d,e,f,g,h=!1,i=jQuery;return d=a.elements.xml_file.value,e=a.elements.type.value,d?(g=i("#process"),i("body").children(".x_modal-backdrop").length||i("body").append('<div class="x_modal-backdrop" />'),i('a[href="#process"].modalAnchor').trigger("open.mw"),exec_xml("importer","procImporterAdminPreProcessing",{type:e,xml_file:d},c,f=["error","message","type","total","cur","key","status"]),!1):!1}function doImport(a){function b(b){function c(){alert(b.message),jQuery('a[href="#process"].modalAnchor').unbind("before-close.mw").trigger("close.mw").find("#progressBar").width(1).end().find("#progressPercent").html("0%").end();try{f.reset(),get_by_id(a).reset()}catch(c){}jQuery("span.btn > input[type=submit]").attr("disabled","disabled")}var d,i,j,k;for(d=0,i=e.length;i>d;d++)j=e[d],g[j]?g[j].value=b[j]:0;b.total=parseInt(b.total,10)||0,b.cur=parseInt(b.cur,10)||0,percent=parseInt(b.cur/b.total*100),jQuery("#totalCount").text(b.total),jQuery("#completeCount").text(b.cur),jQuery("#progressBar").width(percent+"%"),jQuery("#progressPercent").html(percent+"%"),b.total>b.cur?doImport(a):(k=get_by_id(a),null!=k&&k.isSync.checked?exec_xml("importer","procImporterAdminSync",h,function(a){!a||a.error&&"0"!=a.error||c()},e=["error","message"]):c())}var c,d,e,f=get_by_id("fo_process"),g=f.elements,h={};for(c=0,d=g.length;d>c;c++)h[g[c].name]=g[c].value;return show_waiting_message=!1,exec_xml("importer","procImporterAdminImport",h,b,e=["error","message","type","total","cur","key"]),show_waiting_message=!0,!1}function displayProgress(a,b){var c,d;c=Math.max(a?Math.round(b/a*100):100,1),d=jQuery("#status"),d.find("div.progress1").length||d.html('<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>'),d.find("div.progress1").html(c+"&nbsp;").css("width",c+"%").end().find("div.progress2").text(b+"/"+a)}jQuery(function(a){a(".checkxml").find("input:text").change(function(){a(this).closest(".checkxml").find(".x_help-inline").hide()}).end().find("button").click(function(){function b(a){var b,e;return e=g.find(">.xml"),b=g.find(">.ttxml"),$message.text(a.result_message),a.error||"true"!=a.exists?($message.attr("class","x_help-inline").fadeIn(300),b=b.filter(":visible"),b.eq(-1).slideUp(100,function(){b=b.slice(0,-1).eq(-1).slideUp(100,arguments.callee)}),g.find(":submit").attr("disabled","disabled"),c()):($message.attr("class","x_help-inline").fadeIn(300),g.find(":submit").removeAttr("disabled"),h=g.find(".syncmember:hidden"),f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),void("XML"==a.type?e.not(":visible").add(h).slideDown(300):"TTXML"==a.type&&(b.not(":visible").add(h).slideDown(300),g.find("input[name=type]").val("ttxml"))))}function c(){return f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),g.find(".syncmember:visible").slideUp(100),!1}var d,e,f,g,h;d=a(this).prop("disabled",!0),g=d.closest("form"),e=d.closest(".checkxml"),f=e.find("input").prop("disabled",!0).addClass("loading"),$message=e.find(".x_help-inline").hide(),show_waiting_message=!1,a.exec_json("importer.procImporterAdminCheckXmlFile",{filename:a.trim(f.val())},b)}).end().find(".x_help-inline").hide().end().closest("form").find(">.ttxml").hide().end().end().closest("form").find(":submit").attr("disabled","disabled"),a(".syncmember").hide()});
function doSync(){return exec_xml("importer","procImporterAdminSync",[],function(a){alert(a.message),location.href=location.href}),!1}function doPreProcessing(a,b){function c(a){var c,d,e,g,i,j,k;if(h=!0,-1==a.status)return alert(a.message);for(c=get_by_id("fo_process"),d=c.elements,e=0,g=f.length;g>e;e++)i=f[e],d[i]?d[i].value=a[i]:0;if(k=get_by_id(b))for(j=["target_module","guestbook_target_module","user_id","unit_count"],e=0,g=j.length;g>e;e++)i=j[e],k.elements[i]&&(c.elements[i].value=k.elements[i].value);jQuery("#preProgressMsg").hide(),jQuery("#progressMsg").show(),doImport(b)}var d,e,f,g,h=!1,i=jQuery;return d=a.elements.xml_file.value,e=a.elements.type.value,d?(g=i("#process"),i("body").children(".x_modal-backdrop").length||i("body").append('<div class="x_modal-backdrop" />'),i('a[href="#process"].modalAnchor').trigger("open.mw"),exec_xml("importer","procImporterAdminPreProcessing",{type:e,xml_file:d},c,f=["error","message","type","total","cur","key","status"]),!1):!1}function doImport(a){function b(b){function c(){alert(b.message),jQuery('a[href="#process"].modalAnchor').unbind("before-close.mw").trigger("close.mw").find("#progressBar").width(1).end().find("#progressPercent").html("0%").end();try{f.reset(),get_by_id(a).reset()}catch(c){}jQuery("span.btn > input[type=submit]").attr("disabled","disabled")}var d,i,j,k;for(d=0,i=e.length;i>d;d++)j=e[d],g[j]?g[j].value=b[j]:0;b.total=parseInt(b.total,10)||0,b.cur=parseInt(b.cur,10)||0,percent=parseInt(b.cur/b.total*100),jQuery("#totalCount").text(b.total),jQuery("#completeCount").text(b.cur),jQuery("#progressBar").width(percent+"%"),jQuery("#progressPercent").html(percent+"%"),b.total>b.cur?doImport(a):(k=get_by_id(a),null!=k&&k.isSync.checked?exec_xml("importer","procImporterAdminSync",h,function(a){!a||a.error&&"0"!=a.error||c()},e=["error","message"]):c())}var c,d,e,f=get_by_id("fo_process"),g=f.elements,h={};for(c=0,d=g.length;d>c;c++)h[g[c].name]=g[c].value;return show_waiting_message=!1,exec_xml("importer","procImporterAdminImport",h,b,e=["error","message","type","total","cur","key"]),show_waiting_message=!0,!1}function displayProgress(a,b){var c,d;c=Math.max(a?Math.round(b/a*100):100,1),d=jQuery("#status"),d.find("div.progress1").length||d.html('<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>'),d.find("div.progress1").html(c+"&nbsp;").css("width",c+"%").end().find("div.progress2").text(b+"/"+a)}jQuery(function(a){a(".checkxml").find("input:text").change(function(){a(this).closest(".checkxml").find(".x_help-inline").hide()}).end().find("button").click(function(){function b(a){var b,e;return e=g.find(">.xml"),b=g.find(">.ttxml"),$message.text(a.result_message),a.error||"true"!=a.exists?($message.attr("class","x_help-inline").fadeIn(300),b=b.filter(":visible"),b.eq(-1).slideUp(100,function(){b=b.slice(0,-1).eq(-1).slideUp(100,arguments.callee)}),g.find(":submit").attr("disabled","disabled"),c()):($message.attr("class","x_help-inline").fadeIn(300),g.find(":submit").removeAttr("disabled"),h=g.find(".syncmember:hidden"),f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),void("XML"==a.type?e.not(":visible").add(h).slideDown(300):"TTXML"==a.type&&(b.not(":visible").add(h).slideDown(300),g.find("input[name=type]").val("ttxml"))))}function c(){return f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),g.find(".syncmember:visible").slideUp(100),!1}var d,e,f,g,h;d=a(this).prop("disabled",!0),g=d.closest("form"),e=d.closest(".checkxml"),f=e.find("input").prop("disabled",!0).addClass("loading"),$message=e.find(".x_help-inline").hide(),show_waiting_message=!1,a.exec_json("importer.procImporterAdminCheckXmlFile",{filename:a.trim(f.val())},b)}).end().find(".x_help-inline").hide().end().closest("form").find(">.ttxml").hide().end().end().closest("form").find(":submit").attr("disabled","disabled"),a(".syncmember").hide()});
//# sourceMappingURL=importer_admin.min.map

1
modules/importer/tpl/js/importer_admin.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"importer_admin.min.js","sources":["importer_admin.js"],"names":["doSync","exec_xml","ret","alert","message","location","href","doPreProcessing","form","formId","on_complete","fo_proc","elems","i","c","key","to_copy","fo_import","prepared","status","get_by_id","elements","resp","length","value","jQuery","hide","show","doImport","xml_file","type","$process","$","children","append","trigger","resultAlertMessage","unbind","find","width","end","html","reset","e","attr","total","parseInt","cur","percent","text","isSync","checked","params","error","name","show_waiting_message","displayProgress","per","$stat","Math","max","round","css","change","this","closest","click","data","$ttxml","$xml","$form","$message","result_message","exists","fadeIn","filter","eq","slideUp","slice","arguments","callee","restore","removeAttr","$syncmember","$input","prop","removeClass","$this","not","add","slideDown","val","$container","addClass","exec_json","filename","trim"],"mappings":"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"}

42
modules/install/install.controller.php
View file

@ -417,26 +417,34 @@ class installController extends install
FileHandler::writeFile(_XE_PATH_.$checkFilePath, trim($checkString));
$scheme = ($_SERVER['HTTPS'] === 'on') ? 'https' : 'http';
$hostname = $_SERVER['SERVER_NAME'];
$port = $_SERVER['SERVER_PORT'];
$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
$currentPath = str_replace($_SERVER['DOCUMENT_ROOT'], "", _XE_PATH_);
if($currentPath != "")
$query = $currentPath . $query;
$fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
if(!$fp) return false;
fputs($fp, "GET {$query} HTTP/1.0\r\n");
fputs($fp, "Host: {$hostname}\r\n\r\n");
$buff = '';
while(!feof($fp)) {
$str = fgets($fp, 1024);
if(trim($str)=='') $start = true;
if($start) $buff .= $str;
$str_port = '';
if($port)
{
$str_port = ':' . $port;
}
fclose($fp);
$tmpPath = $_SERVER['DOCUMENT_ROOT'];
//if DIRECTORY_SEPARATOR is not /(IIS)
if(DIRECTORY_SEPARATOR !== '/')
{
//change to slash for compare
$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
}
$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
$currentPath = str_replace($tmpPath, "", _XE_PATH_);
if($currentPath != "")
{
$query = $currentPath . $query;
}
$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
$requestConfig = array();
$requestConfig['ssl_verify_peer'] = false;
$buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'GET', null, array(), array(), array(), $requestConfig);
FileHandler::removeFile(_XE_PATH_.$checkFilePath);

13
modules/install/install.view.php
View file

@ -156,6 +156,19 @@ class installView extends install
$title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type'));
Context::set('title', $title);
$error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
if($_SERVER['HTTPS'] == 'on')
{
// Error occured when using https protocol at "ModuleHandler::init() '
$parsedUrl = parse_url($error_return_url);
$error_return_url = '';
if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
}
Context::set('error_return_url', $error_return_url);
$this->setTemplateFile($tpl_filename);
}

2
modules/install/tpl/form.cubrid.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="cubrid" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procCubridDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/install/tpl/form.mssql.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="mssql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procMssqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/install/tpl/form.mysql.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="mysql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/install/tpl/form.mysql_innodb.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="mysql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/install/tpl/form.mysqli.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="mysql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/install/tpl/form.mysqli_innodb.html
View file

@ -7,7 +7,7 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form rule="mysql" action="./" method="post" class="x_form-horizontal">
<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
<input type="hidden" value="{$error_return_url}" name="error_return_url">
<input type="hidden" name="act" value="procMysqlDBSetting" />
<input type="hidden" name="db_type" value="{$db_type}" />
<h2>{$title}</h2>

2
modules/member/lang/lang.xml
View file

@ -1361,7 +1361,7 @@
<value xml:lang="vi"><![CDATA[Xác nhận không hợp lệ.<br />Xin vui lòng kiểm tra lại hoặc liên hệ với Webmaster để được hỗ trợ!]]></value>
</item>
<item name="msg_success_authed">
<value xml:lang="ko"><![CDATA[인증이 정상적으로 되어 로그인 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하는 비밀번호로 변경하세요.]]></value>
<value xml:lang="ko"><![CDATA[인증이 정상적으로 되어 임시 비밀번호로 변경 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하는 비밀번호로 변경하세요.]]></value>
<value xml:lang="en"><![CDATA[Your account has been successfully activated and logged on.\n Please modify the password to your own one with the password in the mail.]]></value>
<value xml:lang="jp"><![CDATA[認証が正常に行われ、ログインできました。\n必ず確認メールに記載されたパスワードを利用してお好みのパスワードに変更してください。]]></value>
<value xml:lang="zh-CN"><![CDATA[新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。]]></value>

2
modules/member/member.admin.view.php
View file

@ -540,7 +540,7 @@ class memberAdminView extends member
$extentionReplace = array('tel_0' => $extendForm->value[0],
'tel_1' => $extendForm->value[1],
'tel_2' => $extendForm->value[2]);
$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:30px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:30px" title="Third Number" />';
$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
}
else if($extendForm->column_type == 'textarea')
{

19
modules/member/member.controller.php
View file

@ -719,9 +719,9 @@ class memberController extends member
// Get file information
list($width, $height, $type, $attrs) = @getimagesize($target_file);
if(IMG_PNG == $type) $ext = 'png';
elseif(IMG_JPG == $type) $ext = 'jpg';
elseif(IMG_GIF == $type) $ext = 'gif';
if(IMAGETYPE_PNG == $type) $ext = 'png';
elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
else
{
return;
@ -1105,7 +1105,12 @@ class memberController extends member
$args->member_srl = $member_srl;
$args->auth_key = $auth_key;
$output = executeQuery('member.getAuthMail', $args);
if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_auth_key');
if(!$output->toBool() || $output->data->auth_key != $auth_key)
{
if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthMail', $args);
return $this->stop('msg_invalid_auth_key');
}
// If credentials are correct, change the password to a new one
if($output->data->is_register == 'Y')
{
@ -2484,7 +2489,11 @@ class memberController extends member
$args->member_srl = $member_srl;
$args->auth_key = $auth_key;
$output = executeQuery('member.getAuthMail', $args);
if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_modify_email_auth_key');
if(!$output->toBool() || $output->data->auth_key != $auth_key)
{
if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
return $this->stop('msg_invalid_modify_email_auth_key');
}
$newEmail = $output->data->user_id;
$args->email_address = $newEmail;

1
modules/menu/menu.mobile.php
View file

@ -27,6 +27,7 @@ class menuMobile extends moduleObject
$obj->href = $menu_item['href'];
$obj->depth = $depth;
$obj->text = $menu_item['text'];
$obj->open_window = $menu_item['open_window'];
$this->result[] = $obj;
if(!$menu_item['list']) return;
foreach($menu_item['list'] as $item)

2
modules/menu/tpl/menu.html
View file

@ -16,7 +16,7 @@
{@ $depth -= 1}
<!--@end-->
<!--@endif-->
<li><a href="{$val->href}" >{$val->text}</a>
<li><a href="{$val->href}" target="_blank"|cond="$val->open_window=='Y'">{$val->text}</a>
{@ $start = false }
{@ $depth = $val->depth }
<!--@end-->

3
modules/menu/tpl/sitemap.html
View file

@ -3843,6 +3843,7 @@ jQuery(function($){
}
top.fullSetupDone = function(htData){
jQuery('#properties').show();
jQuery._xeAdminVar.oSetupWin.close();
}
$('a._openFullSetup').click(function(ev){
@ -3986,7 +3987,7 @@ top.fullSetupWinLoaded = function(){
var $target = $("<iframe>").attr('name', 'submitTarget').attr('src', 'about:_blank').attr('style', 'position:absolute; top:-10000px; left:-10000px; width:1025px;height:769px');
$form.append($target);
$form.append($("<INPUT>").attr("type", "hidden").attr("name", "xe_js_callback").attr("value", "top.opener.top.fullSetupDone();top.window.close();var dummy="));
$form.append($("<INPUT>").attr("type", "hidden").attr("name", "xe_js_callback").attr("value", "top.opener.top.fullSetupDone"));
$form.attr('target', 'submitTarget');
//console.log(oWin);

34
modules/module/module.controller.php
View file

@ -75,17 +75,18 @@ class moduleController extends module
$args->called_position = $called_position;
$output = executeQuery('module.insertTrigger', $args);
//remove from cache
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
if($output->toBool())
{
$oCacheHandler->invalidateGroupKey('triggers');
//remove from cache
$GLOBALS['__triggers__'] = NULL;
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
{
$cache_key = 'triggers';
$oCacheHandler->delete($cache_key);
}
}
// Delete all the files which contain trigger information
FileHandler::removeFilesInDir("./files/cache/triggers");
return $output;
}
@ -103,17 +104,18 @@ class moduleController extends module
$args->called_position = $called_position;
$output = executeQuery('module.deleteTrigger', $args);
//remove from cache
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
if($output->toBool())
{
$oCacheHandler->invalidateGroupKey('triggers');
//remove from cache
$GLOBALS['__triggers__'] = NULL;
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
{
$cache_key = 'triggers';
$oCacheHandler->delete($cache_key);
}
}
// Remove the trigger cache
FileHandler::removeFilesInDir('./files/cache/triggers');
return $output;
}

58
modules/module/module.model.php
View file

@ -629,31 +629,31 @@ class moduleModel extends module
*/
function getTriggers($trigger_name, $called_position)
{
$triggers = false;
// cache controll
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
if(is_null($GLOBALS['__triggers__']))
{
$object_key = $trigger_name.'_'.$called_position;
$cache_key = $oCacheHandler->getGroupKey('triggers', $object_key);
$triggers = $oCacheHandler->get($cache_key);
}
if($triggers === false)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->called_position = $called_position;
$output = executeQueryArray('module.getTriggers',$args);
$triggers = $output->data;
if($output->toBool() && $oCacheHandler->isSupport())
$triggers = FALSE;
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
if($oCacheHandler->isSupport())
{
$oCacheHandler->put($cache_key, $triggers);
$cache_key = 'triggers';
$triggers = $oCacheHandler->get($cache_key);
}
if($triggers === FALSE)
{
$output = executeQueryArray('module.getTriggers');
$triggers = $output->data;
if($output->toBool() && $oCacheHandler->isSupport())
{
$oCacheHandler->put($cache_key, $triggers);
}
}
foreach($triggers as $item)
{
$GLOBALS['__triggers__'][$item->trigger_name][$item->called_position][] = $item;
}
}
return $triggers;
return $GLOBALS['__triggers__'][$trigger_name][$called_position];
}
/**
@ -661,14 +661,16 @@ class moduleModel extends module
*/
function getTrigger($trigger_name, $module, $type, $called_method, $called_position)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->module = $module;
$args->type = $type;
$args->called_method = $called_method;
$args->called_position = $called_position;
$output = executeQuery('module.getTrigger',$args);
return $output->data;
$triggers = $this->getTriggers($trigger_name, $called_position);
foreach($triggers as $item)
{
if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
{
return $item;
}
}
return NULL;
}
/**

26
modules/page/page.admin.controller.php
View file

@ -293,12 +293,15 @@ class pageAdminController extends page
function procPageAdminArticleDocumentInsert()
{
$oDocumentModel = getModel('document');
$oDocumentController = getController('document');
$logged_info = Context::get('logged_info');
$oModuleModel = getModel('module');
$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
if (!$grant->manager)
if(!$grant->manager)
{
return new Object(-1, 'msg_not_permitted');
}
@ -312,39 +315,30 @@ class pageAdminController extends page
//그래도 없으면 Untitled
if($obj->title == '') $obj->title = 'Untitled';
// document module의 model 객체 생성
$oDocumentModel = getModel('document');
// document module의 controller 객체 생성
$oDocumentController = getController('document');
$document_srl = $obj->document_srl;
// 이미 존재하는 글인지 체크
$oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
$bAnonymous = false;
$target = ($obj->ismobile == 'Y') ? 'mdocument_srl' : 'document_srl';
// 이미 존재하는 경우 수정
if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
{
$output = $oDocumentController->updateDocument($oDocument, $obj);
$msg_code = 'success_updated';
// 그렇지 않으면 신규 등록
}
else
{
if($obj->ismobile == 'Y')
{
$target = 'mdocument_srl';
}
else
{
$target = 'document_srl';
}
// 그렇지 않으면 신규 등록
$output = $oDocumentController->insertDocument($obj, $bAnonymous);
$msg_code = 'success_registed';
$document_srl = $output->get('document_srl');
}
if(!isset($this->module_info->{$target}) || (isset($this->module_info->{$target}) && $this->module_info->{$target} !== $document_srl))
{
$oModuleController = getController('module');
$this->module_info->{$target} = $document_srl;
$oModuleController->updateModule($this->module_info);

13
modules/point/point.admin.controller.php
View file

@ -60,6 +60,19 @@ class pointAdminController extends point
if($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
$group_srl = $group->group_srl;
//if group level is higher than max level, change to max level
if($args->{'point_group_'.$group_srl} > $args->max_level)
{
$args->{'point_group_'.$group_srl} = $args->max_level;
}
//if group level is lower than 1, change to 1
if($args->{'point_group_'.$group_srl} < 1)
{
$args->{'point_group_'.$group_srl} = 1;
}
if($args->{'point_group_'.$group_srl})
{
$config->point_group[$group_srl] = $args->{'point_group_'.$group_srl};

5
modules/point/point.controller.php
View file

@ -422,8 +422,9 @@ class pointController extends point
// When the requested points are negative, compared it with the current point
if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
{
$obj->add('content', sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point));
return new Object();
$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
$obj->add('content', $message);
return new Object(-1, $message);
}
// If not logged in, pass
if(!$logged_info->member_srl) return new Object();

1
modules/point/tpl/config.html
View file

@ -96,6 +96,7 @@
<label class="x_control-label" for="point_group_{$key}">{$val->title}</label>
<div class="x_controls">
<input cond="$val->is_default != 'Y'" type="number" min="0" max="1000" value="{$config->point_group[$key]}" name="point_group_{$key}" id="point_group_{$key}" style="width:50px" />
&nbsp;{$lang->level}
<span cond="$val->is_default == 'Y'" style="display:inline-block;padding-top:3px">{$lang->default_group}</span>
</div>
</div>

5
modules/point/tpl/member_list.html
View file

@ -140,8 +140,9 @@
<form ruleset="updatePoint" id="updateForm" action="./" method="POST" style="margin:0">
<input type="hidden" name="module" value="point" />
<input type="hidden" name="act" value="procPointAdminUpdatePoint" />
<input type="hidden" id="update_member_srl" name="member_srl" value="" />
<input type="hidden" id="update_point" name="point" />
<input type="hidden" id="update_member_srl" name="member_srl" value="" />
<input type="hidden" id="update_point" name="point" />
<input type="hidden" name="xe_validator_id" value="modules/point/tpl/member_list/1" />
<input type="hidden" name="success_return_url" value="{getUrl()}">
</form>

2
modules/poll/conf/module.xml
View file

@ -9,7 +9,7 @@
<action name="getPollGetColorsetList" type="model" />
<action name="getPollAdminTarget" type="model" />
<action name="procInsert" type="controller" />
<action name="procPollInsert" type="controller" />
<action name="procPoll" type="controller" ruleset="poll" />
<action name="procPollViewResult" type="controller" />
<action name="procPollGetList" type="controller" />

2
modules/poll/poll.controller.php
View file

@ -17,7 +17,7 @@ class pollController extends poll
/**
* @brief after a qeustion is created in the popup window, register the question during the save time
*/
function procInsert()
function procPollInsert()
{
$stop_date = Context::get('stop_date');
if($stop_date < date('Ymd'))

3
modules/poll/tpl/js/poll.min.js vendored
View file

@ -1 +1,2 @@
function doPoll(a){for(var b=new Array,c=new Array,d=0;d<a.length;d++){var e=a[d];if("INPUT"==e.nodeName){var f=e.name;if(f.indexOf("checkcount")>-1){var g=f.split("_"),h=parseInt(g[1],10);b[h]=e.value,c[h]=new Array}else if(f.indexOf("item_")>-1){var g=f.split("_"),h=(parseInt(g[1],10),parseInt(g[2],10));1==e.checked&&(c[h][c[h].length]=e.value)}}}var i="";for(var h in b)if(b.hasOwnProperty(h)){var j=b[h],k=c[h];if(k.length<1||j<k.length)return alert(poll_alert_lang),!1;i+=k.join(",")+","}a.poll_srl_indexes.value=i,a.submit()}jQuery(function(a){a("._poll_result").click(function(){function b(b){var d,e=a("#poll_"+c);d=e.width(),e.html(b.tpl),e.width(d)}var c,d,e=a(this).attr("class");try{c=e.match(/\b_srl_(\d+)\b/)[1],d=e.match(/\b_skin_(.+?)\b/)[1]}catch(f){}return c?(d||(d="default"),exec_xml("poll","procPollViewResult",{poll_srl:c,skin:d},b,["error","message","tpl"]),!1):!1})});
function doPoll(a){for(var b=new Array,c=new Array,d=0;d<a.length;d++){var e=a[d];if("INPUT"==e.nodeName){var f=e.name;if(f.indexOf("checkcount")>-1){var g=f.split("_"),h=parseInt(g[1],10);b[h]=e.value,c[h]=new Array}else if(f.indexOf("item_")>-1){var g=f.split("_"),h=(parseInt(g[1],10),parseInt(g[2],10));1==e.checked&&(c[h][c[h].length]=e.value)}}}var i="";for(var h in b)if(b.hasOwnProperty(h)){var j=b[h],k=c[h];if(k.length<1||j<k.length)return alert(poll_alert_lang),!1;i+=k.join(",")+","}a.poll_srl_indexes.value=i,a.submit()}jQuery(function(a){a("._poll_result").click(function(){function b(b){var d,e=a("#poll_"+c);d=e.width(),e.html(b.tpl),e.width(d)}var c,d,e=a(this).attr("class");try{c=e.match(/\b_srl_(\d+)\b/)[1],d=e.match(/\b_skin_(.+?)\b/)[1]}catch(f){}return c?(d||(d="default"),exec_xml("poll","procPollViewResult",{poll_srl:c,skin:d},b,["error","message","tpl"]),!1):!1})});
//# sourceMappingURL=poll.min.map

1
modules/poll/tpl/js/poll.min.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"file":"poll.min.js","sources":["poll.js"],"names":["doPoll","fo_obj","checkcount","Array","item","i","length","obj","nodeName","name","indexOf","t","split","poll_srl_index","parseInt","value","checked","poll_srl_indexes","hasOwnProperty","count","items","alert","poll_alert_lang","join","submit","jQuery","$","click","on_complete","ret","width","$poll","srl","html","skin","cls","this","attr","match","e","exec_xml","poll_srl"],"mappings":"AACA,QAASA,QAAOC,GAKZ,IAAI,GAHAC,GAAa,GAAIC,OACjBC,EAAO,GAAID,OAEPE,EAAE,EAAEA,EAAEJ,EAAOK,OAAOD,IAAK,CAC7B,GAAIE,GAAMN,EAAOI,EACjB,IAAmB,SAAhBE,EAAIC,SAAP,CAEA,GAAIC,GAAOF,EAAIE,IACf,IAAGA,EAAKC,QAAQ,cAAc,GAAI,CAC9B,GAAIC,GAAIF,EAAKG,MAAM,KACfC,EAAiBC,SAASH,EAAE,GAAG,GACnCT,GAAWW,GAAkBN,EAAIQ,MACjCX,EAAKS,GAAkB,GAAIV,WAExB,IAAGM,EAAKC,QAAQ,SAAS,GAAI,CAChC,GAAIC,GAAIF,EAAKG,MAAM,KAEfC,GADWC,SAASH,EAAE,GAAG,IACRG,SAASH,EAAE,GAAG,IACjB,IAAfJ,EAAIS,UAAiBZ,EAAKS,GAAgBT,EAAKS,GAAgBP,QAAUC,EAAIQ,SAIxF,GAAIE,GAAmB,EACvB,KAAI,GAAIJ,KAAkBX,GAC7B,GAAIA,EAAWgB,eAAeL,GAA9B,CACO,GAAIM,GAAQjB,EAAWW,GACnBO,EAAQhB,EAAKS,EACjB,IAAGO,EAAMd,OAAS,GAAKa,EAAQC,EAAMd,OAEjC,MADAe,OAAMC,kBACC,CAGXL,IAAoBG,EAAMG,KAAK,KAAK,IAExCtB,EAAOgB,iBAAiBF,MAAQE,EAEnChB,EAAOuB,SAGRC,OAAO,SAASC,GAEfA,EAAE,iBAAiBC,MAAM,WAWxB,QAASC,GAAYC,GACpB,GAA6BC,GAAzBC,EAAQL,EAAE,SAASM,EAEvBF,GAASC,EAAMD,QACfC,EAAME,KAAKJ,EAAS,KACpBE,EAAMD,MAAMA,GAfb,GAAiCE,GAAKE,EAAlCC,EAAMT,EAAEU,MAAMC,KAAK,QAEvB,KACCL,EAAOG,EAAIG,MAAM,kBAAkB,GACnCJ,EAAOC,EAAIG,MAAM,mBAAmB,GACpC,MAAMC,IAEP,MAAIP,IACAE,IAAMA,EAAO,WAUjBM,SACC,OACA,sBACCC,SAAST,EAAKE,KAAKA,GACpBN,GACC,QAAQ,UAAU,SAGb,IAnBS"}

Some files were not shown because too many files have changed in this diff Show more