mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 03:01:43 +09:00
1. vid 기반의 가상 사이트에서 팝업등의 기능 윈도우가 열릴때 권한이 승계되지 않는 문제 수정
(위젯의 대상 모듈 선택등) 2. 가상사이트 관리자의 경우 모든 메뉴의 그룹 선택과 상관없이 보이도록 수정. 3. 위젯스타일의 이미지(파일박스) 등록시 가상사이트 권한을 받도록 수정 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6132 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero
parent
7686512b04
commit
6ad50ef1a7
4 changed files with 34 additions and 22 deletions
|
|
@ -374,6 +374,7 @@ function isDef() {
|
|||
**/
|
||||
var winopen_list = new Array();
|
||||
function winopen(url, target, attribute) {
|
||||
if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
|
||||
try {
|
||||
if(target != "_blank" && winopen_list[target]) {
|
||||
winopen_list[target].close();
|
||||
|
|
@ -395,6 +396,7 @@ function winopen(url, target, attribute) {
|
|||
**/
|
||||
function popopen(url, target) {
|
||||
if(typeof(target) == "undefined") target = "_blank";
|
||||
if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
|
||||
winopen(url, target, "left=10,top=10,width=10,height=10,scrollbars=no,resizable=yes,toolbars=no");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@
|
|||
$args->menu_srl = $menu_srl;
|
||||
$output = executeQuery('menu.getMenu', $args);
|
||||
if(!$output->toBool() || !$output->data) return $output;
|
||||
$site_srl = $output->data->site_srl;
|
||||
$site_srl = (int)$output->data->site_srl;
|
||||
|
||||
if($site_srl) {
|
||||
$oModuleModel = &getModel('module');
|
||||
|
|
@ -380,8 +380,17 @@
|
|||
'$lang_type = Context::getLangType(); '.
|
||||
'$is_logged = Context::get(\'is_logged\'); '.
|
||||
'$logged_info = Context::get(\'logged_info\'); '.
|
||||
'$site_srl = '.$site_srl.';'.
|
||||
'$site_admin = false;'.
|
||||
'if($site_srl) { '.
|
||||
'$oModuleModel = &getModel(\'module\');'.
|
||||
'$site_module_info = $oModuleModel->getSiteInfo($site_srl); '.
|
||||
'Context::set(\'site_module_info\',$site_module_info);'.
|
||||
'$grant = $oModuleModel->getGrant($site_module_info, $logged_info); '.
|
||||
'if($grant->manager ==1) $site_admin = true;'.
|
||||
'}'.
|
||||
'if($is_logged) {'.
|
||||
'if($logged_info->is_admin=="Y") $is_admin = true; '.
|
||||
'if($logged_info->is_admin=="Y" || $site_admin) $is_admin = true; '.
|
||||
'else $is_admin = false; '.
|
||||
'$group_srls = array_keys($logged_info->group_list); '.
|
||||
'} else { '.
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<form action="{getUrl('')}" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="module" value="module" />
|
||||
<input type="hidden" name="act" value="procModuleFileBoxAdd" />
|
||||
<input type="hidden" name="vid" value="{$vid}" />
|
||||
<input type="hidden" name="filter" value="{$filter}" />
|
||||
<input type="hidden" name="input" value="{$input}" />
|
||||
|
||||
|
|
|
|||
|
|
@ -5,37 +5,37 @@
|
|||
</div>
|
||||
|
||||
<div id="popBody">
|
||||
<table class="rowTable" cellspacing="0">
|
||||
<table class="rowTable" cellspacing="0" width="90%">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="105">{$lang->file}</th>
|
||||
<th>{$lang->description}</th>
|
||||
<th width="105">{$lang->regdate}</th>
|
||||
<th width="100"></th>
|
||||
<th><div>{$lang->file}</div></th>
|
||||
<th><div>{$lang->description}</div></th>
|
||||
<th><div>{$lang->regdate}</div></th>
|
||||
<th><div> </div></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!--@foreach($filebox_list as $key=>$val)-->
|
||||
<tr>
|
||||
<td>
|
||||
<div id="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left;">
|
||||
<!--@if($val->fileextension=='swf')-->
|
||||
<div id="filebox_preview_{$val->module_filebox_srl}">
|
||||
<!--@if($val->fileextension=='swf')-->
|
||||
|
||||
<object height="100%" width="100%" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
|
||||
<param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<embed height="100%" width="100%" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
</object>
|
||||
<object height="100" width="100" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
|
||||
<param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
<embed height="100" width="100" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
|
||||
</object>
|
||||
|
||||
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
|
||||
<img src="{getUrl('')}{$val->filename}" width="100%" height="100%" />
|
||||
<!--@end-->
|
||||
</div>
|
||||
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
|
||||
<img src="{getUrl('')}{$val->filename}" width="100" height="100" />
|
||||
<!--@end-->
|
||||
</div>
|
||||
</td>
|
||||
<td>{$val->comment}</td>
|
||||
<td>{zdate($val->regdate,'Y-m-d H:i')}</td>
|
||||
<td class="wide">{$val->comment} </td>
|
||||
<td class="nowrap">{zdate($val->regdate,'Y-m-d H:i')}</td>
|
||||
<td>
|
||||
<!--@if(!$filter || (is_array($arrfilter) && in_array($val->fileextension,$arrfilter)))-->
|
||||
<span class="small button black"><button type="button" onclick="XE.filebox.selectFile('{getUrl('')}{$val->filename}','{$val->module_filebox_srl}');">{$lang->cmd_select}</button></span>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue