mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

#4299: Wrap even more potentially undefined constants

Browse Source 
In:
* Admin-UI
* Forums
This commit is contained in:
Nick Liu
2021-07-21 20:23:06 +02:00
parent 389a76efe2
commit 7a04260b5f
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e107_handlers/admin_ui.php
View File

@@ -7760,20 +7760,35 @@ class e_admin_form_ui extends e_form
<div class='span6 col-md-6'>";
$selectStart = "<div class='form-inline input-inline'>
".ADMIN_CHILD_ICON."
".defset('ADMIN_CHILD_ICON')."
<div class='input-group input-append'>
".$this->select_open('etrigger_batch', array('class' => 'tbox form-control input-large select batch e-autosubmit reset', 'id' => false)). '
' .$this->option(LAN_BATCH_LABEL_SELECTED, '');
' .$this->option(defset('LAN_BATCH_LABEL_SELECTED'), '');
$selectOpt = '';
if(!$this->getController()->getTreeModel()->isEmpty())
{
$selectOpt .= !empty($options['copy']) ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['delete']) ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['export']) ? $this->option(LAN_UI_BATCH_EXPORT, 'export', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['url']) ? $this->option(LAN_UI_BATCH_CREATELINK, 'url', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['featurebox']) ? $this->option(LAN_PLUGIN_FEATUREBOX_BATCH, 'featurebox', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['copy']) ? $this->option(defset('LAN_COPY'),
'copy',
false,
array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['delete']) ? $this->option(defset('LAN_DELETE'),
'delete',
false,
array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['export']) ? $this->option(defset('LAN_UI_BATCH_EXPORT'),
'export',
false,
array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['url']) ? $this->option(defset('LAN_UI_BATCH_CREATELINK'),
'url',
false,
array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['featurebox']) ? $this->option(defset('LAN_PLUGIN_FEATUREBOX_BATCH'),
'featurebox',
false,
array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
// if(!empty($parms['sef'])

8
e107_plugins/forum/forum_class.php
View File

@@ -315,10 +315,10 @@ class e107forum
$postInfo['post_id'] = $this->postAdd($postInfo); // save it.
$postInfo['user_name'] = USERNAME;
$postInfo['user_email'] = USEREMAIL;
$postInfo['user_image'] = USERIMAGE;
$postInfo['user_signature'] = USERSIGNATURE;
$postInfo['user_name'] = defset('USERNAME');
$postInfo['user_email'] = defset('USEREMAIL');
$postInfo['user_image'] = defset('USERIMAGE');
$postInfo['user_signature'] = defset('USERSIGNATURE');
if($_POST['insert'] == 1)
{

4
e107_plugins/forum/forum_viewtopic.php
View File

@@ -365,14 +365,14 @@ $forumstring = $forstr . $forthr . vartrue($forrep) . $forend;
//---- Orphan $currentUser???
$threadsViewed = explode(',', $currentUser['user_plugin_forum_viewed']);
if ($thread->threadInfo['thread_lastpost'] > USERLV && !in_array($thread->threadId, $threadsViewed))
if ($thread->threadInfo['thread_lastpost'] > defset('USERLV') && !in_array($thread->threadId, $threadsViewed))
{
$tst = $forum->threadMarkAsRead($thread->threadId);
$mes->addDebug("Marking Forum as read: ".$thread->threadId." result: ".$tst);
}
else
{
$ret = array('lastpost'=>$thread->threadInfo['thread_lastpost'], 'lastvisit'=>USERLV, 'thread'=>$thread->threadId, 'viewed'=>$threadsViewed);
$ret = array('lastpost'=>$thread->threadInfo['thread_lastpost'], 'lastvisit'=>defset('USERLV'), 'thread'=>$thread->threadId, 'viewed'=>$threadsViewed);
e107::getDebug()->log($ret);
unset($ret);
}