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 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-05-26 06:58:12 +09:00 • committed by GitHub
commit cb1fd188ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 4286 additions and 5469 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/addon/addon.admin.controller.php
View file

@ -197,16 +197,19 @@ class addonAdminController extends addonController
*/
function procAddonAdminSetupAddon()
{
$args = Context::getRequestVars();
$module = $args->module;
$addon_name = $args->addon_name;
unset($args->module);
unset($args->act);
unset($args->addon_name);
unset($args->body);
unset($args->error_return_url);
$vars = Context::getRequestVars();
$module = $vars->module;
$addon_name = $vars->addon_name;
$args = new stdClass();
$site_module_info = Context::get('site_module_info');
$addon_info = AddonAdminModel::getInstance()->getAddonInfoXml($addon_name, $site_module_info->site_srl, 'site');
foreach ($addon_info->extra_vars as $key => $val)
{
$args->{$key} = $vars->{$key} ?? '';
}
$args->xe_run_method = $vars->xe_run_method ?? '';
$args->mid_list = $vars->mid_list ?? [];
$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
if(!$output->toBool())
@ -234,6 +237,29 @@ class addonAdminController extends addonController
*/
function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N', $extra_vars = null)
{
if (!is_object($extra_vars))
{
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass;
$args->addon = $addon;
if (strlen($isUsed) == 2)

238
modules/addon/addon.admin.model.php
View file

@ -162,18 +162,14 @@ class addonAdminModel extends addon
return;
}
// Read the xml file for module skin information
// Read the xml file for addon information
$xml_file = sprintf("%sconf/info.xml", FileHandler::getRealpath($addon_path));
if(!file_exists($xml_file))
if (!file_exists($xml_file))
{
return;
}
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$xml_obj = $tmp_xml_obj->addon;
if(!$xml_obj)
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
if (!$addon_info)
{
return;
}
@ -190,224 +186,52 @@ class addonAdminModel extends addon
$db_args->site_srl = $site_srl;
$output = executeQuery('addon.getSiteAddonInfo', $db_args);
}
$extra_vals = unserialize($output->data->extra_vars);
$addon_info = new stdClass();
if($extra_vals->mid_list)
// Add run settings
$extra_vals = isset($output->data->extra_vars) ? unserialize($output->data->extra_vars) : new stdClass;
if (!empty($extra_vals->mid_list))
{
$addon_info->mid_list = $extra_vals->mid_list;
}
else
{
$addon_info->mid_list = array();
}
if($extra_vals->xe_run_method)
if (!empty($extra_vals->xe_run_method))
{
$addon_info->xe_run_method = $extra_vals->xe_run_method;
}
// Add information
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
if (isset($output->data) && $output->data->is_used === 'Y')
{
// addon format v0.2
if ($xml_obj->date->body === 'RX_CORE')
$addon_info->is_enabled->pc = true;
}
if (isset($output->data) && $output->data->is_used_m === 'Y')
{
$addon_info->is_enabled->mobile = true;
}
// Add current settings
foreach ($addon_info->extra_vars ?? [] as $key => $val)
{
if (isset($extra_vals->{$key}))
{
$addon_info->date = '';
if (is_string($extra_vals->{$key}) && str_contains($extra_vals->{$key}, '|@|'))
{
$val->value = explode('|@|', $extra_vals->{$key});
}
else
{
$val->value = $extra_vals->{$key};
}
}
else
{
$date_obj = new stdClass();
sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$val->value = $val->default;
}
$addon_info->addon_name = $addon;
$addon_info->title = $xml_obj->title->body;
$addon_info->description = trim($xml_obj->description->body);
$addon_info->version = $xml_obj->version->body;
$addon_info->homepage = $xml_obj->link->body;
$addon_info->license = $xml_obj->license->body;
$addon_info->license_link = $xml_obj->license->attrs->link;
if(!is_array($xml_obj->author))
if ($val->type === 'mid_list' && !is_array($val->value))
{
$author_list = array();
$author_list[] = $xml_obj->author;
}
else
{
$author_list = $xml_obj->author;
$val->value = isset($val->value) ? [$val->value] : [];
}
$addon_info->author = array();
foreach($author_list as $author)
{
$author_obj = new stdClass();
$author_obj->name = $author->name->body;
$author_obj->email_address = $author->attrs->email_address;
$author_obj->homepage = $author->attrs->link;
$addon_info->author[] = $author_obj;
}
// Expand the variable order
if($xml_obj->extra_vars)
{
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups)
{
$extra_var_groups = $xml_obj->extra_vars;
}
if(!is_array($extra_var_groups))
{
$extra_var_groups = array($extra_var_groups);
}
foreach($extra_var_groups as $group)
{
$extra_vars = $group->var;
if(!is_array($group->var))
{
$extra_vars = array($group->var);
}
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
if(!$val->attrs)
{
$val->attrs = new stdClass();
}
if(!$val->attrs->type)
{
$val->attrs->type = 'text';
}
$obj->group = $group->title->body;
$obj->name = $val->attrs->name;
$obj->title = $val->title->body;
$obj->type = $val->attrs->type;
$obj->description = $val->description->body;
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != FALSE)
{
$obj->value = explode('|@|', $obj->value);
}
if($obj->type == 'mid_list' && !is_array($obj->value))
{
$obj->value = array($obj->value);
}
// 'Select'type obtained from the option list.
if($val->options && !is_array($val->options))
{
$val->options = array($val->options);
}
for($i = 0, $c = countobj($val->options); $i < $c; $i++)
{
$obj->options[$i] = new stdClass();
$obj->options[$i]->title = $val->options[$i]->title->body;
$obj->options[$i]->value = $val->options[$i]->attrs->value;
}
$addon_info->extra_vars[] = $obj;
}
}
}
}
else
{
// addon format 0.1
$addon_info = new stdClass();
$addon_info->addon_name = $addon;
$addon_info->title = $xml_obj->title->body;
$addon_info->description = trim($xml_obj->author->description->body);
$addon_info->version = $xml_obj->attrs->version;
$date_obj = new stdClass();
sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
$addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$author_obj = new stdClass();
$author_obj->name = $xml_obj->author->name->body;
$author_obj->email_address = $xml_obj->author->attrs->email_address;
$author_obj->homepage = $xml_obj->author->attrs->link;
$addon_info->author = array();
$addon_info->author[] = $author_obj;
if($xml_obj->extra_vars)
{
// Expand the variable order
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups)
{
$extra_var_groups = $xml_obj->extra_vars;
}
if(!is_array($extra_var_groups))
{
$extra_var_groups = array($extra_var_groups);
}
foreach($extra_var_groups as $group)
{
$extra_vars = $group->var;
if(!is_array($group->var))
{
$extra_vars = array($group->var);
}
$addon_info->extra_vars = array();
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
$obj->group = $group->title->body;
$obj->name = $val->attrs->name;
$obj->title = $val->title->body;
$obj->type = $val->type->body ? $val->type->body : 'text';
$obj->description = $val->description->body;
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != false)
{
$obj->value = explode('|@|', $obj->value);
}
if($obj->type == 'mid_list' && !is_array($obj->value))
{
$obj->value = array($obj->value);
}
// 'Select'type obtained from the option list.
if($val->options && !is_array($val->options))
{
$val->options = array($val->options);
}
$obj->options = array();
foreach ($val->options ?? [] as $i => $option)
{
$obj->options[$i]->title = $option->title->body;
$obj->options[$i]->value = $option->value->body;
}
$addon_info->extra_vars[] = $obj;
}
}
}
}
return $addon_info;
}

24
modules/addon/addon.controller.php
View file

@ -111,7 +111,7 @@ class addonController extends addon
$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);
// Addon configuration
$buff[] = '$addon_info = unserialize(' . var_export(serialize($extra_vars), true) . ');';
$buff[] = '$addon_info = ' . var_export($extra_vars, true) . ';';
// Decide whether to run in this mid
if ($run_method === 'no_run_selected')
@ -159,9 +159,27 @@ class addonController extends addon
*/
function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
{
if(!is_array($extra_vars->mid_list))
if (!is_object($extra_vars))
{
unset($extra_vars->mid_list);
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key) && isset($val->default))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass();

3
modules/admin/controllers/Dashboard.php
View file

@ -185,8 +185,7 @@ class Dashboard extends Base
$params["act"] = "getResourceapiLastupdate";
$body = \XmlGenerater::generate($params);
$buff = FileHandler::getRemoteResource($config->download_server, $body, 3, "POST", "application/xml");
$xml_lUpdate = new \XeXmlParser();
$lUpdateDoc = $xml_lUpdate->parse($buff);
$lUpdateDoc = \Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$updateDate = $lUpdateDoc->response->updatedate->body;
if(!$updateDate)

1
modules/admin/controllers/maintenance/Cleanup.php
View file

@ -332,6 +332,7 @@ class Cleanup extends Base
'modules/admin/tpl/js/config.min.js' => 'deleted',
'modules/admin/tpl/js/admin.min.js' => 'deleted',
'modules/admin/tpl/js/menu_setup.min.js' => 'deleted',
'modules/admin/tpl/img/bgDragable.gif' => 'deleted',
'modules/admin/tpl/img/faviconSample.png' => 'deleted',
'modules/admin/tpl/img/mobiconSample.png' => 'deleted',
'modules/autoinstall/ruleset/' => 'deleted:xe',

8
modules/admin/tpl/_header.html
View file

@ -4,10 +4,10 @@
{@ Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
<script>
var admin_menu_srl = "{$admin_menu_srl}";
xe.cmd_find = "{$lang->cmd_find}";
xe.cmd_cancel = "{$lang->cmd_cancel}";
xe.cmd_confirm = "{$lang->cmd_confirm}";
xe.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.cmd_find = "{$lang->cmd_find}";
xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.confirm_run = "{$lang->confirm_run}";
xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
</script>

20
modules/admin/tpl/css/admin.css
View file

@ -356,11 +356,15 @@ body>.x,
color: #fff;
}
.x .x_modal-header>.close_window {
font-size: 20px;
font-size: 24px;
line-height: 30px;
font-weight: bold;
text-decoration: none;
color: #fff;
opacity: 0.5;
opacity: 0.6;
}
.x .x_modal-header>.close_window:hover {
opacity: 0.8;
}
.x .x_modal-body {
overflow-y: visible;
@ -1690,14 +1694,16 @@ html[lang="id"] .x .g11n.active>[disabled],
}
.x .uDrag .dragBtn {
position: absolute;
width: 8px;
width: 24px;
height: 100%;
padding: 0;
box-sizing: content-box;
overflow: hidden;
background: url(../img/bgDragable.gif);
background: url(../img/bgDragable.png);
background-position: center top;
background-repeat: no-repeat;
top: 1px;
left: 0;
text-indent: 12px;
left: -8px;
text-indent: 20px;
border: 0;
cursor: n-resize;
white-space: nowrap;

BIN
modules/admin/tpl/img/bgDragable.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 46 B

BIN
modules/admin/tpl/img/bgDragable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 145 B

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

@ -977,7 +977,7 @@ jQuery(function($){
tmpCount++;
// add html
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
var $displayInput = $('<input type="text" readonly>');
$this.after($btn).after('&nbsp;').after($displayInput).hide();
$btn.xeModuleSearch();
@ -1050,10 +1050,10 @@ jQuery(function($){
$.xeMsgBox = {
htOptions : {}
};
//xe.cmd_cancel = "{$lang->cmd_cancel}";
//xe.cmd_confirm = "{$lang->cmd_confirm}";
//xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
//xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+'</button> </div> ');
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.lang.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.lang.cmd_confirm+'</button> </div> ');
$("body").append($msgBox);
$msgBox.find("._ok").click(function(){
$.xeMsgBox.fnOnOK();
@ -1513,13 +1513,13 @@ jQuery(function($){
// change text
if(options.create_type != 'save_and_use'){
$g11n_create.find('.save-useit').text(xe.cmd_save);
$g11n_create.find('.save-useit').text(xe.lang.cmd_save);
}
// #lang_create confirm
function g11n_create_save_confirm(){
if($g11n_create.is(':visible') && is_create_changed){
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
$g11n_create.find('.save-useit').trigger('click');
}
}
@ -1531,7 +1531,7 @@ jQuery(function($){
function g11n_search_save_confirm(){
if($g11n_search.is(':visible') && $g11n_search.find('.editMode').length){
var $search_item = $g11n_search.find('.editMode');
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
$search_item.find('.save').trigger('click');
}else{
$search_item.find('.cancel').trigger('click');
@ -1701,7 +1701,7 @@ jQuery(function($){
if(!options.view_modify) $g11n_search.find('.modify').hide();
if(!options.view_delete) $g11n_search.find('.delete').hide();
if(options.modify_type == 'save'){
$g11n_search.find('.save').text(xe.cmd_save);
$g11n_search.find('.save').text(xe.lang.cmd_save);
}
// Modify click
@ -1727,7 +1727,7 @@ jQuery(function($){
// Delete click
$g11n_search.find('.delete').click(function(){
if(!confirm(xe.confirm_delete)) return;
if(!confirm(xe.lang.confirm_delete)) return;
var $this = $(this);
@ -1827,7 +1827,7 @@ jQuery(function($){
});
if(!current_lang_value){
alert(xe.msg_empty_multilingual);
alert(xe.lang.msg_empty_multilingual);
return false;
}
@ -1933,8 +1933,8 @@ jQuery(function($){
}
$displayInput.attr('placeholder', $this.attr('placeholder'));
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.cmd_set_multilingual_text + '</a>').data('lang-target', id);
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.lang.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.lang.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.lang.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.lang.cmd_set_multilingual_text + '</a>').data('lang-target', id);
$this.parent().addClass('g11n').addClass('x_input-append');
$this.after($displayInput, $remover, $setter);
@ -2377,7 +2377,7 @@ jQuery(function($){
$.xeMenuSelectorVar.$container = $.xeMsgBox.$msgBox;
$.xeMsgBox.confirmDialog({
sTitle : xe.msg_select_menu,
sTitle : xe.lang.msg_select_menu,
sText : '<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',
@ -2447,7 +2447,7 @@ jQuery(function($){
var sDisallowedType = $this.attr('data-disallowedType');
// add html
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
$btn.data('multiple', sMultiple);
$btn.data('allowedType', sAllowedType);
$btn.data('disallowedType', sDisallowedType);

1
modules/board/board.class.php
View file

@ -20,6 +20,7 @@ class Board extends ModuleObject
'user_name',
'nick_name',
'user_id',
'regdate',
'tag',
];

5
modules/board/conf/module.xml
View file

@ -60,11 +60,6 @@
<route route="$document_srl:int" priority="100" />
<route route="$document_srl:int/" priority="100" />
<route route="$document_srl:int/comment/$comment_srl:int" priority="100" />
<route route="$document_srl:int/page/$page:int" priority="100" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="60" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="60" />
<route route="search/$search_target:word/$search_keyword:any" priority="50" />
<route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="50" />
<route route="category/$category:int" priority="40" />
<route route="category/$category:int/page/$page:int" priority="40" />
<route route="page/$page:int" priority="10" />

2
modules/board/tpl/js/rewrite.js
View file

@ -13,7 +13,7 @@
if (match && match[1] === window.current_mid) {
newpath = location.pathname.replace(/\/(comment|page)\/([0-9]+)$/, '');
}
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?category=[0-9]+$/)) {
if (location.pathname.match(/\/([0-9]+)$/) && location.search.match(/^\?(category|comment_srl|page)=[0-9]+$/)) {
newpath = newpath ? newpath : location.pathname;
}
if (newpath && location.hash && location.hash != '#') {

19
modules/comment/tpl/js/comment_admin.js
View file

@ -1,16 +1,17 @@
function doCancelDeclare() {
var comment_srl = new Array();
jQuery('#fo_list input[name="cart[]"]:checked').each(function() {
comment_srl[comment_srl.length] = jQuery(this).val();
$('#fo_list input[name="cart[]"]:checked').each(function() {
comment_srl.push($(this).val());
});
if (comment_srl.length < 1) {
return;
}
if(comment_srl.length<1) return;
var params = new Array();
params['comment_srl'] = comment_srl.join(',');
exec_xml('comment','procCommentAdminCancelDeclare', params, function() { location.reload(); });
var params = { comment_srl: comment_srl.join(',') };
Rhymix.ajax('comment.procCommentAdminCancelDeclare', params, function() {
location.reload();
});
}
function insertSelectedModule(id, module_srl, mid, browser_title) {
@ -26,7 +27,7 @@ function getCommentList()
var commentListTable = jQuery('#commentListTable');
var cartList = [];
commentListTable.find(':checkbox[name=cart]').each(function(){
if(this.checked) cartList.push(this.value);
if(this.checked) cartList.push(this.value);
});
var params = new Array();

67
modules/communication/scripts/cleanMessageFiles.php Normal file
View file

@ -0,0 +1,67 @@
<?php
/**
* This script deletes old message attachments.
*
* Files attached to member messages are not viewable by other users, but they
* take up space on the server. You may want to delete them after a certain
* number of days in order to prevent users from using messages as a sort of
* private storage space.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete attachments older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = FileController::getInstance();
// Find and delete files where upload_target_type = msg.
while (true)
{
$output = executeQueryArray('file.getFileList', [
'upload_target_type' => 'msg',
'list_count' => 50,
'regdate_before' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting message attachments older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all message attachments older than $days days.\n";
}

1
modules/document/conf/module.xml
View file

@ -49,6 +49,7 @@
<action name="procDocumentAdminInsertExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" ruleset="insertExtraVar" />
<action name="procDocumentAdminDeleteExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminMoveExtraVar" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminReorderExtraVars" type="controller" permission="manager:config:*" check_var="module_srl" />
<action name="procDocumentAdminRecalculateCategoryCounts" type="controller" />
</actions>
<eventHandlers>

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

@ -246,29 +246,50 @@ class DocumentAdminController extends Document
$type = Context::get('type');
$module_srl = Context::get('module_srl');
$var_idx = Context::get('var_idx');
if (!$type || !$module_srl || !$var_idx)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
if(!$type || !$module_srl || !$var_idx) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if (!$module_info || !$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$module_info->module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$extra_keys = DocumentModel::getExtraKeys($module_srl);
if (!$extra_keys)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
if (!$extra_keys[$var_idx])
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oDocumentModel = getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!$extra_keys[$var_idx]) throw new Rhymix\Framework\Exceptions\InvalidRequest;
if($type == 'up') $new_idx = $var_idx-1;
else $new_idx = $var_idx+1;
if($new_idx<1) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$new_idx = ($type === 'up') ? $var_idx - 1 : $var_idx + 1;
if ($new_idx < 1)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$args = new stdClass();
$args->module_srl = $module_srl;
$args->var_idx = $new_idx;
$output = executeQuery('document.getDocumentExtraKeys', $args);
if (!$output->toBool()) return $output;
if (!$output->data) throw new Rhymix\Framework\Exceptions\InvalidRequest;
if (!$output->toBool())
{
return $output;
}
if (!$output->data)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
unset($args);
$oDB = DB::getInstance();
$oDB->begin();
// update immediately if there is no idx to change
if(!$extra_keys[$new_idx])
{
@ -277,11 +298,19 @@ class DocumentAdminController extends Document
$args->var_idx = $var_idx;
$args->new_idx = $new_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
// replace if exists
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
// replace if exists
else
{
$args = new stdClass();
@ -289,25 +318,174 @@ class DocumentAdminController extends Document
$args->var_idx = $new_idx;
$args->new_idx = -10000;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$args->var_idx = $var_idx;
$args->new_idx = $new_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$args->var_idx = -10000;
$args->new_idx = $var_idx;
$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
if(!$output->toBool()) return $output;
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
$oDB->commit();
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
}
/**
* Reorder extra vars of a module.
*/
public function procDocumentAdminReorderExtraVars()
{
// Validate input data.
$module_srl = intval(Context::get('module_srl'));
$order = Context::get('order');
if (!$module_srl || !$order || !is_array($order))
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
foreach ($order as $key => $val)
{
$order[$key] = $val = (object)$val;
if (empty($val->eid))
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
}
// Validate module info and existing extra keys.
$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if (!$module_info || !$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$extra_keys = DocumentModel::getExtraKeys($module_srl);
if (!$extra_keys)
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
$extra_keys = array_combine(array_map(function($item) {
return $item->eid;
}, $extra_keys), array_values($extra_keys));
// Calculate changes.
// We don't actually do anything with the submitted values of old/new idx.
// We calculate them anew with the data we have on the server.
$changes = [];
$i = 1;
foreach ($order as $key => $val)
{
if (!isset($extra_keys[$val->eid]))
{
continue;
}
if ($i != $extra_keys[$val->eid]->idx)
{
$changes[] = [
'eid' => $val->eid,
'old_idx' => $extra_keys[$val->eid]->idx,
'new_idx' => $i,
];
}
$i++;
}
// Begin transaction.
$oDB = DB::getInstance();
$oDB->begin();
// Apply changes.
// We need to do this twice because of the unique constraint.
foreach ($changes as $change)
{
$output = executeQuery('document.updateDocumentExtraKeyIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],
'new_idx' => $change['new_idx'] - 10000,
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', [
'module_srl' => $module_srl,
'eid' => $change['eid'],
'var_idx' => $change['old_idx'],
'new_idx' => $change['new_idx'] - 10000,
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
foreach ($changes as $change)
{
$output = executeQuery('document.updateDocumentExtraKeyIdx', [
'module_srl' => $module_srl,
'var_idx' => $change['new_idx'] - 10000,
'new_idx' => $change['new_idx'],
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocumentExtraVarIdx', [
'module_srl' => $module_srl,
'var_idx' => $change['new_idx'] - 10000,
'new_idx' => $change['new_idx'],
]);
if (!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
// Commit.
$oDB->commit();
// Clear cache.
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
}

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

@ -1780,6 +1780,7 @@ class DocumentController extends Document
$output = executeQuery('document.updateDocumentExtraVar', $obj);
}
unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
return $output;
}
@ -1836,6 +1837,7 @@ class DocumentController extends Document
$oDB->commit();
unset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
Rhymix\Framework\Cache::delete("site_and_module:module_document_extra_keys:$module_srl");
return new BaseObject();
}
@ -3714,6 +3716,7 @@ Content;
if ($type === 'all' || $type === 'extra_vars')
{
unset($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
unset($GLOBALS['XE_EXTRA_CHK'][$document_srl]);
unset($GLOBALS['RX_DOCUMENT_LANG'][$document_srl]);
}
}

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

@ -55,19 +55,16 @@ class DocumentModel extends Document
return;
}
static $checked = array();
static $module_extra_keys = array();
// check documents
$document_srls = array();
foreach($_document_list as $document_srl => $oDocument)
{
if(isset($checked[$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
if(isset($GLOBALS['XE_EXTRA_CHK'][$document_srl]) || !($oDocument instanceof documentItem) || !$oDocument->isExists())
{
continue;
}
$checked[$document_srl] = true;
$GLOBALS['XE_EXTRA_CHK'][$document_srl] = true;
$document_srls[] = $document_srl;
}
@ -102,16 +99,16 @@ class DocumentModel extends Document
if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
{
// get extra keys of the module
if(!isset($module_extra_keys[$module_srl]))
if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{
$module_extra_keys[$module_srl] = self::getExtraKeys($module_srl);
$GLOBALS['XE_EXTRA_KEYS'][$module_srl] = self::getExtraKeys($module_srl);
}
// set extra variables of the document
if($module_extra_keys[$module_srl])
if(!empty($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
{
$document_extra_vars = array();
foreach($module_extra_keys[$module_srl] as $idx => $key)
foreach($GLOBALS['XE_EXTRA_KEYS'][$module_srl] as $idx => $key)
{
$document_extra_vars[$idx] = clone($key);
@ -1491,11 +1488,13 @@ class DocumentModel extends Document
case 'nick_name' :
case 'email_address' :
case 'homepage' :
case 'regdate' :
case 'last_update' :
case 'ipaddress' :
$args->{'s_' . $search_target} = str_replace(' ', '%', $search_keyword);
break;
case 'regdate' :
case 'last_update' :
$args->{'s_' . $search_target} = preg_replace('/[^\d]/', '', $search_keyword);
break;
case 'member_srl' :
case 'readed_count' :
case 'voted_count' :

3
modules/document/queries/updateDocumentExtraKeyIdx.xml
View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

3
modules/document/queries/updateDocumentExtraVarIdx.xml
View file

@ -7,6 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="var_idx" var="var_idx" filter="number" />
<condition operation="equal" column="eid" var="eid" />
</conditions>
</query>

16
modules/document/tpl/extra_keys.html
View file

@ -110,7 +110,7 @@
<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
</div>
</div>
<table class="x_table x_table-striped x_table-hover">
<table class="x_table x_table-striped x_table-hover sortable extra_keys" data-module-srl="{$module_srl}">
<thead>
<tr class="nowr">
<th>{$lang->no}</th>
@ -123,10 +123,15 @@
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<tbody class="uDrag">
<block loop="$extra_keys => $key,$val">
<tr>
<td rowspan="2"|cond="$val->desc">{$val->idx}</td>
<tr data-eid="{$val->eid}" data-idx="{$val->idx}">
<td>
<div class="wrap" style="user-select:none">
<button type="button" class="dragBtn">Move to</button>
<span class="var_idx">{$val->idx}</span>
</div>
</td>
<td>{$val->eid}</td>
<td class="nowr"><strong>{$val->name}</strong></td>
<td class="nowr">{$lang->column_type_list[$val->type]}</td>
@ -144,9 +149,6 @@
<button type="button" class="x_icon-trash" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</button>
</td>
</tr>
<tr cond="$val->desc">
<td colspan="7">{$val->desc}</td>
</tr>
</block>
</tbody>
</table>

37
modules/document/tpl/js/document_admin.js
View file

@ -3,12 +3,10 @@
* @brief 모든 생성된 섬네일 삭제하는 액션 호출
**/
function doDeleteAllThumbnail() {
exec_xml('document','procDocumentAdminDeleteAllThumbnail', [], completeDeleteAllThumbnail);
}
function completeDeleteAllThumbnail(ret_obj) {
alert(ret_obj['message']);
location.reload();
Rhymix.ajax('document.procDocumentAdminDeleteAllThumbnail', {}, function(ret_obj) {
alert(ret_obj['message']);
location.reload();
});
}
/* 선택된 글의 삭제 또는 이동 */
@ -28,22 +26,20 @@ function completeManageDocument(ret_obj) {
window.close();
}
/* 신고 취소 */
function doCancelDeclare() {
var document_srl = [];
jQuery('#fo_list input[name=cart]:checked').each(function() {
document_srl[document_srl.length] = jQuery(this).val();
$('#fo_list input[name=cart]:checked').each(function() {
document_srl.push($(this).val());
});
if (document_srl.length < 1) {
return;
}
if(document_srl.length<1) return;
var params = {document_srl : document_srl.join(',')};
exec_xml('document','procDocumentAdminCancelDeclare', params, completeCancelDeclare);
}
function completeCancelDeclare(ret_obj) {
location.reload();
var params = { document_srl : document_srl.join(',') };
Rhymix.ajax('document.procDocumentAdminCancelDeclare', params, function() {
location.reload();
});
}
function completeInsertExtraVar(ret_obj) {
@ -93,8 +89,9 @@ function moveVar(type, module_srl, var_idx) {
module_srl : module_srl,
var_idx : var_idx
};
var response_tags = ['error','message'];
exec_xml('document','procDocumentAdminMoveExtraVar', params, function() { location.reload() });
Rhymix.ajax('document.procDocumentAdminMoveExtraVar', params, function() {
location.reload();
});
}
function completeRestoreTrash(ret_obj) {

27
modules/document/tpl/js/document_extra_keys.js
View file

@ -1,5 +1,31 @@
(function($) {
$(function() {
// Reorder extra keys
$('table.extra_keys.sortable').on('after-drag.st', function(e) {
const $table = $(this);
let order = [];
let i = 1;
$table.find('tbody > tr').each(function() {
order.push({
eid: $(this).data('eid'),
old_idx: parseInt($(this).data('idx'), 10),
new_idx: i++
});
});
Rhymix.ajax('document.procDocumentAdminReorderExtraVars', {
module_srl: $(this).data('moduleSrl'),
order: order
}, function() {
let i = 1;
$table.find('.var_idx').each(function() {
$(this).text(i);
i++;
});
});
});
// Show or hide fields depending on the type of variable
$('select#type').on('change', function() {
const selected_type = $(this).val();
$(this).parents('form').find('.x_control-group').each(function() {
@ -21,5 +47,6 @@
}
});
}).triggerHandler('change');
});
})(jQuery);

12
modules/editor/skins/ckeditor/file_upload.html
View file

@ -58,10 +58,10 @@
</div>
<script>
window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
xe.lang.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
xe.lang.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
xe.lang.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
xe.lang.msg_file_upload_error = '{$lang->msg_file_upload_error}';
</script>

4
modules/editor/tpl/js/editor_common.js
View file

@ -211,7 +211,7 @@ function openComponent(component_name, editor_sequence, manual_url) {
if(typeof(current_mid)!="undefined" && current_mid) popup_url += "&mid="+escape(current_mid);
if (navigator.userAgent.match(/mobile/i)) {
openFullScreenIframe(popup_url, 'editorComponent');
openModalIframe(popup_url, 'editorComponent');
} else {
popopen(popup_url, 'editorComponent');
}
@ -244,7 +244,7 @@ function editorSearchComponent(evt) {
if(editorMode[editor_sequence]=='html') return;
var popup_url = request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&module_srl="+editor_sequence
if (navigator.userAgent.match(/mobile/i)) {
openFullScreenIframe(popup_url, 'GenerateCodeInPage');
openModalIframe(popup_url, 'GenerateCodeInPage');
} else {
popopen(popup_url, 'GenerateCodeInPage');
}

4
modules/editor/tpl/js/editor_module_config.js
View file

@ -1,5 +1,7 @@
"use strict";
function getEditorSkinColorList() { }
(function($) {
$(function() {
$('.editor_skin_selector').on('change', function() {
@ -18,4 +20,4 @@
}
});
});
})(jQuery);
})(jQuery);

9
modules/file/file.controller.php
View file

@ -1265,7 +1265,14 @@ class FileController extends File
$adjusted['height'] = (int)$resize_height;
if (!$is_animated && $adjusted['type'] === $image_info['type'] && $config->max_image_size_same_format !== 'Y')
{
$adjusted['type'] = $config->max_image_size_same_format ?: 'jpg';
if (in_array($config->max_image_size_same_format, ['jpg', 'png', 'webp']))
{
$adjusted['type'] = $config->max_image_size_same_format;
}
else
{
$adjusted['type'] = 'jpg';
}
}
}
}

61
modules/file/scripts/cleanEmptyDirs.php Normal file
View file

@ -0,0 +1,61 @@
<?php
/**
* This script deletes empty directories under the 'files' directory.
*
* It may be useful when your web host imposes a hard limit on the number of
* inodes, or when your backups take too long due to the large number of
* unused directories.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete empty directories in the attachment directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/attach')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/attach.\n";
}
else
{
echo "Error while deleting empty directories under files/attach.\n";
$exit_status = $result;
}
// Delete empty directories in the member extra info directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/member_extra_info')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/member_extra_info.\n";
}
else
{
echo "Error while deleting empty directories under files/member_extra_info.\n";
$exit_status = $result;
}
// Delete empty directories in the thumbnails directory.
passthru(sprintf('find %s -type d -empty -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails')), $result);
if ($result == 0)
{
echo "Successfully deleted all empty directories under files/thumbnails.\n";
}
else
{
echo "Error while deleting empty directories under files/thumbnails.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

102
modules/file/scripts/cleanGarbageFiles.php Normal file
View file

@ -0,0 +1,102 @@
<?php
/**
* This script deletes files that were not properly uploaded.
*
* Files can remain in an invalid status for two reasons: 1) a user abandons
* a document or comment after uploading files; or 2) a chunked upload is
* aborted without the server having any opportunity to clean it up.
* These files can obviously take up a lot of disk space. In order to prevent
* them from accumulating too much, you should run this script at least once
* every few days.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete garbage files older than this number of days.
$days = intval($args[0] ?? 0) ?: 10;
// Initialize objects.
$oDB = DB::getInstance();
$oFileController = FileController::getInstance();
// Find and delete files where isvalid = N.
while (true)
{
$output = executeQueryArray('file.getFileList', [
'isvalid' => 'N',
'list_count' => 50,
'regdate_before' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
if ($output->data)
{
$oDB->begin();
foreach ($output->data as $file_info)
{
$oFileController->deleteFile($file_info->file_srl);
}
$oDB->commit();
if ($output->page_navigation && $output->page_navigation->total_count == count($output->data))
{
break;
}
}
else
{
break;
}
}
else
{
echo "Error while deleting garbage files older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
break;
}
}
if ($exit_status == 0)
{
echo "Successfully deleted all garbage files older than $days days.\n";
}
// Find and delete temporary chunks.
$dirname = RX_BASEDIR . 'files/attach/chunks';
$threshold = time() - ($days * 86400);
$chunks = Rhymix\Framework\Storage::readDirectory($dirname);
if ($chunks)
{
foreach ($chunks as $chunk)
{
if (@filemtime($chunk) < $threshold)
{
$result = Rhymix\Framework\Storage::delete($chunk);
if (!$result)
{
$exit_status = 12;
}
}
}
}
if ($exit_status == 0)
{
echo "Successfully deleted temporary file chunks older than $days days.\n";
}
else
{
echo "Error while deleting temporary file chunks older than $days days.\n";
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

44
modules/file/scripts/cleanThumbnails.php Normal file
View file

@ -0,0 +1,44 @@
<?php
/**
* This script deletes old thumbnails.
*
* Thumbnails can take up a large amount of disk space and inodes if they are
* allowed to accumulate. Since most websites only need thumbnails for recent
* posts, it is okay to delete old thumbnails.
*
* Do not run this script if you have a gallery-style module where visitors
* regularly view old posts. This will force thumbnails to be regenerated,
* increasing the server load and making your pages load slower.
*
* This script only works on Unix-like operating systems where the 'find'
* command is available.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete thumbnails older than this number of days.
$days = intval($args[0] ?? 0) ?: 90;
// Delete old thumbnails.
passthru(sprintf('find %s -type f -mtime +%d -delete', escapeshellarg(RX_BASEDIR . 'files/thumbnails'), abs($days)), $result);
if ($result == 0)
{
echo "Successfully deleted thumbnails older than $days days.\n";
}
else
{
echo "Error while deleting thumbnails older than $days days.\n";
$exit_status = $result;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

32
modules/importer/importer.admin.controller.php
View file

@ -18,11 +18,6 @@ class importerAdminController extends importer
* @var int
*/
var $unit_count = 300;
/**
* Xml parser
* @var XmlParser
*/
var $oXmlParser = null;
/**
* Initialization
@ -346,8 +341,6 @@ class importerAdminController extends importer
function importMember($key, $cur, $index_file)
{
if(!$cur) $cur = 0;
// Create the xmlParser object
$oXmlParser = new XeXmlParser();
// Create objects for importing member information
$this->oMemberController = getController('member');
$this->oMemberModel = getModel('member');
@ -368,7 +361,7 @@ class importerAdminController extends importer
// Find a given location
$target_file = trim(fgets($f, 1024));
// Load and parse the file
$xmlObj = $oXmlParser->loadXmlFile($target_file);
$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
FileHandler::removeFile($target_file);
if(!$xmlObj) continue;
// List Objects
@ -539,8 +532,6 @@ class importerAdminController extends importer
function importMessage($key, $cur, $index_file)
{
if(!$cur) $cur = 0;
// Create the xmlParser object
$oXmlParser = new XeXmlParser();
// Open an index file
$f = fopen($index_file,"r");
// Pass if already read
@ -552,7 +543,7 @@ class importerAdminController extends importer
// Find a location
$target_file = trim(fgets($f, 1024));
// Load and parse the file
$xmlObj = $oXmlParser->loadXmlFile($target_file);
$xmlObj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($target_file);
FileHandler::removeFile($target_file);
if(!$xmlObj) continue;
// List objects
@ -638,8 +629,6 @@ class importerAdminController extends importer
*/
function importModule($key, $cur, $index_file, $module_srl)
{
// Pre-create the objects needed
$this->oXmlParser = new XeXmlParser();
// Get category information of the target module
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
@ -651,9 +640,7 @@ class importerAdminController extends importer
if(file_exists($category_file))
{
$buff = FileHandler::readFile($category_file);
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($category_file);
$categories = $xmlDoc->items->category;
if($categories)
@ -757,7 +744,7 @@ class importerAdminController extends importer
if($started) $buff[] = $str;
}
$xmlDoc = $this->oXmlParser->parse(implode('', $buff));
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString(implode('', $buff));
$category = base64_decode($xmlDoc->post->category->body);
if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
@ -901,7 +888,7 @@ class importerAdminController extends importer
// If </trackback>, insert to the DB
if(trim($str) == '</trackback>')
{
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$obj = new stdClass;
$obj->trackback_srl = getNextSequence();
@ -963,7 +950,7 @@ class importerAdminController extends importer
// If </comment> is, insert to the DB
if(trim($str) == '</comment>')
{
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$sequence = base64_decode($xmlDoc->comment->sequence->body);
$sequences[$sequence] = $obj->comment_srl;
@ -1106,7 +1093,7 @@ class importerAdminController extends importer
// If it ends with </attach>, handle attachements
if(trim($str) == '</attach>')
{
$xmlDoc = $this->oXmlParser->parse($buff.$str);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff.$str);
$file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
$file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
@ -1250,14 +1237,13 @@ class importerAdminController extends importer
if(!$buff) return array();
$buff = '<extra_vars>'.$buff;
$oXmlParser = new XeXmlParser();
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
if(empty($xmlDoc->extra_vars->key)) return array();
$index = 1;
foreach($xmlDoc->extra_vars->key as $k => $v)
{
unset($vobj);
$vobj = new stdClass();
if($v->var_idx)
{
$vobj->var_idx = base64_decode($v->var_idx->body);

30
modules/importer/ttimport.class.php
View file

@ -13,12 +13,6 @@
*/
class ttimport
{
/**
* Xml Parse
* @var XmlParser
*/
var $oXmlParser = null;
/**
* Import data in module.xml format
* @param int $key
@ -33,8 +27,6 @@ class ttimport
*/
function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
{
// Pre-create the objects needed
$this->oXmlParser = new XeXmlParser();
// Get category information of the target module
$oDocumentController = getController('document');
$oDocumentModel = getModel('document');
@ -45,8 +37,8 @@ class ttimport
$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
if(file_exists($category_file))
{
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($category_file);
// List category information
if($xmlDoc->categories->category)
{
@ -62,7 +54,7 @@ class ttimport
$obj = null;
$obj->title = $category;
$obj->module_srl = $module_srl;
$obj->module_srl = $module_srl;
if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
$output = $oDocumentController->insertCategory($obj);
@ -126,7 +118,7 @@ class ttimport
if($started) $buff .= $str;
}
$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString('<post>'.$buff);
$author_xml_id = $xmlDoc->post->author->body;
@ -250,7 +242,7 @@ class ttimport
// Save state if not published
if(!in_array($xmlDoc->post->visibility->body, $status_published))
{
$obj->module_srl = $member_info->member_srl;
$obj->module_srl = $member_info->member_srl;
}
}
// Document
@ -288,8 +280,8 @@ class ttimport
$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
if(file_exists($guestbook_file))
{
// Create the xmlParser object
$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlFile($guestbook_file);
// Handle guest book information
if($guestbook_module_srl && $xmlDoc->guestbook->comment)
{
@ -480,7 +472,7 @@ class ttimport
$buff .= '</attachment>';
$xmlDoc = $this->oXmlParser->parse($buff);
$xmlDoc = Rhymix\Framework\Parsers\XEXMLParser::loadXmlString($buff);
$file_obj->source_filename = $xmlDoc->attachment->label->body;
$file_obj->download_count = $xmlDoc->attachment->downloads->body;
@ -516,7 +508,7 @@ class ttimport
{
$uploaded_count++;
$tmp_obj = null;
if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename;
if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename;
else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
$files[$name]->direct_download = $file_obj->direct_download;
$files[$name]->source_filename = $file_obj->source_filename;
@ -583,7 +575,7 @@ class ttimport
if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
{
return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
// If other multimedia file but image is,
// If other multimedia file but image is,
}
else
{
@ -606,7 +598,7 @@ class ttimport
$key = $matches[1];
if(!$key) return $matches[0];
return
return
'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
'<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
'<param name="allowScriptAccess" value="always"/>'.

3
modules/krzip/krzip.model.php
View file

@ -173,8 +173,7 @@ class krzipModel extends krzip
$request_config
);
$oXmlParser = new XeXmlParser();
$result = $oXmlParser->parse($buff);
$result = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
if($result->error)
{
$err_msg = trim($result->error->message->body);

16
modules/layout/layout.model.php
View file

@ -572,13 +572,17 @@ class LayoutModel extends Layout
return $layout_info;
}
// If no cache file exists, parse the xml and then return the variable.
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$tmp_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($xml_file);
if (!$tmp_xml_obj)
{
return;
}
if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
if(!$xml_obj) return;
$xml_obj = !empty($tmp_xml_obj->layout) ? $tmp_xml_obj->layout : $tmp_xml_obj->skin;
if (!$xml_obj)
{
return;
}
$buff = array();
$buff[] = '$layout_info = new stdClass;';

14
modules/layout/tpl/layout_info_view.html
View file

@ -53,10 +53,10 @@
<h1>{$lang->extra_vars}</h1>
{@$cnt = 1}
<block loop="$selected_layout->extra_var => $name, $var">
<block cond="$cnt == 1 && $var->group"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
<block cond="$group != $var->group">
<block cond="$cnt == 1 && !empty($var->group)"><div class="x_tabbable"><ul class="x_nav x_nav-tabs"></block>
<block cond="($group ?? null) != ($var->group ?? null)">
<li class="x_active"|cond="$cnt == 1"><a href="#extra_var{$cnt}" data-index="{$cnt}">{$var->group}</a></li>
{@$group = $var->group}
{@$group = $var->group ?? null}
{@$cnt ++}
</block>
</block>
@ -77,7 +77,7 @@
<label class="x_control-label" for="{$name}"|cond="$var->type!='text'&&$var->type!='textarea'" for="lang_{$name}"|cond="$var->type=='text'||$var->type=='textarea'">{$var->title}</label>
<div class="x_controls">
<div cond="$var->type == 'text'">
<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value ?? '', '$user_lang->') !== false)-->{htmlspecialchars($var->value ?? '', ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}<!--@else-->{$var->value}<!--@end-->" />
</div>
<div cond="$var->type == 'textarea'">
@ -118,7 +118,7 @@
<block cond="$var->type == 'radio'">
<div class="x_thumbnails">
<block loop="$var->options => $key, $val">
<div class="x_span2 <!--@if($val->thumbnail)-->x_thumbnail<!--@end-->">
<div class="x_span2 <!--@if(!empty($val->thumbnail))-->x_thumbnail<!--@end-->">
<img src="../../../{$val->thumbnail}" cond="$val->thumbnail" alt="{$val->val}" />
<div class="x_caption">
<label><input type="radio" name="{$name}" value="{$key}" checked="checked"|cond="$key == $var->value" /> {$val->val}</label>
@ -156,8 +156,8 @@
<div class="x_clearfix btnArea">
<span class="etc">
<a cond="$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type)}">{$lang->cmd_list}</a>
<a cond="!$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type)}">{$lang->cmd_list}</a>
<a cond="!empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type ?? null)}">{$lang->cmd_list}</a>
<a cond="empty($layout)" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type ?? null)}">{$lang->cmd_list}</a>
</span>
<span class="x_btn-group x_pull-right">
<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" onclick="doSubmitConfig()"/>

3
modules/member/lang/en.php
View file

@ -201,6 +201,9 @@ $lang->msg_email_address_not_changeable = 'You cannot change your email address
$lang->msg_signup_disabled = 'You are not able to sign up';
$lang->msg_already_logged = 'You have already signed up.';
$lang->msg_not_logged = 'Please log in.';
$lang->msg_required_not_logged = 'This page is only available to users who are not logged in.';
$lang->msg_required_specific_group = 'You need to belong to a certain group in order to access this page.';
$lang->msg_required_minimum_level = 'YOu need to be level %d or higher in order to access this page.';
$lang->msg_insert_group_name = 'Please enter the name of group.';
$lang->msg_check_group = 'Please select the group.';
$lang->msg_not_uploaded_profile_image = 'Profile image could not be registered.';

3
modules/member/lang/ko.php
View file

@ -203,6 +203,9 @@ $lang->msg_email_address_not_changeable = '이메일 주소는 이 화면에서
$lang->msg_signup_disabled = '회원 가입할 수 없습니다.';
$lang->msg_already_logged = '이미 로그인되어 있습니다.';
$lang->msg_not_logged = '로그인이 필요합니다.';
$lang->msg_required_not_logged = '로그인하지 않은 상태에서만 사용할 수 있는 기능입니다.';
$lang->msg_required_specific_group = '이 기능을 사용할 수 있는 그룹이 제한되어 있습니다.';
$lang->msg_required_minimum_level = '이 기능을 사용하려면 레벨 %d 이상이어야 합니다.';
$lang->msg_insert_group_name = '그룹명을 입력해 주세요.';
$lang->msg_check_group = '그룹을 선택해 주세요.';
$lang->msg_not_uploaded_profile_image = '프로필 이미지를 등록할 수 없습니다.';

2
modules/member/tpl/group_list.html
View file

@ -23,7 +23,7 @@
<caption>
<strong>{count($group_list)}{$lang->msg_groups_exist}</strong>
<span class="x_pull-right" style="position:relative;top:7px">
{$lang->use_group_image_mark}:
{$lang->use_group_image_mark}:
<label for="yes" class="x_inline"><input type="radio" name="group_image_mark" id="yes" value="Y" checked="checked"|cond="$config->group_image_mark == 'Y'" /> {$lang->cmd_yes}</label>
<label for="no" class="x_inline"><input type="radio" name="group_image_mark" id="no" value="N" checked="checked"|cond="$config->group_image_mark != 'Y'" /> {$lang->cmd_no}</label>
</span>

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

@ -680,6 +680,7 @@
<select id="auth${PermId}">
<option class="_group_all" value="0">{$lang->grant_to_all}</option>
<option class="_group_loggedin" value="-1">{$lang->grant_to_login_user}</option>
<option class="_group_not_loggedin" value="-4">{$lang->grant_to_non_login_user}</option>
<option class="_group_manager" value="-3">{$lang->grant_to_admin}</option>
<option class="_group_selected" value="-10">{$lang->grant_to_group}</option>
</select>
@ -1521,12 +1522,12 @@ jQuery(function($){
$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
if($(this).hasClass('_nodeType_1')){
$.xeMsgBox.alert(xe.msg_no_root);
$.xeMsgBox.alert(xe.lang.msg_no_root);
return;
}
if($(this).hasClass('_nodeType_3')){
$.xeMsgBox.alert(xe.msg_no_shortcut);
$.xeMsgBox.alert(xe.lang.msg_no_shortcut);
return;
}
@ -2328,7 +2329,8 @@ jQuery(function($){
var htGrantStrToSelectValMap = {
'all': '0',
'member': '-1',
'site': '-2',
'site': '-1',
'not_member': '-4',
'manager': '-3',
'group': '-10'
};
@ -2366,7 +2368,7 @@ jQuery(function($){
/*
guest : 모든 옵션 사용 가능, 항상 권한 있음.
member : '모든 사용자' 제외하고 사용 가능, 로그인 정보가 있을 경우 true
site : '모든 사용자' 제외하고 사용 가능, 가상 사이트일 경우에는 가입된 그룹 정보가 있어야 하며, 가상 사이트가 아닐 경우에는 'member'와 동일.
not_member : 비로그인 사용자, 로그인 정보가 *없을* 경우 true
manager : '관리자만','선택그룹 사용자' 옵션만 사용가능, 관리자일 경우에만 true
root : manager와 동일.
*/
@ -2377,6 +2379,9 @@ jQuery(function($){
case 'member':
$node.find('._group_all').remove();
break;
case 'not_member':
$node.find('._group_all').remove();
break;
case 'site':
$node.find('._group_all').remove();
break;

7
modules/module/lang/en.php
View file

@ -46,11 +46,12 @@ $lang->header_script = 'Header Script';
$lang->about_header_script = 'You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself. You can use &lt;script&gt;, &lt;style&gt; or &lt;meta&gt; tags.';
$lang->grant_access = 'Access';
$lang->grant_manager = 'Management';
$lang->grant_to_all = 'All users';
$lang->grant_to_login_user = 'Login users';
$lang->grant_to_all = 'Everyone';
$lang->grant_to_login_user = 'Logged in users';
$lang->grant_to_non_login_user = 'Logged out users';
$lang->grant_to_site_user = 'Registered users';
$lang->grant_to_admin = 'Administrator only';
$lang->grant_to_group = 'Selected group users';
$lang->grant_to_group = 'Selected group members';
$lang->cmd_add_shortcut = 'Add Shortcut';
$lang->cmd_install = 'Install';
$lang->cmd_create_db_table = 'Create DB Table';

5
modules/module/lang/ko.php
View file

@ -46,11 +46,12 @@ $lang->header_script = '헤더 스크립트';
$lang->about_header_script = 'HTML &lt;head&gt;...&lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. 예) &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; ';
$lang->grant_access = '접근 권한';
$lang->grant_manager = '관리 권한';
$lang->grant_to_all = '모든 사용자';
$lang->grant_to_all = '모든 방문자';
$lang->grant_to_login_user = '로그인 사용자';
$lang->grant_to_non_login_user = '비로그인 사용자';
$lang->grant_to_site_user = '가입한 사용자';
$lang->grant_to_admin = '관리자만';
$lang->grant_to_group = '선택 그룹 사용자';
$lang->grant_to_group = '선택 그룹 소속 회원';
$lang->cmd_add_shortcut = '바로가기 추가';
$lang->cmd_install = '설치';
$lang->cmd_create_db_table = 'DB Table 생성하기';

194
modules/module/models/Permission.php
View file

@ -7,31 +7,138 @@ class Permission
{
/**
* Default properties.
*
* Note that $is_admin is an alias to $root,
* and $is_site_admin is an alias to $manager.
*/
public $access;
public $root;
public $manager;
public $scopes;
/**
* Alias to $root, kept for backward compatibility only.
*
* @deprecated
* Requirements for this module.
*/
public $is_admin;
protected $_spec = [];
/**
* Alias to $manager, kept for backward compatibility only.
*
* @deprecated
* Scopes for module managers.
*/
public $is_site_admin;
protected $_scopes = [];
/**
* Primary method to determine whether a user is allowed to do something.
* Constructor will be called from ModuleModel::getGrant().
*
* @param array $xml_grant_list
* @param array $module_grants
* @param ?object $module_info
* @param ?object $member_info
*/
public function __construct(array $xml_grant_list, array $module_grants, ?object $module_info = null, ?object $member_info = null)
{
// Generate the list of default permissions.
$this->_spec = [
'access' => 'guest',
'root' => 'root',
'manager' => 'manager',
'is_admin' => 'root',
'is_site_admin' => 'root',
];
foreach ($xml_grant_list as $key => $val)
{
$this->_spec[$key] = $val->default ?? '';
}
// Override the defaults with user settings.
foreach ($module_grants as $row)
{
$key = $row->name;
if ($row->group_srl == 0)
{
$this->_spec[$key] = 'guest';
continue;
}
if ($row->group_srl == -1 || $row->group_srl == -2)
{
$this->_spec[$key] = 'member';
continue;
}
if ($row->group_srl == -4)
{
$this->_spec[$key] = 'not_member';
continue;
}
if ($row->group_srl == -3)
{
$this->_spec[$key] = 'manager';
continue;
}
if ($row->group_srl > 0)
{
if (!isset($this->_spec[$key]) || !is_array($this->_spec[$key]))
{
$this->_spec[$key] = [];
}
$this->_spec[$key][] = $row->group_srl;
continue;
}
}
// If the member is an administrator, grant all possible permissions.
if ($member_info && $member_info->is_admin === 'Y')
{
$this->_scopes = true;
foreach ($this->_spec as $key => $requirement)
{
$this->{$key} = true;
}
return;
}
// If the member is a module manager, fill the scope of management.
$manager_scopes = !empty($module_info->module_srl) ? \ModuleModel::isModuleAdmin($member_info, $module_info->module_srl) : false;
$member_groups = !empty($member_info->group_list) ? array_keys($member_info->group_list) : [];
if ($manager_scopes)
{
$this->manager = true;
$this->_scopes = $manager_scopes;
}
// Check if each permission is granted to the current user.
foreach ($this->_spec as $key => $requirement)
{
if ($requirement === 'guest')
{
$this->{$key} = true;
}
elseif ($requirement === 'member')
{
$this->{$key} = ($member_info && $member_info->member_srl);
}
elseif ($requirement === 'not_member')
{
$this->{$key} = !($member_info && $member_info->member_srl) || $this->manager;
}
elseif ($requirement === 'manager')
{
$this->{$key} = $this->manager ? true : false;
}
elseif ($requirement === 'root')
{
$this->{$key} = $this->root ? true : false;
}
elseif (is_array($requirement))
{
$this->{$key} = array_intersect($member_groups, $requirement) ? true : false;
if ($key === 'manager' && $this->{$key} === true)
{
$this->_scopes = true;
}
}
}
}
/**
* Find out whether the current user is allowed to do something.
*
* This is more portable than accessing object attributes directly,
* and also supports manager scopes.
*
* @param string $scope
* @return bool
@ -43,17 +150,17 @@ class Permission
return boolval($this->{$scope});
}
if ($this->manager && $this->scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
if ($this->manager && $this->_scopes && preg_match('/^(\w+):(.+)$/', $scope, $matches))
{
if ($this->scopes === true)
if ($this->_scopes === true)
{
return true;
}
if (is_array($this->scopes) && in_array($scope, $this->scopes))
if (is_array($this->_scopes) && in_array($scope, $this->_scopes))
{
return true;
}
if (is_array($this->scopes) && in_array($matches[1] . ':*', $this->scopes))
if (is_array($this->_scopes) && in_array($matches[1] . ':*', $this->_scopes))
{
return true;
}
@ -61,4 +168,57 @@ class Permission
return false;
}
/**
* Find out who is allowed to do something.
*
* This method returns 'root', 'manager', 'member', 'guest',
* or an array of group_srls whose members are allowed.
*
* If you pass the name of a scope, the result might vary
* depending on whether you are a module manager.
*
* @param string key
* @return string|array
*/
public function whocan(string $key)
{
if (isset($this->_spec[$key]))
{
return $this->_spec[$key];
}
elseif (preg_match('/^(\w+):(\w+)$/', $key))
{
if ($this->manager)
{
return $this->can($key) ? 'manager' : 'root';
}
else
{
return 'manager';
}
}
else
{
return 'nobody';
}
}
/**
* Magic method to provide deprecated aliases.
*
* @param string $key
* @return mixed
*/
public function __get(string $key)
{
if ($key === 'is_admin' || $key === 'is_site_admin')
{
return $this->root;
}
else
{
return false;
}
}
}

6
modules/module/module.admin.model.php
View file

@ -182,7 +182,8 @@ class ModuleAdminModel extends Module
{
if($val->group_srl == 0) $default_grant[$val->name] = 'all';
else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
else if($val->group_srl == -2) $default_grant[$val->name] = 'member';
else if($val->group_srl == -4) $default_grant[$val->name] = 'not_member';
else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
else
{
@ -260,7 +261,8 @@ class ModuleAdminModel extends Module
{
if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'member';
else if($val->group_srl == -4) $defaultGrant->{$val->name} = 'not_member';
else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
else
{

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

@ -1031,8 +1031,7 @@ class ModuleModel extends Module
}
// Create XmlParser object
$oXmlParser = new XeXmlParser();
$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
$_xml_obj = Rhymix\Framework\Parsers\XEXMLParser::loadXMLFile($skin_xml_file);
// Return if no skin information is
if(!$_xml_obj->skin) return;
$xml_obj = $_xml_obj->skin;
@ -2187,7 +2186,7 @@ class ModuleModel extends Module
*/
public static function getGrant($module_info, $member_info, $xml_info = null)
{
if(empty($module_info->module))
if (empty($module_info->module))
{
$module_info = new stdClass;
$module_info->module = $module_info->module_srl = 0;
@ -2202,148 +2201,16 @@ class ModuleModel extends Module
}
}
// Get information of module.xml
if(!$xml_info)
// Get module grant information
if (!$xml_info)
{
$xml_info = self::getModuleActionXml($module_info->module);
}
// Generate grant
$xml_grant_list = isset($xml_info->grant) ? (array)$xml_info->grant : array();
// Get group information of member
$member_group = !empty($member_info->group_list) ? array_keys($member_info->group_list) : array();
$is_module_admin = !empty($module_info->module_srl) ? self::isModuleAdmin($member_info, $module_info->module_srl) : false;
// Get 'privilege name' list from module.xml
$privilege_list = array_keys($xml_grant_list);
// Prepend default 'privilege name'
// manager, is_site_admin not distinguish because of compatibility.
array_unshift($privilege_list, 'access', 'is_admin', 'manager', 'is_site_admin', 'root');
// Unique
$privilege_list = array_unique($privilege_list, SORT_STRING);
// Grant first
$grant = new Rhymix\Modules\Module\Models\Permission;
foreach($privilege_list as $val)
{
// If an administrator, grant all
if($member_info && $member_info->is_admin == 'Y')
{
$grant->{$val} = true;
}
// If a module manager, grant all (except 'root', 'is_admin')
elseif ($is_module_admin && $val !== 'root' && $val !== 'is_admin')
{
$grant->{$val} = true;
}
// If module_srl doesn't exist, grant access
else if(empty($module_info->module_srl) && $val === 'access')
{
$grant->{$val} = true;
}
// Default : not grant
else
{
$grant->{$val} = false;
}
}
// If module admin, add scopes
if ($member_info && $member_info->is_admin == 'Y')
{
$grant->scopes = true;
}
elseif ($is_module_admin)
{
$grant->scopes = $is_module_admin;
}
else
{
$grant->scopes = [];
}
// If access were not granted, check more
if(!$grant->access)
{
$checked = array();
// Grant privileges by information that get from the DB
foreach(self::getModuleGrants($module_info->module_srl)->data as $val)
{
$checked[$val->name] = true;
if($grant->{$val->name})
{
continue;
}
// All user
if($val->group_srl == 0)
{
$grant->{$val->name} = true;
continue;
}
// Log-in member only
if($member_info && $member_info->member_srl)
{
if($val->group_srl == -1 || $val->group_srl == -2)
{
$grant->{$val->name} = true;
}
// Manager only
else if($val->group_srl == -3)
{
if($grant->manager)
{
$grant->{$val->name} = true;
}
}
// If a target is a group
else if(count($member_group) && in_array($val->group_srl, $member_group))
{
$grant->{$val->name} = true;
if ($val->name === 'manager' && !$grant->scopes)
{
$grant->scopes = true;
}
}
}
}
// Grant access by default
if(!isset($checked['access']))
{
$grant->access = true;
}
// Grant privileges by default information of module
foreach($xml_grant_list as $name => $item)
{
if(isset($checked[$name]) || $grant->{$name})
{
continue;
}
// All user
if($item->default == 'guest')
{
$grant->{$name} = true;
continue;
}
// Log-in member only
if($member_info && $member_info->member_srl)
{
if($item->default == 'member' || $item->default == 'site')
{
$grant->{$name} = true;
}
}
}
}
$module_grants = self::getModuleGrants($module_info->module_srl ?? 0)->data ?: [];
$grant = new Rhymix\Modules\Module\Models\Permission($xml_grant_list, $module_grants, $module_info, $member_info ?: null);
return $__cache = $grant;
}

84
modules/module/scripts/cleanMiscLogs.php Normal file
View file

@ -0,0 +1,84 @@
<?php
/**
* This script deletes old logs from the database.
*
* Rhymix produces various logs that can increase the size of the database
* unnecessarily if not cleaned. This script removes old logs.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete logs older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Delete advanced mailer email logs.
$output = executeQuery('advanced_mailer.deleteMailLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all email logs older than $days days.\n";
}
else
{
echo "Error while deleting email logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Delete advanced mailer SMS logs.
$output = executeQuery('advanced_mailer.deleteSMSLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all SMS logs older than $days days.\n";
}
else
{
echo "Error while deleting SMS logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 12;
}
// Delete advanced mailer Push logs.
$output = executeQuery('advanced_mailer.deletePushLogs', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all Push logs older than $days days.\n";
}
else
{
echo "Error while deleting Push logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 13;
}
// Delete spamfilter logs.
$output = executeQuery('spamfilter.deleteLog', [
'regdate' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all spamfilter logs older than $days days.\n";
}
else
{
echo "Error while deleting spamfilter logs older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 21;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

67
modules/module/scripts/updateAllModules.php Normal file
View file

@ -0,0 +1,67 @@
<?php
/**
* This script updates all modules.
*
* When upgrading from a very old version, it is safer to run this script
* on the CLI than clicking 'update' in the admin dashboard.
* This is because some module updates may take a long time.
*
* Note that if you use APC cache, you may need to reset the cache
* in the admin dashboard after running this script.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Get the list of modules that need to be updated.
$module_list = ModuleModel::getModuleList();
$need_install = array();
$need_update = array();
foreach ($module_list as $key => $value)
{
if ($value->need_install)
{
$need_install[] = $value->module;
}
if ($value->need_update)
{
$need_update[] = $value->module;
}
}
// Install all modules.
$oInstallController = InstallController::getInstance();
foreach ($need_install as $module)
{
try
{
echo 'Installing ' . $module . '...' . PHP_EOL;
$oInstallController->installModule($module, './modules/' . $module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Update all modules.
foreach ($need_update as $module)
{
try
{
echo 'Updating ' . $module . '...' . PHP_EOL;
$oInstallController->updateModule($module);
}
catch (\Exception $e)
{
echo 'Error: ' . $e->getMessage() . PHP_EOL;
}
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

5
modules/module/tpl/include.module_grant_setup.html
View file

@ -13,8 +13,9 @@
<label class="x_control-label" for="{$grant_name}_default">{$grant_item->title}</label>
<div class="x_controls">
<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
<option value="0" cond="$grant_item->default == 'guest'">{$lang->grant_to_all}</option>
<option value="-1" cond="$grant_item->default != 'manager'">{$lang->grant_to_login_user}</option>
<option value="0">{$lang->grant_to_all}</option>
<option value="-1">{$lang->grant_to_login_user}</option>
<option value="-4">{$lang->grant_to_non_login_user}</option>
<option value="-3">{$lang->grant_to_admin}</option>
<option value="">{$lang->grant_to_group}</option>
</select>

5
modules/module/tpl/module_grants.html
View file

@ -58,8 +58,9 @@
<label for="{$grant_name}_default" class="x_control-label">{$grant_item->title}</label>
<div class="x_controls">
<select name="{$grant_name}_default" id="{$grant_name}_default" class="grant_default">
<!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
<!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
<option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option>
<option value="-1" <!--@if($default_grant[$grant_name]=='member' || $default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option>
<option value="-4" <!--@if($default_grant[$grant_name]=='not_member')-->selected="selected"<!--@end-->>{$lang->grant_to_non_login_user}</option>
<option value="-3" <!--@if($default_grant[$grant_name]=='manager')-->selected="selected"<!--@end-->>{$lang->grant_to_admin}</option>
<option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
</select>

14
modules/module/tpl/multilingual_v17.html
View file

@ -41,11 +41,11 @@
</div>
</div>
<script>
xe.confirm_delete = '{$lang->confirm_delete}';
xe.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
xe.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
xe.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
xe.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
xe.use_after_save = '{$lang->use_after_save}';
xe.cmd_save = '{$lang->cmd_save}';
xe.lang.confirm_delete = '{$lang->confirm_delete}';
xe.lang.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
xe.lang.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
xe.lang.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
xe.lang.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
xe.lang.use_after_save = '{$lang->use_after_save}';
xe.lang.cmd_save = '{$lang->cmd_save}';
</script>

44
modules/ncenterlite/scripts/cleanNotifications.php Normal file
View file

@ -0,0 +1,44 @@
<?php
/**
* This script deletes old notifications.
*
* Notifications must be dismissed as quickly as possible in order to prevent
* the ncenterlite_notify table from becoming too large. For best performance,
* you should run this script at least once every few days.
*/
if (!defined('RX_VERSION'))
{
exit;
}
// Initialize the exit status.
$exit_status = 0;
// Delete notifications older than this number of days.
$days = intval($args[0] ?? 0) ?: 30;
// Execute the query.
$output = executeQuery('ncenterlite.deleteNotifyAll', [
'old_date' => date('YmdHis', time() - ($days * 86400)),
]);
if ($output->toBool())
{
echo "Successfully deleted all notifications older than $days days.\n";
$delete_obj = (object)array('regdate' => time());
Rhymix\Framework\Cache::clearGroup('ncenterlite');
Rhymix\Framework\Storage::writePHPData(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php', $delete_obj);
}
else
{
echo "Error while deleting notifications older than $days days.\n";
echo $output->getMessage() . "\n";
$exit_status = 11;
}
// Set the exit status if there were any errors.
if ($exit_status != 0)
{
exit($exit_status);
}

38
modules/page/page.view.php
View file

@ -188,14 +188,8 @@ class PageView extends Page
return;
}
// Kick out anyone who tries to exploit RVE-2022-2.
foreach (Context::getRequestVars() as $key => $val)
{
if (preg_match('/[\{\}\(\)<>\$\'"]/', $key) || preg_match('/[\{\}\(\)<>\$\'"]/', $val))
{
throw new Rhymix\Framework\Exceptions\SecurityViolation();
}
}
// Check parameters.
$this->_checkParams(Context::getRequestVars());
// External URL
if (preg_match('!^[a-z]+://!i', $this->path))
@ -210,6 +204,34 @@ class PageView extends Page
}
}
/**
* Check parameters for suspicious keys or values.
*
* This helps protect external pages from RVE-2022-2.
*
* @param array|object $vars
* @return void
*/
protected function _checkParams($vars)
{
foreach ($vars as $key => $val)
{
if (preg_match('/[\{\}\(\)<>\$\'"]/', $key))
{
throw new Rhymix\Framework\Exceptions\SecurityViolation();
}
if (is_array($val) || is_object($val))
{
$this->_checkParams($val);
}
elseif (preg_match('/[\{\}\(\)<>\$\'"]/', (string)$val))
{
throw new Rhymix\Framework\Exceptions\SecurityViolation();
}
}
}
/**
* @brief Save the file and return if a file is requested by http
*/

33
modules/point/point.model.php
View file

@ -117,6 +117,39 @@ class PointModel extends Point
return $level - 1;
}
/**
* Get the minimum level required to belong in group(s)
*
* @param int|array $group_srl
* @return ?int
*/
public static function getMinimumLevelForGroup($group_srl): ?int
{
if (!is_array($group_srl))
{
$group_srl = [$group_srl];
}
$min_level = null;
$config = self::getConfig();
foreach ($config->point_group ?? [] as $group => $required_level)
{
if (in_array($group, $group_srl))
{
if ($min_level === null)
{
$min_level = $required_level;
}
else
{
$min_level = min($min_level, $required_level);
}
}
}
return $min_level;
}
/**
* @deprecated
*/

8
modules/widget/tpl/widget_generate_code_in_page.html
View file

@ -5,10 +5,10 @@
<load target="../../admin/tpl/js/jquery.tmpl.js" />
<load target="../../admin/tpl/js/jquery.jstree.js" />
<script>
xe.cmd_find = "{$lang->cmd_find}";
xe.cmd_cancel = "{$lang->cmd_cancel}";
xe.cmd_confirm = "{$lang->cmd_confirm}";
xe.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.cmd_find = "{$lang->cmd_find}";
xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
xe.lang.cmd_delete = '{$lang->cmd_delete}';
jQuery(document).ready(function(){

53
modules/widget/widget.controller.php
View file

@ -300,17 +300,24 @@ class WidgetController extends Widget
*/
function transWidgetBox($matches)
{
$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
$oXmlParser = new XeXmlParser();
$xml_doc = $oXmlParser->parse($buff);
$buff = preg_replace('/<div><div>(.*)$/i','</div>', $matches[0]);
$xml = simplexml_load_string(trim($buff));
$args = new stdClass;
foreach ($xml->div ? $xml->div->attributes() : $xml->attributes() as $key => $val)
{
$args->{$key} = strval($val);
}
$vars = $xml_doc->div->attrs;
$widget = $vars->widget;
if(!$widget) return $matches[0];
$widget = $args->widget ?? null;
if(!$widget)
{
return $matches[0];
}
$args->widgetbox_content = $matches[3];
unset($vars->widget);
$vars->widgetbox_content = $matches[3];
return $this->execute($widget, $vars, $this->javascript_mode);
return $this->execute($widget, $args, $this->javascript_mode);
}
/**
@ -321,18 +328,25 @@ class WidgetController extends Widget
{
// Language in bringing
$lang_list = Context::get('lang_supported');
// Bringing widget cache sequence
preg_match_all('!<img([^\>]*)widget=([^\>]*?)\>!is', $content, $matches);
$oXmlParser = new XeXmlParser();
$cnt = count($matches[1]);
for($i=0;$i<$cnt;$i++)
foreach ($matches[0] as $buff)
{
$buff = $matches[0][$i];
$xml_doc = $oXmlParser->parse(trim($buff));
$args = $xml_doc->img->attrs;
$widget = $args->widget;
$xml = simplexml_load_string(trim($buff));
if ($xml === false)
{
continue;
}
$args = new stdClass;
foreach ($xml->img ? $xml->img->attributes() : $xml->attributes() as $key => $val)
{
$args->{$key} = strval($val);
}
$widget = $args->widget ?? null;
if(!$args || !$widget || empty($args->widget_cache))
{
continue;
@ -341,12 +355,7 @@ class WidgetController extends Widget
$args->widget_sequence = $args->widget_sequence ?? 0;
$args->colorset = $args->colorset ?? null;
foreach($args as $k => $v)
{
$args->{$k} = urldecode($v);
}
foreach($lang_list as $lang_type => $val)
foreach ($lang_list as $lang_type => $val)
{
$this->getCache($widget, $args, $lang_type, true);
}

283
modules/widget/widget.model.php
View file

@ -122,148 +122,38 @@ class WidgetModel extends Widget
*/
function getWidgetInfo($widget)
{
// Get a path of the requested module. Return if not exists.
// Check the widget path.
$widget = preg_replace('/[^a-zA-Z0-9-_]/', '', $widget);
$widget_path = $this->getWidgetPath($widget);
if(!$widget_path) return;
// Read the xml file for module skin information
$xml_file = sprintf("%sconf/info.xml", $widget_path);
if(!file_exists($xml_file)) return;
// If the problem by comparing the cache file and include the return variable $widget_info
$cache_file = sprintf(RX_BASEDIR . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
if (!$widget_path)
{
return;
}
// Check the XML file.
$xml_file = sprintf("%sconf/info.xml", $widget_path);
if (!file_exists($xml_file))
{
return;
}
// Check the cache.
$xml_mtime = filemtime($xml_file);
$cache_key = sprintf('widget_info:%s:%d', $widget, $xml_mtime);
$widget_info = Rhymix\Framework\Cache::get($cache_key);
if ($widget_info)
{
@include($cache_file);
return $widget_info;
}
// If no cache file exists, parse the xml and then return the variable.
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$xml_obj = $tmp_xml_obj->widget;
if(!$xml_obj) return;
$buff = '$widget_info = new stdClass;';
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
// Parse the XML file and store the result in the cache.
$widget_info = Rhymix\Framework\Parsers\WidgetInfoParser::loadXML($xml_file, $widget);
if (!$widget_info)
{
// Title of the widget, version
$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
$buff .= sprintf('$widget_info->path = %s;', var_export($widget_path, true));
$buff .= sprintf('$widget_info->title = %s;', var_export($xml_obj->title->body, true));
$buff .= sprintf('$widget_info->description = %s;', var_export($xml_obj->description->body, true));
$buff .= sprintf('$widget_info->version = %s;', var_export($xml_obj->version->body, true));
if($xml_obj->date->body === 'RX_CORE')
{
$date = '';
}
else
{
$date_obj = new stdClass;
sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
}
$buff .= sprintf('$widget_info->date = %s;', var_export($date, true));
$buff .= sprintf('$widget_info->homepage = %s;', var_export($xml_obj->link->body, true));
$buff .= sprintf('$widget_info->license = %s;', var_export($xml_obj->license->body, true));
$buff .= sprintf('$widget_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
$buff .= sprintf('$widget_info->widget_title = $widget_title;');
// Author information
if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
else $author_list = $xml_obj->author;
for($i=0; $i < count($author_list); $i++)
{
$buff .= '$widget_info->author['.$i.'] = new stdClass;';
$buff .= sprintf('$widget_info->author['.$i.']->name = %s;', var_export($author_list[$i]->name->body, true));
$buff .= sprintf('$widget_info->author['.$i.']->email_address = %s;', var_export($author_list[$i]->attrs->email_address, true));
$buff .= sprintf('$widget_info->author['.$i.']->homepage = %s;', var_export($author_list[$i]->attrs->link, true));
}
}
else
{
// Title of the widget, version
$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
$buff .= sprintf('$widget_info->path = %s;', var_export($widget_path, true));
$buff .= sprintf('$widget_info->title = %s;', var_export($xml_obj->title->body, true));
$buff .= sprintf('$widget_info->description = %s;', var_export($xml_obj->author->description->body, true));
$buff .= sprintf('$widget_info->version = %s;', var_export($xml_obj->attrs->version, true));
$date_obj = new stdClass;
sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
$buff .= sprintf('$widget_info->date = %s;', var_export($date, true));
$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
$buff .= sprintf('$widget_info->widget_title = $widget_title;');
// Author information
$buff .= '$widget_info->author[0] = new stdClass;';
$buff .= sprintf('$widget_info->author[0]->name = %s;', var_export($xml_obj->author->name->body, true));
$buff .= sprintf('$widget_info->author[0]->email_address = %s;', var_export($xml_obj->author->attrs->email_address, true));
$buff .= sprintf('$widget_info->author[0]->homepage = %s;', var_export($xml_obj->author->attrs->link, true));
}
// Extra vars (user defined variables to use in a template)
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
foreach($extra_var_groups as $group)
{
$extra_vars = $group->var;
if(!is_array($group->var)) $extra_vars = array($group->var);
if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
{
$extra_var_count = count($extra_vars);
$buff .= sprintf('$widget_info->extra_var_count = %d;', $extra_var_count);
$buff .= '$widget_info->extra_var = $widget_info->extra_var ?? new stdClass;';
for($i=0;$i<$extra_var_count;$i++)
{
unset($var);
unset($options);
$var = $extra_vars[$i];
$id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
$name = $var->name->body?$var->name->body:$var->title->body;
$type = $var->attrs->type?$var->attrs->type:$var->type->body;
$buff .= sprintf('$widget_info->extra_var->%s = new stdClass;', $id);
if($type =='filebox')
{
$buff .= sprintf('$widget_info->extra_var->%s->filter = %s;', $id, var_export($var->type->attrs->filter, true));
$buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->type->attrs->allow_multiple, true));
}
$buff .= sprintf('$widget_info->extra_var->%s->group = %s;', $id, var_export($group->title->body, true));
$buff .= sprintf('$widget_info->extra_var->%s->name = %s;', $id, var_export($name, true));
$buff .= sprintf('$widget_info->extra_var->%s->type = %s;', $id, var_export($type, true));
$buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
$buff .= sprintf('$widget_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
$options = $var->options;
if(!$options) continue;
if(!is_array($options)) $options = array($options);
$options_count = count($options);
for($j=0;$j<$options_count;$j++)
{
$buff .= sprintf('$widget_info->extra_var->%s->options[%s] = %s;', $id, var_export($options[$j]->value->body, true), var_export($options[$j]->name->body, true));
if($options[$j]->attrs->default && $options[$j]->attrs->default=='true')
{
$buff .= sprintf('$widget_info->extra_var->%s->default_options[%s] = true;', $id, var_export($options[$j]->value->body, true));
}
if($options[$j]->attrs->init && $options[$j]->attrs->init=='true')
{
$buff .= sprintf('$widget_info->extra_var->%s->init_options[%s] = true;', $id, var_export($options[$j]->value->body, true));
}
}
}
}
return;
}
$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
FileHandler::writeFile($cache_file, $buff);
if(file_exists($cache_file)) @include($cache_file);
Rhymix\Framework\Cache::set($cache_key, $widget_info);
return $widget_info;
}
@ -273,117 +163,38 @@ class WidgetModel extends Widget
*/
function getWidgetStyleInfo($widgetStyle)
{
// Check the widget style path.
$widgetStyle = preg_replace('/[^a-zA-Z0-9-_]/', '', $widgetStyle);
$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
if(!$widgetStyle_path) return;
$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
if(!file_exists($xml_file)) return;
// If the problem by comparing the cache file and include the return variable $widgetStyle_info
$cache_file = sprintf(RX_BASEDIR . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
if (!$widgetStyle_path)
{
return;
}
// Check the XML file.
$xml_file = $widgetStyle_path . 'skin.xml';
if (!file_exists($xml_file))
{
return;
}
// Check the cache.
$xml_mtime = filemtime($xml_file);
$cache_key = sprintf('widgetstyle_info:%s:%d', $widgetStyle, $xml_mtime);
$widgetStyle_info = Rhymix\Framework\Cache::get($cache_key);
if ($widgetStyle_info)
{
@include($cache_file);
return $widgetStyle_info;
}
// If no cache file exists, parse the xml and then return the variable.
$oXmlParser = new XeXmlParser();
$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
$xml_obj = $tmp_xml_obj->widgetstyle;
if(!$xml_obj) return;
$buff = array();
$buff[] = '<?php if(!defined("__XE__")) exit();';
$buff[] = '$widgetStyle_info = new stdClass();';
// Title of the widget, version
$buff[] = sprintf('$widgetStyle_info->widgetStyle = %s;', var_export($widgetStyle, true));
$buff[] = sprintf('$widgetStyle_info->path = %s;', var_export($widgetStyle_path, true));
$buff[] = sprintf('$widgetStyle_info->title = %s;', var_export($xml_obj->title->body, true));
$buff[] = sprintf('$widgetStyle_info->description = %s;', var_export($xml_obj->description->body, true));
$buff[] = sprintf('$widgetStyle_info->version = %s;', var_export($xml_obj->version->body, true));
if($xml_obj->date->body === 'RX_CORE')
// Parse the XML file and store the result in the cache.
$widgetStyle_info = Rhymix\Framework\Parsers\WidgetStyleInfoParser::loadXML($xml_file, $widgetStyle);
if (!$widgetStyle_info)
{
$date = '';
}
else
{
$date_obj = new stdClass;
sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
}
$buff[] = sprintf('$widgetStyle_info->date = %s;', var_export($date, true));
$buff[] = sprintf('$widgetStyle_info->homepage = %s;', var_export($xml_obj->link->body, true));
$buff[] = sprintf('$widgetStyle_info->license = %s;', var_export($xml_obj->license->body, true));
$buff[] = sprintf('$widgetStyle_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
// preview
if(!isset($xml_obj->preview)) $xml_obj->preview = new stdClass;
if(!isset($xml_obj->preview->body) || !$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
// Author information
if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
else $author_list = $xml_obj->author;
foreach($author_list as $idx => $author)
{
$buff[] = sprintf('$widgetStyle_info->author[%d] = new stdClass();', $idx);
$buff[] = sprintf('$widgetStyle_info->author[%d]->name = %s;', $idx, var_export($author->name->body, true));
$buff[] = sprintf('$widgetStyle_info->author[%d]->email_address = %s;', $idx, var_export($author->attrs->email_address, true));
$buff[] = sprintf('$widgetStyle_info->author[%d]->homepage = %s;', $idx, var_export($author->attrs->link, true));
return;
}
// Extra vars (user defined variables to use in a template)
$extra_var_groups = $xml_obj->extra_vars->group;
if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
$extra_var_count = 0;
$buff[] = '$widgetStyle_info->extra_var = $widgetStyle_info->extra_var ?? new stdClass();';
foreach($extra_var_groups as $group)
{
$extra_vars = (!is_array($group->var)) ? array($group->var) : $group->var;
if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
{
foreach($extra_vars as $var)
{
$extra_var_count++;
$id = ($var->attrs->id) ? $var->attrs->id : $var->attrs->name;
$name = ($var->name->body) ? $var->name->body : $var->title->body;
$type = ($var->attrs->type) ? $var->attrs->type : $var->type->body;
$buff[] = sprintf('$widgetStyle_info->extra_var->%s = new stdClass();', $id);
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->group = %s;', $id, var_export($group->title->body, true));
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->name = %s;', $id, var_export($name, true));
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->type = %s;', $id, var_export($type, true));
if($type =='filebox')
{
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->filter = %s;', $id, var_export($var->attrs->filter, true));
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->attrs->allow_multiple, true));
}
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
if($var->options)
{
$var_options = (!is_array($var->options)) ? array($var->options) : $var->options;
foreach($var_options as $option_item)
{
$buff[] = sprintf('$widgetStyle_info->extra_var->%s->options[%s] = %s;', $id, var_export($option_item->value->body, true), var_export($option_item->name->body, true));
}
}
}
}
}
$buff[] = sprintf('$widgetStyle_info->extra_var_count = %d;', $extra_var_count);
FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
if(file_exists($cache_file)) @include($cache_file);
Rhymix\Framework\Cache::set($cache_key, $widgetStyle_info);
return $widgetStyle_info;
}
}