mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Fixes #5080 - Undefined constant.

Browse Source
This commit is contained in:
camer0n
2023-09-26 14:12:55 -07:00
parent 00a66eaadd
commit 720ea0c03d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/admin_ui.php
View File

@@ -7229,7 +7229,7 @@ class e_admin_form_ui extends e_form
return $curVal; return $curVal;
} }
$level_image = $parent ? str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON) : ''; $level_image = $parent ? str_replace('level-x','level-'.$level, defset('ADMIN_CHILD_ICON')) : '';
return ($parent) ? $level_image.$curVal : $curVal; return ($parent) ? $level_image.$curVal : $curVal;
@@ -7242,7 +7242,7 @@ class e_admin_form_ui extends e_form
if(!empty($parent)) if(!empty($parent))
{ {
$ret['inlineParms'] = array('pre'=> str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON)); $ret['inlineParms'] = array('pre'=> str_replace('level-x','level-'.$level, defset('ADMIN_CHILD_ICON')));
} }
@@ -7732,7 +7732,7 @@ class e_admin_form_ui extends e_form
$gridQuery = (array) $_GET; $gridQuery = (array) $_GET;
$gridQuery['action'] = $gridAction; $gridQuery['action'] = $gridAction;
$toggleUrl = e_REQUEST_SELF. '?' .http_build_query($gridQuery, '', '&'); $toggleUrl = e_REQUEST_SELF. '?' .http_build_query($gridQuery, '', '&');
$gridIcon = ($gridAction === 'grid') ? ADMIN_GRID_ICON : ADMIN_LIST_ICON; $gridIcon = ($gridAction === 'grid') ? defset('ADMIN_GRID_ICON') : defset('ADMIN_LIST_ICON');
$gridTitle = ($gridAction === 'grid') ? LAN_UI_VIEW_GRID_LABEL : LAN_UI_VIEW_LIST_LABEL; $gridTitle = ($gridAction === 'grid') ? LAN_UI_VIEW_GRID_LABEL : LAN_UI_VIEW_LIST_LABEL;
$gridToggle = "<a class='btn btn-default' href='".$toggleUrl."' title=\"".$gridTitle. '">' .$gridIcon. '</a>'; $gridToggle = "<a class='btn btn-default' href='".$toggleUrl."' title=\"".$gridTitle. '">' .$gridIcon. '</a>';
} }

2
e107_handlers/mail.php
View File

@@ -448,7 +448,7 @@ class e107Email extends PHPMailer
fwrite($this->logHandle,"\n\n=====".date('H:i:s y.m.d')."----------------------------------------------------------------=====\r\n"); fwrite($this->logHandle,"\n\n=====".date('H:i:s y.m.d')."----------------------------------------------------------------=====\r\n");
if ($logInfo) if ($logInfo)
{ {
fwrite($this->logHandle,' Mailer opened by '.USERNAME." - ID: {$this->MessageID}. Subject: {$this->Subject} Log action: {$this->logEnable}\r\n"); fwrite($this->logHandle,' Mailer opened by '.defset('USERNAME')." - ID: {$this->MessageID}. Subject: {$this->Subject} Log action: {$this->logEnable}\r\n");
if ($this->add_email) if ($this->add_email)
{ {
fwrite($this->logHandle, 'From: '.$this->From.' ('.$this->FromName.")\r\n"); fwrite($this->logHandle, 'From: '.$this->From.' ('.$this->FromName.")\r\n");