diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 7892e5502..b6de9c378 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -209,7 +209,7 @@ {$lang->cmd_search} -
  • +
  • {$lang->cmd_management}
    • diff --git a/modules/board/board.view.php b/modules/board/board.view.php index b6fe13427..8fd071460 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -920,7 +920,7 @@ class BoardView extends Board $point_config = ModuleModel::getModulePartConfig('point',$this->module_srl); if ($point_config) { - $pointForInsert = intval(is_object($point_config) ? $point_config->insert_document : $point_config["insert_document"]); + $pointForInsert = intval(is_object($point_config) ? ($point_config->insert_document ?? 0) : ($point_config["insert_document"] ?? 0)); } else { diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 30508fc69..fd519466b 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -112,15 +112,15 @@ class CommentItem extends BaseObject } $logged_info = Context::get('logged_info'); - if (!$logged_info->member_srl) + if (!$logged_info || !$logged_info->member_srl) { return $this->grant_cache = false; } - if ($logged_info->is_admin == 'Y') + if ($logged_info && $logged_info->is_admin == 'Y') { return $this->grant_cache = true; } - if ($this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl) + if ($logged_info && $this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl) { return $this->grant_cache = true; } @@ -292,7 +292,7 @@ class CommentItem extends BaseObject // return if the currently logged-in user is an author of the comment. $logged_info = Context::get('logged_info'); - if($logged_info->member_srl == $this->get('member_srl')) + if($logged_info && $logged_info->member_srl && $logged_info->member_srl == abs($this->get('member_srl'))) { return; } @@ -306,7 +306,7 @@ class CommentItem extends BaseObject $title .= cut_str(strip_tags($content), 30, '...'); $content = sprintf('%s

    from : %s', $content, getFullUrl('', 'document_srl', $this->get('document_srl')), $this->get('comment_srl'), getFullUrl('', 'document_srl', $this->get('document_srl'))); $receiver_srl = $this->get('member_srl'); - $sender_member_srl = $logged_info->member_srl; + $sender_member_srl = ($logged_info && $logged_info->member_srl) ? $logged_info->member_srl : $this->get('member_srl'); // send a message $oCommunicationController = getController('communication'); @@ -376,17 +376,24 @@ class CommentItem extends BaseObject function getMyVote() { - if(!$this->comment_srl) return false; - if(isset($_SESSION['voted_comment'][$this->comment_srl])) + if (!$this->comment_srl) + { + return false; + } + + if (isset($_SESSION['voted_comment'][$this->comment_srl])) { return $_SESSION['voted_comment'][$this->comment_srl]; } $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) return false; + if (!$logged_info || !$logged_info->member_srl) + { + return false; + } $args = new stdClass(); - if($logged_info->member_srl) + if ($logged_info && $logged_info->member_srl) { $args->member_srl = $logged_info->member_srl; } @@ -413,7 +420,7 @@ class CommentItem extends BaseObject } $logged_info = Context::get('logged_info'); - if (!$logged_info->member_srl) + if (!$logged_info || !$logged_info->member_srl) { return false; } @@ -424,7 +431,7 @@ class CommentItem extends BaseObject } $args = new stdClass(); - if ($logged_info->member_srl) + if ($logged_info && $logged_info->member_srl) { $args->member_srl = $logged_info->member_srl; } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 4d60f1795..d883363aa 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -201,11 +201,11 @@ class DocumentItem extends BaseObject { return $this->grant_cache = false; } - if ($logged_info->is_admin == 'Y') + if ($logged_info && $logged_info->is_admin == 'Y') { return $this->grant_cache = true; } - if ($this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl) + if ($logged_info && $this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl) { return $this->grant_cache = true; } @@ -411,7 +411,7 @@ class DocumentItem extends BaseObject // Return if the currently logged-in user is an author $logged_info = Context::get('logged_info'); - if($logged_info->member_srl == $this->get('member_srl')) + if($logged_info && $logged_info->member_srl && $logged_info->member_srl == abs($this->get('member_srl'))) { return; } @@ -421,7 +421,7 @@ class DocumentItem extends BaseObject $content = sprintf('%s

    from : %s',$content, getFullUrl('', 'document_srl', $this->document_srl), getFullUrl('', 'document_srl', $this->document_srl)); // Send a message - $sender_member_srl = $logged_info->member_srl ?: $this->get('member_srl'); + $sender_member_srl = ($logged_info && $logged_info->member_srl) ? $logged_info->member_srl : $this->get('member_srl'); getController('communication')->sendMessage($sender_member_srl, $this->get('member_srl'), $title, $content, false, null, false); } @@ -514,17 +514,17 @@ class DocumentItem extends BaseObject } $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) + if (!$logged_info || !$logged_info->member_srl) { $module_info = ModuleModel::getModuleInfoByModuleSrl($this->get('module_srl')); - if($module_info->non_login_vote !== 'Y') + if(!isset($module_info->non_login_vote) || $module_info->non_login_vote !== 'Y') { return false; } } $args = new stdClass; - if($logged_info->member_srl) + if ($logged_info && $logged_info->member_srl) { $args->member_srl = $logged_info->member_srl; } @@ -554,7 +554,7 @@ class DocumentItem extends BaseObject } $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) + if(!$logged_info || !$logged_info->member_srl) { return false; } @@ -565,7 +565,7 @@ class DocumentItem extends BaseObject } $args = new stdClass(); - if($logged_info->member_srl) + if($logged_info && $logged_info->member_srl) { $args->member_srl = $logged_info->member_srl; } @@ -1027,7 +1027,7 @@ class DocumentItem extends BaseObject // Cache the vote log for all comments. $logged_info = Context::get('logged_info'); - if ($logged_info->member_srl) + if ($logged_info && $logged_info->member_srl) { $comment_srls = array(); foreach ($comment_list as $comment_srl => $comment) diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 51833e29d..4e73b31ba 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -89,8 +89,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; -
    - + @@ -126,10 +125,9 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
  • {$lang->last_page} »
    • -
    + - - - + +

    {$lang->document_manager}:

    diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index f6a430aef..a0a206b4a 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -387,6 +387,7 @@ class EditorModel extends Editor } else { + $logged_info = new Rhymix\Framework\Helpers\SessionHelper(); $group_list = array(); } @@ -507,7 +508,7 @@ class EditorModel extends Editor $logged_info = Context::get('logged_info'); $auto_save_args->member_srl = $logged_info->member_srl; } - elseif($_COOKIE['autosave_certify_key_' . $auto_save_args->module_srl]) + elseif(!empty($_COOKIE['autosave_certify_key_' . $auto_save_args->module_srl])) { $auto_save_args->certify_key = $_COOKIE['autosave_certify_key_' . $auto_save_args->module_srl]; } @@ -647,8 +648,8 @@ class EditorModel extends Editor unset($component_list->{$key}); continue; } - if($logged_info->is_admin == "Y") continue; - if($val->target_group) + if($logged_info && $logged_info->is_admin == "Y") continue; + if(isset($val->target_group) && $val->target_group) { if(!Context::get('is_logged')) { @@ -664,7 +665,7 @@ class EditorModel extends Editor if(!$is_granted) $val->enabled = "N"; } } - if($val->enabled != "N" && $val->mid_list) + if($val->enabled != "N" && !empty($val->mid_list)) { $mid = Context::get('mid'); if(!in_array($mid, $val->mid_list)) $val->enabled = "N"; diff --git a/modules/editor/skins/ckeditor/file_upload.html b/modules/editor/skins/ckeditor/file_upload.html index 7d808c24f..c89df2a1c 100644 --- a/modules/editor/skins/ckeditor/file_upload.html +++ b/modules/editor/skins/ckeditor/file_upload.html @@ -10,7 +10,7 @@
    diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index d19ca740e..0c4ad5952 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -222,11 +222,11 @@ class SpamfilterModel extends Spamfilter { return false; } - if ($user->is_admin === 'Y') + if ($user && $user->is_admin === 'Y') { return false; } - if ($config->captcha->target_users !== 'everyone' && $user->member_srl) + if ($config->captcha->target_users !== 'everyone' && $user && $user->member_srl) { return false; } diff --git a/widgets/login_info/skins/ncenter_login/login_form.html b/widgets/login_info/skins/ncenter_login/login_form.html index cd134aa97..39bb96622 100644 --- a/widgets/login_info/skins/ncenter_login/login_form.html +++ b/widgets/login_info/skins/ncenter_login/login_form.html @@ -5,7 +5,7 @@
    • - my profile + my profile 손님