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

Merge branch 'develop' of github.com:rhymix/rhymix into pr/notify-block

Browse source
This commit is contained in:
BJRambo 2020-02-24 16:03:34 +00:00
commit c627aa9e7c
23 changed files with 89 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -832,7 +832,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('debug.write_error_log', strval($vars->debug_write_error_log) ?: 'fatal');
// Debug content
$debug_content = array_values($vars->debug_display_content);
$debug_content = array_values($vars->debug_display_content ?: array());
Rhymix\Framework\Config::set('debug.display_content', $debug_content);
// Log filename

7
modules/admin/admin.admin.view.php
View file

@ -325,8 +325,11 @@ class adminAdminView extends admin
}
// Get need update from easy install
$oAutoinstallAdminModel = getAdminModel('autoinstall');
$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
//$oAutoinstallAdminModel = getAdminModel('autoinstall');
//$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
$needUpdateList = array();
// Check counter addon
$site_module_info = Context::get('site_module_info');
$oAddonAdminModel = getAdminModel('addon');
$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );

16
modules/admin/tpl/config_debug.html
View file

@ -56,14 +56,14 @@
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_display_content}</label>
<div class="x_controls">
<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="!count($debug_display_content) || in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="!count($debug_display_content) || in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="!count($debug_display_content) || in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="!count($debug_display_content) || in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="!count($debug_display_content) || in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="!count($debug_display_content) || in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="!count($debug_display_content) || in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
<label for="debug_display_content_slow_remote_requests" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_remote_requests" value="slow_remote_requests" checked="checked"|cond="!count($debug_display_content) || in_array('slow_remote_requests', $debug_display_content)" /> {$lang->debug_display_content_slow_remote_requests}</label>
<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
<label for="debug_display_content_slow_remote_requests" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_remote_requests" value="slow_remote_requests" checked="checked"|cond="in_array('slow_remote_requests', $debug_display_content)" /> {$lang->debug_display_content_slow_remote_requests}</label>
</div>
</div>
<div class="x_control-group">

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

