diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php
index 94e45644c..f2d23e8d5 100644
--- a/modules/autoinstall/autoinstall.model.php
+++ b/modules/autoinstall/autoinstall.model.php
@@ -397,7 +397,7 @@ class autoinstallModel extends autoinstall
}
$ftp_info = Context::getFTPInfo();
- if(!$ftp_info->ftp_root_path)
+ if(empty($ftp_info->ftp_root_path))
{
return;
}
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 1a7a33fae..c1e916bd1 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -141,7 +141,7 @@ class BoardView extends Board
*/
if(!$this->grant->access || !$this->grant->list)
{
- $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
+ return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
/**
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index d4acad199..1af663786 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -924,28 +924,34 @@ class CommentItem extends BaseObject
$target_src = Context::getRequestUri().$target_src;
}
- $tmp_file = sprintf('./files/cache/tmp/%d', md5(rand(111111, 999999) . $this->comment_srl));
- if(!is_dir('./files/cache/tmp'))
+ $tmp_file = sprintf('./files/cache/tmp/%s', Rhymix\Framework\Security::getRandom(32));
+ if (!Rhymix\Framework\Storage::exists(\RX_BASEDIR . 'files/cache/tmp'))
{
- FileHandler::makeDir('./files/cache/tmp');
+ Rhymix\Framework\Storage::createDirectory(\RX_BASEDIR . 'files/cache/tmp');
+ }
+ if (!Rhymix\Framework\Storage::exists(\RX_BASEDIR . 'files/cache/tmp/.htaccess'))
+ {
+ Rhymix\Framework\Storage::protectDirectory(\RX_BASEDIR . 'files/cache/tmp');
}
FileHandler::getRemoteFile($target_src, $tmp_file);
- if(!file_exists($tmp_file))
+ if (!Rhymix\Framework\Storage::exists($tmp_file))
{
continue;
}
else
{
- if($is_img = @getimagesize($tmp_file))
+ if ($is_img = @getimagesize($tmp_file))
{
list($_w, $_h, $_t, $_a) = $is_img;
if($_w < ($external_image_min_width) && ($height === 'auto' || $_h < ($external_image_min_height)))
{
+ Rhymix\Framework\Storage::delete($tmp_file);
continue;
}
}
else
{
+ Rhymix\Framework\Storage::delete($tmp_file);
continue;
}
$source_file = $tmp_file;
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 72ff49fa9..aaefcf201 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -27,6 +27,7 @@ class CommunicationController extends communication
}
$args = new stdClass();
+ $args->member_srl = $this->user->member_srl;
$args->allow_message = Context::get('allow_message');
if(!in_array($args->allow_message, array('Y', 'N', 'F')))
@@ -34,7 +35,11 @@ class CommunicationController extends communication
$args->allow_message = 'Y';
}
- $args->member_srl = $this->user->member_srl;
+ $config = CommunicationModel::getConfig();
+ if ($config->enable_friend !== 'Y' && $args->allow_message === 'F')
+ {
+ $args->allow_message = 'Y';
+ }
$output = executeQuery('communication.updateAllowMessage', $args);
if(!$output->toBool())
@@ -117,7 +122,14 @@ class CommunicationController extends communication
{
if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl))
{
- throw new Rhymix\Framework\Exception('msg_allow_message_to_friend');
+ if ($config->enable_friend === 'Y')
+ {
+ throw new Rhymix\Framework\Exception('msg_allow_message_to_friend');
+ }
+ else
+ {
+ throw new Rhymix\Framework\Exception('msg_disallow_message');
+ }
}
}
else if($receiver_member_info->allow_message == 'N')
diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php
index 22b90a54c..11bbca94b 100644
--- a/modules/communication/communication.view.php
+++ b/modules/communication/communication.view.php
@@ -127,6 +127,13 @@ class CommunicationView extends communication
$page = max(1, intval(Context::get('page')));
$output = $oCommunicationModel->getMessages($message_type, $columnList, $search_target, $search_keyword, $page);
+ $allow_message_type = lang('allow_message_type')->getArrayCopy();
+ if ($this->config->allow_friend === 'N')
+ {
+ unset($allow_message_type['F']);
+ }
+ Context::set('allow_message_type', $allow_message_type);
+
// set a template file
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index b7ab60b33..149d783b9 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -15,7 +15,7 @@
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 6f839b726..1622cc944 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -2557,12 +2557,24 @@ class DocumentController extends Document
$obj->list_order = $obj->category_srl = getNextSequence();
}
+ $output = ModuleHandler::triggerCall('document.insertCategory', 'before', $obj);
+ if (!$output->toBool())
+ {
+ return $output;
+ }
+
$output = executeQuery('document.insertCategory', $obj);
- if($output->toBool())
+ if ($output->toBool())
{
$output->add('category_srl', $obj->category_srl);
$this->makeCategoryFile($obj->module_srl);
}
+ else
+ {
+ return $output;
+ }
+
+ ModuleHandler::triggerCall('document.insertCategory', 'after', $obj);
return $output;
}
@@ -2606,7 +2618,10 @@ class DocumentController extends Document
$args->category_srl = $category_srl;
$args->{$mode} = $document_count;
$output = executeQuery('document.updateCategoryCount', $args);
- if($output->toBool()) $this->makeCategoryFile($module_srl);
+ if ($output->toBool())
+ {
+ $this->makeCategoryFile($module_srl);
+ }
return $output;
}
@@ -2618,8 +2633,23 @@ class DocumentController extends Document
*/
function updateCategory($obj)
{
+ $output = ModuleHandler::triggerCall('document.updateCategory', 'before', $obj);
+ if (!$output->toBool())
+ {
+ return $output;
+ }
+
$output = executeQuery('document.updateCategory', $obj);
- if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+ if ($output->toBool())
+ {
+ $this->makeCategoryFile($obj->module_srl);
+ }
+ else
+ {
+ return $output;
+ }
+
+ ModuleHandler::triggerCall('document.updateCategory', 'after', $obj);
return $output;
}
@@ -2633,43 +2663,53 @@ class DocumentController extends Document
$args = new stdClass();
$args->category_srl = $category_srl;
$category_info = DocumentModel::getCategory($category_srl);
- // Display an error that the category cannot be deleted if it has a child
+
+ // Check if the category has any children.
$output = executeQuery('document.getChildCategoryCount', $args);
- if(!$output->toBool()) return $output;
- if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
- // Delete a category information
- $output = executeQuery('document.deleteCategory', $args);
- if(!$output->toBool()) return $output;
-
- $this->makeCategoryFile($category_info->module_srl);
-
- // remove cache
- $page = 0;
- while(true)
+ if (!$output->toBool())
{
- $args = new stdClass();
- $args->category_srl = $category_srl;
- $args->list_count = 100;
- $args->page = ++$page;
- $output = executeQuery('document.getDocumentList', $args, array('document_srl'));
-
- if($output->data == array())
- {
- break;
- }
-
- foreach($output->data as $val)
- {
- self::clearDocumentCache($val->document_srl);
- }
+ return $output;
+ }
+ if ($output->data->count > 0)
+ {
+ return new BaseObject(-1, 'msg_cannot_delete_for_child');
}
- // Update category_srl of the documents in the same category to 0
+ // Call trigger (before)
+ $output = ModuleHandler::triggerCall('document.deleteCategory', 'before', $args);
+ if (!$output->toBool())
+ {
+ return $output;
+ }
+
+ // Delete the category.
+ $output = executeQuery('document.deleteCategory', $args);
+ if ($output->toBool())
+ {
+ $this->makeCategoryFile($category_info->module_srl);
+ }
+ else
+ {
+ return $output;
+ }
+
+ // Documents in the deleted category will be moved to category 0.
$args = new stdClass();
$args->target_category_srl = 0;
$args->source_category_srl = $category_srl;
$output = executeQuery('document.updateDocumentCategory', $args);
+ if ($output->toBool())
+ {
+ Rhymix\Framework\Cache::clearGroup('document_item');
+ $GLOBALS['XE_DOCUMENT_LIST'] = [];
+ }
+ else
+ {
+ return $output;
+ }
+ // Call trigger (after)
+ ModuleHandler::triggerCall('document.deleteCategory', 'after', $args);
return $output;
}
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 7daa75828..38718714d 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -1257,28 +1257,34 @@ class DocumentItem extends BaseObject
$target_src = Context::getRequestUri().$target_src;
}
- $tmp_file = sprintf('./files/cache/tmp/%d', md5(rand(111111,999999).$this->document_srl));
- if(!is_dir('./files/cache/tmp'))
+ $tmp_file = sprintf('./files/cache/tmp/%s', Rhymix\Framework\Security::getRandom(32));
+ if (!Rhymix\Framework\Storage::exists(\RX_BASEDIR . 'files/cache/tmp'))
{
- FileHandler::makeDir('./files/cache/tmp');
+ Rhymix\Framework\Storage::createDirectory(\RX_BASEDIR . 'files/cache/tmp');
+ }
+ if (!Rhymix\Framework\Storage::exists(\RX_BASEDIR . 'files/cache/tmp/.htaccess'))
+ {
+ Rhymix\Framework\Storage::protectDirectory(\RX_BASEDIR . 'files/cache/tmp');
}
FileHandler::getRemoteFile($target_src, $tmp_file);
- if(!file_exists($tmp_file))
+ if (!Rhymix\Framework\Storage::exists($tmp_file))
{
continue;
}
else
{
- if($is_img = @getimagesize($tmp_file))
+ if ($is_img = @getimagesize($tmp_file))
{
list($_w, $_h, $_t, $_a) = $is_img;
if($_w < ($external_image_min_width) && ($height === 'auto' || $_h < ($external_image_min_height)))
{
+ Rhymix\Framework\Storage::delete($tmp_file);
continue;
}
}
else
{
+ Rhymix\Framework\Storage::delete($tmp_file);
continue;
}
$source_file = $tmp_file;
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 97e89ceaa..442606bc1 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -147,7 +147,7 @@ class DocumentModel extends Document
/**
* Get a document.
- *
+ *
* @param int $document_srl
* @param bool $is_admin
* @param bool $load_extra_vars
@@ -179,7 +179,7 @@ class DocumentModel extends Document
/**
* Create a blank document.
- *
+ *
* @param int $module_srl
* @return DocumentItem
*/
@@ -690,37 +690,37 @@ class DocumentModel extends Document
$opt->isExtraVars = $sort_check->isExtraVars;
$opt->isExtraVarsSortAsNumber = $sort_check->isExtraVarsSortAsNumber;
+ $args = new stdClass();
self::_setSearchOption($opt, $args, $query_id, $use_division);
- if($sort_check->isExtraVars || !$opt->list_count)
+ if ($sort_check->isExtraVars || !$opt->list_count)
{
return 1;
}
else
{
- if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
+ $args->sort_index = preg_replace('/^documents\./', '', $args->sort_index ?? 'list_order');
+ if ($args->sort_index === 'list_order' || $args->sort_index === 'update_order')
{
- if($args->order_type === 'desc')
+ if ($args->order_type === 'desc')
{
- $args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+ $args->{'rev_' . $args->sort_index} = $oDocument->get($args->sort_index);
}
else
{
- $args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+ $args->{$args->sort_index} = $oDocument->get($args->sort_index);
}
}
- elseif($sort_check->sort_index === 'regdate')
+ elseif ($args->sort_index === 'regdate')
{
-
- if($args->order_type === 'asc')
+ if ($args->order_type === 'asc')
{
- $args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+ $args->{'rev_' . $args->sort_index} = $oDocument->get($args->sort_index);
}
else
{
- $args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+ $args->{$args->sort_index} = $oDocument->get($args->sort_index);
}
-
}
else
{
@@ -728,7 +728,6 @@ class DocumentModel extends Document
}
}
- // Guhanhu total number of the article search page
$output = executeQuery($query_id . 'Page', $args);
$count = $output->data->count;
$page = (int)(($count-1)/$opt->list_count)+1;
@@ -1037,9 +1036,9 @@ class DocumentModel extends Document
{
self::$_config = ModuleModel::getModuleConfig('document') ?: new stdClass;
}
- if (!isset(self::$_config->thumbnail_target))
+ if (!isset(self::$_config->thumbnail_target) || self::$_config->thumbnail_target === 'all')
{
- self::$_config->thumbnail_target = 'all';
+ self::$_config->thumbnail_target = 'attachment';
}
if (!isset(self::$_config->thumbnail_type))
{
diff --git a/modules/document/queries/getDocumentListWithExtraVarsPage.xml b/modules/document/queries/getDocumentListWithExtraVarsPage.xml
index 7a6d6a31f..2216cb5ef 100644
--- a/modules/document/queries/getDocumentListWithExtraVarsPage.xml
+++ b/modules/document/queries/getDocumentListWithExtraVarsPage.xml
@@ -21,6 +21,8 @@
+
+
diff --git a/modules/document/queries/getDocumentListWithinCommentPage.xml b/modules/document/queries/getDocumentListWithinCommentPage.xml
index 070b9d276..b5d76a258 100644
--- a/modules/document/queries/getDocumentListWithinCommentPage.xml
+++ b/modules/document/queries/getDocumentListWithinCommentPage.xml
@@ -25,6 +25,8 @@
+
+
diff --git a/modules/document/queries/getDocumentListWithinTagPage.xml b/modules/document/queries/getDocumentListWithinTagPage.xml
index 2c96808fa..0b2dac7e6 100644
--- a/modules/document/queries/getDocumentListWithinTagPage.xml
+++ b/modules/document/queries/getDocumentListWithinTagPage.xml
@@ -19,6 +19,8 @@
+
+
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index 9cfd75554..020549b4b 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -28,7 +28,7 @@
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 4e73b31ba..68f598071 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -54,15 +54,36 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
- {escape($oDocument->getTitleText(), false)}{$lang->no_title_document}
- - {$module_list[$oDocument->get('module_srl')]->browser_title}
+ {@ $document_link = $oDocument->getPermanentUrl()}
+ {@ $module_link = getUrl('', 'mid', $module_list[$oDocument->get('module_srl')]->mid)}
- {escape($oDocument->getTitleText(), false)}{$lang->no_title_document}
- - {$module_list[$oDocument->get('module_srl')]->browser_title}
+ {@ $document_link = ModuleModel::getDomainByModuleSrl($oDocument->get('module_srl')) . getUrl('', 'mid', $module_list[$oDocument->get('module_srl')]->mid, 'document_srl', $oDocument->document_srl)}
+ {@ $module_link = ModuleModel::getDomainByModuleSrl($oDocument->get('module_srl')) . getUrl('', 'mid', $module_list[$oDocument->get('module_srl')]->mid)}
- {escape($oDocument->getTitleText(), false)}{$lang->no_title_document}
+ {@ $document_link = $oDocument->getPermanentUrl()}
+ {@ $module_link = null}
+
+
+
+ {escape($oDocument->getTitleText(), false)}
+
+ {$lang->no_title_document}
+
+
+
+
+
+ {escape($oDocument->getTitleText(), false)}
+
+ {$lang->no_title_document}
+
+
+
+
+ - {$module_list[$oDocument->get('module_srl')]->browser_title}
+
|
{$oDocument->getNickName()}
diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index 52ccb1611..46d1b0cee 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -302,19 +302,8 @@ class FileAdminController extends File
$download_grant = Context::get('download_grant');
$config->download_grant = is_array($download_grant) ? array_values($download_grant) : array($download_grant);
- // Create pre-conversion whitelist
- $config->pre_conversion_types = [];
- foreach ($config->image_autoconv ?? [] as $source_type => $target_type)
- {
- if ($target_type && $target_type !== true)
- {
- $config->pre_conversion_types[] = $source_type;
- if ($source_type === 'jpg')
- {
- $config->pre_conversion_types[] = 'jpeg';
- }
- }
- }
+ // Unset pre-conversion type setting #2707
+ unset($config->pre_conversion_types);
// Update
$oModuleController = getController('module');
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 292e56709..e33dc9642 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -607,9 +607,7 @@ class FileController extends File
{
// Basic variable setting(upload_target_srl and module_srl set)
$editor_sequence = Context::get('editor_sequence');
- $file_srl = Context::get('file_srl');
- $file_srls = Context::get('file_srls');
- if($file_srls) $file_srl = $file_srls;
+ $file_srls = explode(',', Context::get('file_srls') ?: Context::get('file_srl'));
// Exit a session if there is neither upload permission nor information
if (!$_SESSION['upload_info'][$editor_sequence]->enabled)
@@ -623,26 +621,43 @@ class FileController extends File
}
$module_srl = $_SESSION['upload_info'][$editor_sequence]->module_srl ?? 0;
- $srls = explode(',',$file_srl);
- if(!count($srls)) return;
-
- for($i=0;$ifile_srl = $srl;
+ $args->file_srl = $file_srl;
$output = executeQuery('file.getFile', $args);
- if(!$output->toBool()) continue;
-
+ if (!$output->toBool())
+ {
+ continue;
+ }
$file_info = $output->data;
- if(!$file_info || $file_info->upload_target_srl != $upload_target_srl) continue;
+ if (!$file_info || $file_info->upload_target_srl != $upload_target_srl)
+ {
+ continue;
+ }
//if($module_srl && $file_info->module_srl != $module_srl) continue;
- if(!FileModel::isDeletable($file_info)) continue;
- $output = $this->deleteFile($file_srl);
+ if (!FileModel::isDeletable($file_info))
+ {
+ continue;
+ }
+
+ $valid_file_srls[] = $file_srl;
}
+ if (!count($valid_file_srls))
+ {
+ return;
+ }
+
+ $output = $this->deleteFile($valid_file_srls);
+
// Add upload status (getFileList)
try
{
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index ba69f6c6e..5edd954b7 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -360,7 +360,10 @@ class FileModel extends File
$module_config = ModuleModel::getModulePartConfig('file', $module_srl);
foreach((array)$module_config as $key => $value)
{
- $config->$key = $value;
+ if ($value !== null)
+ {
+ $config->$key = $value;
+ }
}
}
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index b5278c856..a01b9eb0f 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -2,7 +2,6 @@
-
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 3551d828c..dd2ff191e 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -83,7 +83,7 @@ class LayoutAdminView extends Layout
$layout_list = array();
foreach($_layout_list as $item)
{
- if(!$layout_list[$item->layout])
+ if(empty($layout_list[$item->layout]))
{
$layout_list[$item->layout] = array();
$layout_info = LayoutModel::getLayoutInfo($item->layout, null, $type);
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index b161ff6f8..416ea27b5 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -161,6 +161,7 @@ class LayoutModel extends Layout
}
}
+ $isCreateInstance = false;
if($layout)
{
if(count($instanceList) < 1 && isset($downloadedList[$layout]))
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index b83713a16..c68cf527c 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -301,6 +301,9 @@ class LayoutView extends Layout
Context::set('skin_type', null);
Context::set('skin_vars', null);
+ // Set dummy variable
+ Context::set('layout_info', Context::get('layout_info') ?: new stdClass());
+
// Proc module
$oModule = $oModuleHandler->procModule();
if(!$oModule->toBool())
@@ -314,76 +317,6 @@ class LayoutView extends Layout
return $handler->toDoc($oModule);
}
- /**
- * Preview a layout
- * @return void|Object (void : success, Object : fail)
- */
- function dispLayoutPreview()
- {
- if(!Rhymix\Framework\Security::checkCSRF())
- {
- throw new Rhymix\Framework\Exceptions\InvalidRequest;
- }
-
- // admin check
- // this act is admin view but in normal view because do not load admin css/js files
- $logged_info = Context::get('logged_info');
- if($logged_info->is_admin != 'Y') throw new Rhymix\Framework\Exceptions\InvalidRequest;
-
- $layout_srl = Context::get('layout_srl');
- $code = Context::get('code');
-
- $code_css = Context::get('code_css');
- if(!$layout_srl || !$code) throw new Rhymix\Framework\Exceptions\InvalidRequest;
- // Get the layout information
- $oLayoutModel = getModel('layout');
- $layout_info = $oLayoutModel->getLayout($layout_srl);
- if(!$layout_info) throw new Rhymix\Framework\Exceptions\InvalidRequest;
- // Separately handle the layout if its type is faceoff
- if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
- // Apply CSS directly
- Context::addHtmlHeader("");
- // Set names and values of extra_vars to $layout_info
- if($layout_info->extra_var_count)
- {
- foreach($layout_info->extra_var as $var_id => $val)
- {
- $layout_info->{$var_id} = $val->value;
- }
- }
- // menu in layout information becomes an argument for Context:: set
- if($layout_info->menu_count)
- {
- foreach($layout_info->menu as $menu_id => $menu)
- {
- $menu->php_file = FileHandler::getRealPath($menu->php_file);
- if(FileHandler::exists($menu->php_file)) include($menu->php_file);
-
- Context::set($menu_id, $menu);
- }
- }
-
- Context::set('layout_info', $layout_info);
- Context::set('content', lang('layout_preview_content'));
- // Temporary save the codes
- $edited_layout_file = RX_BASEDIR . 'files/cache/layout/tmp.tpl';
- FileHandler::writeFile($edited_layout_file, $code);
-
- // Compile
- $oTemplate = TemplateHandler::getInstance();
-
- $layout_path = $layout_info->path;
- $layout_file = 'layout';
-
- $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
- Context::set('layout','none');
- // Convert widgets and others
- Context::set('layout_tpl', $layout_tpl);
- // Delete Temporary Files
- FileHandler::removeFile($edited_layout_file);
- $this->setTemplateFile('layout_preview');
- }
-
private function getRealLayoutFile($layoutSrl)
{
$oLayoutModel = getModel('layout');
diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html
index d77d05472..19f324bb9 100644
--- a/modules/layout/tpl/header.html
+++ b/modules/layout/tpl/header.html
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/modules/layout/tpl/installed_layout_list.html b/modules/layout/tpl/installed_layout_list.html
index 693b556d9..bc93152b0 100644
--- a/modules/layout/tpl/installed_layout_list.html
+++ b/modules/layout/tpl/installed_layout_list.html
@@ -21,9 +21,9 @@
|
- {$layout->title}
+ {$layout->title}
{$layout->description}
-
+
{$lang->msg_avail_easy_update} {$lang->msg_do_you_like_update}
|
diff --git a/modules/layout/tpl/js/adminEdit.js b/modules/layout/tpl/js/adminEdit.js
index b8defafb7..bcb1971e1 100644
--- a/modules/layout/tpl/js/adminEdit.js
+++ b/modules/layout/tpl/js/adminEdit.js
@@ -1,16 +1,3 @@
-function doPreviewLayoutCode()
-{
- var $form = jQuery('#fo_layout'), $act = $form.find('input[name=act]');
- var og_act = $act.val();
-
- $form.attr('target', '_LayoutPreview');
- $act.val('dispLayoutPreview');
- $form.submit();
-
- $form.removeAttr('target');
- $act.val(og_act);
-}
-
$(function() {
$('.reset_layout').on('click', function(e) {
var msg = $(this).data('confirmationMsg');
diff --git a/modules/layout/tpl/js/layout_admin.js b/modules/layout/tpl/js/layout_admin.js
index f2e4c7cf8..7a2099b54 100644
--- a/modules/layout/tpl/js/layout_admin.js
+++ b/modules/layout/tpl/js/layout_admin.js
@@ -70,16 +70,6 @@ function addLayoutCopyInputbox()
(function($){
-/* preview layout */
-function doPreviewLayoutCode(layout_srl) {
- var fo = $('#fo_layout');
- var act = fo.find('input[name=act]:first').val();
- fo.attr('target', '_LayoutPreview').find('input[name=act]').val('dispLayoutAdminPreview');
- fo.submit();
- //.removeAttr('target').find('input[name=act]').val(act);
-}
-window.doPreviewLayoutCode = doPreviewLayoutCode;
-
/* restore layout code */
function doResetLayoutCode(layout_srl) {
procFilter($('#fo_layout')[0], reset_layout_code);
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index 15a51f97a..5b70bc930 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -102,7 +102,6 @@
-
diff --git a/modules/layout/tpl/sub_tab.html b/modules/layout/tpl/sub_tab.html
index 7247e2778..d3d20a449 100644
--- a/modules/layout/tpl/sub_tab.html
+++ b/modules/layout/tpl/sub_tab.html
@@ -1,6 +1,6 @@
{$lang->instance_layout} |
diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php
index 71dd2ac37..74fc4aa8e 100644
--- a/modules/member/lang/en.php
+++ b/modules/member/lang/en.php
@@ -316,6 +316,7 @@ $lang->change_password_date = 'Password renewal cycle';
$lang->about_change_password_date = 'If you set a value to this, you will be notified to change your password periodically. (If set to 0, disabled)';
$lang->msg_change_password_date = 'You have not changed the password during %s days. For personal information protection, you need to change the password.';
$lang->about_login_trial_limit = 'Limit the number of login attempts in a short time from the same IP address.';
+$lang->about_login_failure_except_ip = 'You can specify IP addresses or ranges that are exempt from the login attempt limit. Enter one IP address or range per line.';
$lang->msg_kr_address = 'Search for the name of eup, myeon or dong of your address.';
$lang->msg_kr_address_etc = 'Enter the rest of your address.';
$lang->cmd_search_again = 'Search again';
@@ -381,6 +382,7 @@ $lang->group = 'Group';
$lang->retrieve_password = 'Retrieve password';
$lang->excess_ip_access_count = 'There were too much login attempts from your device in a short time. You can not log in for %s.';
$lang->enable_login_fail_report = 'Login failure';
+$lang->login_failure_except_ip = 'Login failure except IP';
$lang->login_fail_report = 'Login failure report.';
$lang->login_fail_report_contents = ' There is recorded login failures.%1$s
* This notification is shown once.
* This message contains login failure records, before a ID login success.
Sending: %2$s ';
$lang->all_group = 'Entire Group';
diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php
index c3f776d8d..850f2b85f 100644
--- a/modules/member/lang/ko.php
+++ b/modules/member/lang/ko.php
@@ -319,7 +319,8 @@ $lang->msg_invalid_symbol_in_nickname = '닉네임에 사용할 수 없는 특
$lang->change_password_date = '비밀번호 갱신주기';
$lang->about_change_password_date = '일정 기간이 지나면 비밀번호를 변경하도록 유도하는 기능입니다. 사용하지 않으려면 0을 입력하십시오.';
$lang->msg_change_password_date = '%s일 동안 비밀번호를 변경하지 않았습니다. 개인정보 보호를 위하여 비밀번호를 변경해야 합니다.';
-$lang->about_login_trial_limit = '짧은 시간 동안 하나의 아이피(IP)에서 시도할 수 있는 로그인 횟수에 제한을 둡니다.';
+$lang->about_login_trial_limit = '짧은 시간 동안 하나의 IP에서 시도할 수 있는 로그인 횟수에 제한을 둡니다.';
+$lang->about_login_failure_except_ip = '로그인 횟수 제한에서 예외로 할 IP 주소 또는 대역을 지정할 수 있습니다. IP 주소 또는 대역을 한 줄에 하나씩 입력하세요.';
$lang->msg_kr_address = '읍, 면, 동 이름으로 검색하세요.';
$lang->msg_kr_address_etc = '나머지 주소(번지)를 입력하세요.';
$lang->cmd_search_again = '다시 검색';
@@ -384,7 +385,8 @@ $lang->msg_success_modify_email_address = '이메일 주소가 정상적으로
$lang->group = '그룹';
$lang->retrieve_password = '비밀번호 찾기';
$lang->excess_ip_access_count = '로그인 가능 횟수를 초과했습니다. %s 간 로그인할 수 없습니다.';
-$lang->enable_login_fail_report = '계정 무한 대입 방지 사용';
+$lang->enable_login_fail_report = '계정 무한 대입 방지';
+$lang->login_failure_except_ip = '로그인 횟수 예외 IP';
$lang->login_fail_report = '로그인 실패 기록 보고 입니다.';
$lang->login_fail_report_contents = ' 로그인 실패 기록을 알려드립니다.%1$s
* 비밀번호를 틀리는 등의 일이 없었는데 이 메시지를 보신다면, 계정 관리에 유의 바랍니다.
* 이 메시지는 로그인이 성공한 순간 누적 로그인 실패 기록이 많을 경우, 로그인 성공 이전 실패 기록을 모아서 발송합니다.
발송 시각: %2$s ';
$lang->all_group = '그룹전체';
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index defa86db9..157b54169 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -596,6 +596,7 @@ class MemberAdminController extends Member
'enable_login_fail_report',
'max_error_count',
'max_error_count_time',
+ 'login_failure_except_ip',
'login_invalidate_other_sessions',
'after_login_url',
'after_logout_url'
@@ -640,6 +641,14 @@ class MemberAdminController extends Member
$args->change_password_date = 0;
}
+ if($args->login_failure_except_ip)
+ {
+ $args->login_failure_except_ip = array_map('trim', explode("\n", $args->login_failure_except_ip));
+ $args->login_failure_except_ip = array_filter($args->login_failure_except_ip, function($val) {
+ return $val !== '';
+ });
+ }
+
if(!trim(strip_tags($args->after_login_url)))
{
$args->after_login_url = NULL;
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c7efe52f9..7619a93c1 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -2638,20 +2638,21 @@ class MemberController extends Member
$args = new stdClass;
$args->ipaddress = \RX_CLIENT_IP;
$output = executeQuery('member.getLoginCountByIp', $args);
- $errorCount = $output->data->count;
- if($errorCount >= $config->max_error_count)
+ if ($output->data->count >= $config->max_error_count)
{
- $last_update = strtotime($output->data->last_update);
- $term = intval($_SERVER['REQUEST_TIME']-$last_update);
- if($term < $config->max_error_count_time)
+ $last_update = ztime($output->data->last_update);
+ $term = intval(\RX_TIME - $last_update);
+ if ($term < $config->max_error_count_time)
{
- $term = $config->max_error_count_time - $term;
- if($term < 60) $term = intval($term).lang('unit_sec');
- elseif(60 <= $term && $term < 3600) $term = intval($term/60).lang('unit_min');
- elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).lang('unit_hour');
- else $term = intval($term/86400).lang('unit_day');
-
- return new BaseObject(-1, sprintf(lang('excess_ip_access_count'), $term));
+ if (!$config->login_failure_except_ip || !Rhymix\Framework\Filters\IpFilter::inRanges(\RX_CLIENT_IP, $config->login_failure_except_ip))
+ {
+ $term = $config->max_error_count_time - $term;
+ if($term < 60) $term = intval($term).lang('unit_sec');
+ elseif(60 <= $term && $term < 3600) $term = intval($term/60).lang('unit_min');
+ elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).lang('unit_hour');
+ else $term = intval($term/86400).lang('unit_day');
+ return new BaseObject(-1, sprintf(lang('excess_ip_access_count'), $term));
+ }
}
else
{
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 2cdda377e..0a51d18ab 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -121,6 +121,7 @@ class MemberModel extends Member
$config->enable_login_fail_report = $config->enable_login_fail_report ?? 'Y';
$config->max_error_count = $config->max_error_count ?? 10;
$config->max_error_count_time = $config->max_error_count_time ?? 300;
+ $config->login_failure_except_ip = $config->login_failure_except_ip ?? [];
$config->login_invalidate_other_sessions = $config->login_invalidate_other_sessions ?? 'N';
$config->after_login_url = $config->after_login_url ?? null;
$config->after_logout_url = $config->after_logout_url ?? null;
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 5534ea0b3..431581983 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -394,6 +394,15 @@ class MemberView extends Member
// Set a copy of the agreement for compatibility with old skins
$member_config->agreement = $member_config->agreements[1]->content ?? '';
+ // Check whether friends are enabled in the communication module.
+ $comm_config = CommunicationModel::getConfig();
+ if ($comm_config->enable_friend !== 'Y')
+ {
+ $allow_message_type = lang('member.allow_message_type');
+ unset($allow_message_type['F']);
+ $GLOBALS['lang']->set('member.allow_message_type', $allow_message_type);
+ }
+
// Set a template file
self::setMemberPageBrowserTitle(lang('cmd_signup'));
$this->setTemplateFile('signup_form');
@@ -517,6 +526,15 @@ class MemberView extends Member
$this->addExtraFormValidatorMessage();
+ // Check whether friends are enabled in the communication module.
+ $comm_config = CommunicationModel::getConfig();
+ if ($comm_config->enable_friend !== 'Y')
+ {
+ $allow_message_type = lang('member.allow_message_type');
+ unset($allow_message_type['F']);
+ $GLOBALS['lang']->set('member.allow_message_type', $allow_message_type);
+ }
+
// Set a template file
self::setMemberPageBrowserTitle(lang('cmd_modify_member_info'));
$this->setTemplateFile('modify_info');
diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html
index 0155e3140..f7db367ac 100644
--- a/modules/member/tpl/default_config.html
+++ b/modules/member/tpl/default_config.html
@@ -86,7 +86,7 @@
-
+
{$lang->cmd_allow_duplicate_nickname}
+
+
+
+
+ {$lang->about_login_failure_except_ip}
+
+
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index 7cc50fa0e..a4f7d7876 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -44,7 +44,7 @@ class ModuleAdminView extends Module
// get easyinstall need update
$packageSrl = $oAutoinstallModel->getPackageSrlByPath($val->path);
$package = $oAutoinstallModel->getInstalledPackages($packageSrl);
- $module_list[$key]->need_autoinstall_update = $package[$packageSrl]->need_update;
+ $module_list[$key]->need_autoinstall_update = $package[$packageSrl]->need_update ?? null;
// get easyinstall update url
if($module_list[$key]->need_autoinstall_update == 'Y')
diff --git a/modules/module/module.view.php b/modules/module/module.view.php
index b93143cc2..08d1151fc 100644
--- a/modules/module/module.view.php
+++ b/modules/module/module.view.php
@@ -64,10 +64,10 @@ class ModuleView extends Module
$obj = new stdClass;
$obj->module_srl = $val->module_srl;
- $obj->browser_title = $val->browser_title;
+ $obj->browser_title = Context::replaceUserLang($val->browser_title);
$mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj;
- $mid_list[$val->module]->title = ModuleModel::getModuleInfoXml($val->module)->title;
+ $mid_list[$val->module]->title = Context::replaceUserLang(ModuleModel::getModuleInfoXml($val->module)->title);
}
Context::set('mid_list', $mid_list);
diff --git a/modules/module/tpl/adminFileBox.html b/modules/module/tpl/adminFileBox.html
index 12cc5b351..234e7b13c 100644
--- a/modules/module/tpl/adminFileBox.html
+++ b/modules/module/tpl/adminFileBox.html
@@ -68,7 +68,7 @@
-
+
{htmlspecialchars($name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}: {$value}
|
@@ -78,7 +78,7 @@
| 
- {$widget->version}
+ {$widget->version}