mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-02 01:52:10 +09:00
Fix warnings when logged_info is false #2680
This commit is contained in:
parent
840a9adac8
commit
73e153be60
2 changed files with 28 additions and 21 deletions
|
|
@ -112,15 +112,15 @@ class CommentItem extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
if (!$logged_info->member_srl)
|
if (!$logged_info || !$logged_info->member_srl)
|
||||||
{
|
{
|
||||||
return $this->grant_cache = false;
|
return $this->grant_cache = false;
|
||||||
}
|
}
|
||||||
if ($logged_info->is_admin == 'Y')
|
if ($logged_info && $logged_info->is_admin == 'Y')
|
||||||
{
|
{
|
||||||
return $this->grant_cache = true;
|
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;
|
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.
|
// return if the currently logged-in user is an author of the comment.
|
||||||
$logged_info = Context::get('logged_info');
|
$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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -306,7 +306,7 @@ class CommentItem extends BaseObject
|
||||||
$title .= cut_str(strip_tags($content), 30, '...');
|
$title .= cut_str(strip_tags($content), 30, '...');
|
||||||
$content = sprintf('%s<br /><br />from : <a href="%s#comment_%s" target="_blank">%s</a>', $content, getFullUrl('', 'document_srl', $this->get('document_srl')), $this->get('comment_srl'), getFullUrl('', 'document_srl', $this->get('document_srl')));
|
$content = sprintf('%s<br /><br />from : <a href="%s#comment_%s" target="_blank">%s</a>', $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');
|
$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
|
// send a message
|
||||||
$oCommunicationController = getController('communication');
|
$oCommunicationController = getController('communication');
|
||||||
|
|
@ -376,17 +376,24 @@ class CommentItem extends BaseObject
|
||||||
|
|
||||||
function getMyVote()
|
function getMyVote()
|
||||||
{
|
{
|
||||||
if(!$this->comment_srl) return false;
|
if (!$this->comment_srl)
|
||||||
if(isset($_SESSION['voted_comment'][$this->comment_srl]))
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($_SESSION['voted_comment'][$this->comment_srl]))
|
||||||
{
|
{
|
||||||
return $_SESSION['voted_comment'][$this->comment_srl];
|
return $_SESSION['voted_comment'][$this->comment_srl];
|
||||||
}
|
}
|
||||||
|
|
||||||
$logged_info = Context::get('logged_info');
|
$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();
|
$args = new stdClass();
|
||||||
if($logged_info->member_srl)
|
if ($logged_info && $logged_info->member_srl)
|
||||||
{
|
{
|
||||||
$args->member_srl = $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');
|
$logged_info = Context::get('logged_info');
|
||||||
if (!$logged_info->member_srl)
|
if (!$logged_info || !$logged_info->member_srl)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -424,7 +431,7 @@ class CommentItem extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
if ($logged_info->member_srl)
|
if ($logged_info && $logged_info->member_srl)
|
||||||
{
|
{
|
||||||
$args->member_srl = $logged_info->member_srl;
|
$args->member_srl = $logged_info->member_srl;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -201,11 +201,11 @@ class DocumentItem extends BaseObject
|
||||||
{
|
{
|
||||||
return $this->grant_cache = false;
|
return $this->grant_cache = false;
|
||||||
}
|
}
|
||||||
if ($logged_info->is_admin == 'Y')
|
if ($logged_info && $logged_info->is_admin == 'Y')
|
||||||
{
|
{
|
||||||
return $this->grant_cache = true;
|
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;
|
return $this->grant_cache = true;
|
||||||
}
|
}
|
||||||
|
|
@ -411,7 +411,7 @@ class DocumentItem extends BaseObject
|
||||||
|
|
||||||
// Return if the currently logged-in user is an author
|
// Return if the currently logged-in user is an author
|
||||||
$logged_info = Context::get('logged_info');
|
$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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -421,7 +421,7 @@ class DocumentItem extends BaseObject
|
||||||
$content = sprintf('%s<br><br>from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('', 'document_srl', $this->document_srl), getFullUrl('', 'document_srl', $this->document_srl));
|
$content = sprintf('%s<br><br>from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('', 'document_srl', $this->document_srl), getFullUrl('', 'document_srl', $this->document_srl));
|
||||||
|
|
||||||
// Send a message
|
// 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);
|
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');
|
$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'));
|
$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;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$args = new stdClass;
|
$args = new stdClass;
|
||||||
if($logged_info->member_srl)
|
if ($logged_info && $logged_info->member_srl)
|
||||||
{
|
{
|
||||||
$args->member_srl = $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');
|
$logged_info = Context::get('logged_info');
|
||||||
if(!$logged_info->member_srl)
|
if(!$logged_info || !$logged_info->member_srl)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -565,7 +565,7 @@ class DocumentItem extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
$args = new stdClass();
|
$args = new stdClass();
|
||||||
if($logged_info->member_srl)
|
if($logged_info && $logged_info->member_srl)
|
||||||
{
|
{
|
||||||
$args->member_srl = $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.
|
// Cache the vote log for all comments.
|
||||||
$logged_info = Context::get('logged_info');
|
$logged_info = Context::get('logged_info');
|
||||||
if ($logged_info->member_srl)
|
if ($logged_info && $logged_info->member_srl)
|
||||||
{
|
{
|
||||||
$comment_srls = array();
|
$comment_srls = array();
|
||||||
foreach ($comment_list as $comment_srl => $comment)
|
foreach ($comment_list as $comment_srl => $comment)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue