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

Issue #4918 - Undefined constants cleanup.

Browse Source
This commit is contained in:
Cameron
2022-12-10 07:06:47 -08:00
parent 60d9c29af3
commit d960829532
30 changed files with 66 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@@ -516,7 +516,7 @@ TMPO;
$mes = e107::getMessage();
if (is_dir(e_ADMIN.'htmlarea') || is_dir(e_HANDLER.'htmlarea'))
{
$mes->addWarning(e_HANDLER_ABS."htmlarea/<br />".e_ADMIN_ABS."htmlarea/");
$mes->addWarning(e_HANDLER."htmlarea/<br />".e_ADMIN_ABS."htmlarea/");
}
}

4
e107_admin/cpage.php
View File

@@ -144,7 +144,7 @@ class page_admin_form_ui extends e_admin_form_ui
$query = http_build_query($query, '', '&amp;');
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".ADMIN_EDIT_ICON."</a>";
".defset('ADMIN_EDIT_ICON')."</a>";
if($this->getController()->getMode() === 'overview' && getperms('J1')) // Page/Menu Delete Perms.
{
@@ -412,7 +412,7 @@ class page_chapters_form_ui extends e_admin_form_ui
if($parent != 0)
{
$link = e_SELF."?searchquery=&filter_options=page_chapter__".$id."&mode=page&action=list";
$text .= "<a href='".$link."' class='btn btn-default' title='".CUSLAN_58."'>".ADMIN_PAGES_ICON."</a>"; //
$text .= "<a href='".$link."' class='btn btn-default' title='".CUSLAN_58."'>".defset('ADMIN_PAGES_ICON')."</a>"; //
}
$text .= "</div>";

2
e107_admin/cron.php
View File

@@ -547,7 +547,7 @@ class cron_admin_form_ui extends e_admin_form_ui
$text .= ($weekday != '*') ? LAN_CRON_54 ." ". eShims::strftime("%A", mktime(00, 00, 00, 5, (int) $weekday, 2000)) : LAN_CRON_42; // Weekday(s)
return "<a class='e-tip' href=''>".ADMIN_INFO_ICON."</a>
return "<a class='e-tip' href=''>".defset('ADMIN_INFO_ICON')."</a>
<div class='field-help'>".$text."</div>";
}

4
e107_admin/db.php
View File

@@ -769,7 +769,7 @@ class system_tools
<td>".$row['Name']."</td>
<td>".$row['Engine']."</td>
<td>".$row['Collation']."</td>
<td>".(($row['Collation'] == 'utf8_general_ci') ? ADMIN_TRUE_ICON : ADMIN_FALSE_ICON)."</td>
<td>".(($row['Collation'] == 'utf8_general_ci') ? defset('ADMIN_TRUE_ICON') : defset('ADMIN_FALSE_ICON'))."</td>
</tr>";
// print_a($row);
@@ -1612,7 +1612,7 @@ class system_tools
{
$error_messages = array(0 => DBLAN_31, 1 => LAN_ERROR, 2 => DBLAN_33, 3 => DBLAN_34);
// $error_image = array("integrity_pass.png", "integrity_fail.png", "warning.png", "blank.png");
$error_glyph = array(ADMIN_TRUE_ICON,ADMIN_FALSE_ICON,ADMIN_WARNING_ICON,"<i style='display:inline-block;width:17px;height:16px;'> </i>");
$error_glyph = array(ADMIN_TRUE_ICON, ADMIN_FALSE_ICON, ADMIN_WARNING_ICON,"<i style='display:inline-block;width:17px;height:16px;'> </i>");
$error_type = array('warning'=>2, 'error'=>1);

2
e107_admin/image.php
View File

@@ -602,7 +602,7 @@ class media_form_ui extends e_admin_form_ui
{
foreach($pref['e_imageresize'] as $k=>$val)
{
$options[$k] = ucfirst($k). ' ' .LAN_IMA_O_006;
$options[$k] = ucfirst($k). ' ' .defset('LAN_IMA_O_006');
}
}

2
e107_admin/includes/categories.php
View File

@@ -45,7 +45,7 @@ foreach ($admin_cat['id'] as $cat_key => $cat_id)
}
else
{
$text_rend = e107::getNav()->renderAdminButton(e_ADMIN."plugin.php", ADLAN_98, ADLAN_99, "Z", E_16_PLUGMANAGER, 'default');
$text_rend = e107::getNav()->renderAdminButton(e_ADMIN."plugin.php", ADLAN_98, ADLAN_99, "Z", defset('E_16_PLUGMANAGER'), 'default');
if ($text_rend)
{

2
e107_admin/includes/classis.php
View File

@@ -34,7 +34,7 @@ if(!empty($buts))
$text = "<div style='text-align:center'>
<table class='table'>";
$text .= e107::getNav()->pluginLinks(E_32_PLUGMANAGER, "classis");
$text .= e107::getNav()->pluginLinks(defset('E_32_PLUGMANAGER'), "classis");
$text .= render_clean();

2
e107_admin/includes/combo.php
View File

@@ -40,7 +40,7 @@ $text = "<div style='text-align:center'>
<table class='table'>";
$text .= e107::getNav()->pluginLinks(E_32_PLUGMANAGER, "classis");
$text .= e107::getNav()->pluginLinks(defset('E_32_PLUGMANAGER'), "classis");
$text .= render_clean();

2
e107_admin/includes/compact.php
View File

@@ -49,7 +49,7 @@ $text = "<div style='text-align:center'>
<table class='table'>";
$text .= e107::getNav()->pluginLinks( E_16_PLUGMANAGER, 'default');
$text .= e107::getNav()->pluginLinks( defset('E_16_PLUGMANAGER'), 'default');
$text .= "</tr>

2
e107_admin/includes/tabbed.php
View File

@@ -141,7 +141,7 @@ class tabbed
}
else // Plugin category.
{
$text_rend = e107::getNav()->pluginLinks(E_32_PLUGMANAGER, "div");
$text_rend = e107::getNav()->pluginLinks(defset('E_32_PLUGMANAGER'), "div");
if ($text_rend)
{

4
e107_admin/lancheck.php
View File

@@ -1303,7 +1303,7 @@ class lancheck
$style = ($er) ? "forumheader2" : "forumheader3";
$text .= "<td class='{$style}' style='width:50%'><div class='smalltext'>";
$text .= $bom_error . $utf_error;
$text .= (!$er && !$bom_error && !$utf_error) ? ADMIN_TRUE_ICON : $er."<br />";
$text .= (!$er && !$bom_error && !$utf_error) ? defset('ADMIN_TRUE_ICON') : $er."<br />";
$text .= "</div></td>";
}
else
@@ -1685,7 +1685,7 @@ class lancheck
$style = ($er) ? "forumheader2" : "forumheader3";
$text .= "<td class='{$style}' style='width:50%'><div class='smalltext'>";
$text .= $bom_error . $utf_error;
$text .= (!$er && !$bom_error && !$utf_error) ? ADMIN_TRUE_ICON : $er."<br />";
$text .= (!$er && !$bom_error && !$utf_error) ? defset('ADMIN_TRUE_ICON') : $er."<br />";
$text .= "</div></td>";
}
else

10
e107_admin/mailout.php
View File

@@ -1713,8 +1713,8 @@ class mailout_admin_form_ui extends e_admin_form_ui
$link = e_SELF."?mode=main&action=send&id=".$id;
$preview = e_SELF."?mode=main&action=preview&id=".$id;
$text .= "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default' title='".LAN_MAILOUT_08."'>".E_32_MAIL."</a>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= "<a href='".$link."' class='btn btn-default' title='".LAN_MAILOUT_08."'>".defset('E_32_MAIL')."</a>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".defset('E_32_SEARCH')."</a>";
$text .= $this->renderValue('options',$value,$attributes,$id);
@@ -1728,8 +1728,8 @@ class mailout_admin_form_ui extends e_admin_form_ui
$preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user;
$text = "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default btn-secondary e-modal' data-modal-caption='Recipients for Mail #".$id."' title='".LAN_MAILOUT_173."'>".E_32_USER."</a>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= "<a href='".$link."' class='btn btn-default btn-secondary e-modal' data-modal-caption='Recipients for Mail #".$id."' title='".LAN_MAILOUT_173."'>".defset('E_32_USER')."</a>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".defset('E_32_SEARCH')."</a>";
$attributes['readParms']['editClass'] = e_UC_NOBODY;
$text .= $this->renderValue('options',$value,$attributes,$id);
@@ -1900,7 +1900,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui
$preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user;
$text = "<span class='btn-group'>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' class='btn' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= "<a rel='external' class='btn btn-default btn-secondary e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' class='btn' title='".LAN_PREVIEW."'>".defset('E_32_SEARCH')."</a>";

4
e107_admin/newspost.php
View File

@@ -390,7 +390,7 @@ class news_sub_form_ui extends e_admin_form_ui
// $text .= "<a href='#submitted_".$submitnews_id."' class='e-modal' >";
$text = "<a class='btn btn-default btn-secondary btn-large' data-toggle='modal' data-bs-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' title='".LAN_PREVIEW."'>".ADMIN_VIEW_ICON."</a>";
$text = "<a class='btn btn-default btn-secondary btn-large' data-toggle='modal' data-bs-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' title='".LAN_PREVIEW."'>".defset('ADMIN_VIEW_ICON')."</a>";
@@ -398,7 +398,7 @@ class news_sub_form_ui extends e_admin_form_ui
if($approved == 0)
{
//$text = $this->submit_image('submitnews['.$id.']', 1, 'execute', NWSLAN_58);
$text .= "<a class='btn btn-default btn-secondary btn-large' title=\"".LAN_NEWS_96."\" href='".e_SELF."?mode=main&action=create&sub={$id}'>".ADMIN_EXECUTE_ICON."</a>";
$text .= "<a class='btn btn-default btn-secondary btn-large' title=\"".LAN_NEWS_96."\" href='".e_SELF."?mode=main&action=create&sub={$id}'>".defset('ADMIN_EXECUTE_ICON')."</a>";
// NWSLAN_103;
}

2
e107_admin/users.php
View File

@@ -1248,7 +1248,7 @@ class users_admin_ui extends e_admin_ui
$vars = array('x'=> $sysuser->getId(), 'y'=>$sysuser->getName(), 'z'=> $sysuser->getValue('email'));
$message = e107::getParser()->lanVars(USRLAN_167,$vars);
e107::getLog()->add('USET_11', $message, E_LOG_INFORMATIVE);
$mes->addSuccess(USRLAN_140.": <a href='mailto:".$sysuser->getValue('email')."?body=".$return_address."' title=\"".LAN_USER_08."\" >".$sysuser->getName()." (".$sysuser->getValue('email').")</a> ({$lan}) ");
$mes->addSuccess(USRLAN_140.": <a href='mailto:".$sysuser->getValue('email')."?body=".$return_address."' title=\"".LAN_USER_60."\" >".$sysuser->getName()." (".$sysuser->getValue('email').")</a> ({$lan}) ");
}
else
{