@ -1425,6 +1425,7 @@ jQuery(function($){
// Details toggle in admin table
var simpleBtn = $('.x .dsTg .__simple');
var detailBtn = $('.x .dsTg .__detail');
var tableContainer = $('.x .dsTg');
var tdTitle = $('.x .dsTg td.title');
tdTitle.each(function(){
var $t = $(this);
@ -1439,12 +1440,14 @@ jQuery(function($){
simples.show();
detailBtn.removeClass('x_active');
simpleBtn.addClass('x_active');
tableContainer.addClass('__simpleView');
};
var detailBtnFn = function(){
details.show();
simples.hide();
detailBtn.addClass('x_active');
simpleBtn.removeClass('x_active');
tableContainer.removeClass('__simpleView');
};
simpleBtn.click(simpleBtnFn);
detailBtn.click(detailBtnFn);

6
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -201,6 +201,12 @@ class autoinstallAdminController extends autoinstall
foreach($packages as $package_srl)
{
$package = $oModel->getPackage($package_srl);
$package->type = $oModel->getTypeFromPath($package->path);
if ($package->type === 'core')
{
continue;
}
if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
{
$oModuleInstaller = new DirectModuleInstaller($package);

1
modules/autoinstall/autoinstall.admin.model.php
View file

@ -215,7 +215,6 @@ class autoinstallAdminModel extends autoinstall
if($packageInfo->type == 'core')
{
//$title = 'XpressEngine';
continue;
}
else

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

@ -216,7 +216,7 @@ class autoinstallAdminView extends autoinstall
if($v->type == "core")
{
$v->avail_remove = FALSE;
continue;
}
else if($v->type == "module")
{

2
modules/autoinstall/tpl/category.html
View file

@ -7,7 +7,7 @@
<div loop="$categories => $category" cond="$category->depth == 0">
<h2>{$category->title}</h2>
<ul>
<li loop="$category->children => $children" class="active"|cond="$children->category_srl == $category_srl">
<li loop="$category->children => $children" class="active"|cond="$children->category_srl == $category_srl" cond="$children->category_srl != 18322907">
<a href="{getUrl('','module','admin','act','dispAutoinstallAdminIndex','category_srl',$children->category_srl,'childrenList','')}">{$children->title}({$children->nPackages})</a>
</li>
</ul>

4
modules/autoinstall/tpl/install.html
View file

@ -17,10 +17,6 @@
</ul>
</div>
<div cond="$contain_core" class="x_alert x_alert-block">
<h4>{$lang->msg_update_core_title}</h4>
<p>{$lang->msg_update_core}</p>
</div>
<div cond="$package->installed" class="x_well">
<p>{$lang->current_version}: {$package->cur_version} <block cond="$package->need_update">({$lang->require_update})</block></p>
</div>

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

@ -720,7 +720,10 @@ class commentController extends comment
$oMail->setSubject($mail_title);
$oMail->setBody($mail_content);
$oMail->setFrom(config('mail.default_from') ?: $member_info->email_address, $member_info->nick_name);
$oMail->setReplyTo($member_info->email_address);
if($member_info->email_address)
{
$oMail->setReplyTo($member_info->email_address);
}
foreach (array_map('trim', explode(',', $module_info->admin_mail)) as $email_address)
{
if ($email_address && $email_address !== $author_email_address)

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

@ -77,8 +77,16 @@ class fileAdminController extends file
$config->image_remove_exif_data = Context::get('image_remove_exif_data') === 'Y' ? true : false;
$config->video_thumbnail = Context::get('video_thumbnail') === 'Y' ? true : false;
$config->video_mp4_gif_time = intval(Context::get('video_mp4_gif_time'));
$config->ffmpeg_command = escape(utf8_trim(Context::get('ffmpeg_command'))) ?: '/usr/bin/ffmpeg';
$config->ffprobe_command = escape(utf8_trim(Context::get('ffprobe_command'))) ?: '/usr/bin/ffprobe';
if (RX_WINDOWS)
{
$config->ffmpeg_command = escape(Context::get('ffmpeg_command')) ?: 'C:\Program Files\ffmpeg\bin\ffmpeg.exe';
$config->ffprobe_command = escape(Context::get('ffprobe_command')) ?: 'C:\Program Files\ffmpeg\bin\ffprobe.exe';
}
else
{
$config->ffmpeg_command = escape(utf8_trim(Context::get('ffmpeg_command'))) ?: '/usr/bin/ffmpeg';
$config->ffprobe_command = escape(utf8_trim(Context::get('ffprobe_command'))) ?: '/usr/bin/ffprobe';
}
// Check maximum file size
if (PHP_INT_SIZE < 8)

11
modules/file/file.controller.php
View file

@ -1178,8 +1178,15 @@ class fileController extends file
$adjusted['height'] -= $adjusted['height'] % 2;
// Convert using ffmpeg
$command = $config->ffmpeg_command;
$command .= ' -i ' . escapeshellarg($file_info['tmp_name']);
if (RX_WINDOWS)
{
$command = escapeshellarg($config->ffmpeg_command);
}
else
{
$command = $config->ffmpeg_command;
}
$command .= ' -nostdin -i ' . escapeshellarg($file_info['tmp_name']);
$command .= ' -movflags +faststart -pix_fmt yuv420p -c:v libx264 -crf 23';
$command .= sprintf(' -vf "scale=%d:%d"', $adjusted['width'], $adjusted['height']);
$command .= ' ' . escapeshellarg($output_name);

5
modules/message/m.skins/default/system_message.html
View file

@ -3,6 +3,9 @@
<div class="hx h2">
<h2>{$system_message}</h2>
</div>
<div class="message" cond="$system_message_detail">
{$system_message_detail}
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/m.skin/default/system_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -62,4 +65,4 @@ jQuery(function($){
}
});
});
</script>
</script>

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

@ -736,6 +736,7 @@ class moduleModel extends module
$module_info->homepage = $xml_obj->link->body;
$module_info->category = $xml_obj->category->body;
if(!$module_info->category) $module_info->category = 'service';
$date_obj = (object)array('y' => 0, 'm' => 0, 'd' => 0);
sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$module_info->license = $xml_obj->license->body;
@ -761,6 +762,7 @@ class moduleModel extends module
$module_info->version = $xml_obj->attrs->version;
$module_info->category = $xml_obj->attrs->category;
if(!$module_info->category) $module_info->category = 'service';
$date_obj = (object)array('y' => 0, 'm' => 0, 'd' => 0);
sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$author_obj = new stdClass();

3
modules/module/tpl/css/module_admin.less
View file

@ -13,6 +13,9 @@
top: -1px;
}
}
.__simpleView .fvOff,.__simpleView .fvOn{
top:0;
}
.fvOff{
background-image: data-uri('images/star-empty.svg');
}

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

@ -319,7 +319,7 @@ class pageAdminController extends page
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$bAnonymous = false;
$target = ($obj->ismobile == 'Y') ? 'mdocument_srl' : 'document_srl';
$target = ($obj->isMobile == 'Y') ? 'mdocument_srl' : 'document_srl';
// 이미 존재하는 경우 수정
if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
@ -348,7 +348,7 @@ class pageAdminController extends page
// 결과를 리턴
$this->add('mid', Context::get('mid'));
$this->add('document_srl', $output->get('document_srl'));
$this->add('is_mobile', $obj->ismobile);
$this->add('is_mobile', $obj->isMobile);
// 성공 메세지 등록
$this->setMessage($msg_code);