Skip to content

Commit

Permalink
Issue #4918 - Undefined constants cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CaMer0n
CaMer0n committed Dec 10, 2022
1 parent 60d9c29 commit d960829
Show file tree
Hide file tree
Showing 30 changed files with 66 additions and 104 deletions.
2 changes: 1 addition & 1 deletion e107_admin/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ private function checkHtmlarea()
$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/");
}
}

Expand Down
4 changes: 2 additions & 2 deletions e107_admin/cpage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function options($parms, $value, $id, $attributes)
$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.
{
Expand Down Expand Up @@ -412,7 +412,7 @@ function options($parms, $value, $id, $attributes)
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>";
Expand Down
2 changes: 1 addition & 1 deletion e107_admin/cron.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ function cron_tab($curVal,$mode)
$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>";

}
Expand Down
4 changes: 2 additions & 2 deletions e107_admin/db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ private function convertUTF8Form()
<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);

Expand Down Expand Up @@ -1612,7 +1612,7 @@ private function plugin_viewscan($mode = 'update')
{
$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);


Expand Down
2 changes: 1 addition & 1 deletion e107_admin/image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ public function resize_dimensions($curval) // ie. never manually resize another
{
foreach($pref['e_imageresize'] as $k=>$val)
{
$options[$k] = ucfirst($k). ' ' .LAN_IMA_O_006;
$options[$k] = ucfirst($k). ' ' .defset('LAN_IMA_O_006');
}
}

Expand Down
2 changes: 1 addition & 1 deletion e107_admin/includes/categories.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
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)
{
Expand Down
2 changes: 1 addition & 1 deletion e107_admin/includes/classis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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();

Expand Down
2 changes: 1 addition & 1 deletion e107_admin/includes/combo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<table class='table'>";


$text .= e107::getNav()->pluginLinks(E_32_PLUGMANAGER, "classis");
$text .= e107::getNav()->pluginLinks(defset('E_32_PLUGMANAGER'), "classis");


$text .= render_clean();
Expand Down
2 changes: 1 addition & 1 deletion e107_admin/includes/compact.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<table class='table'>";


$text .= e107::getNav()->pluginLinks( E_16_PLUGMANAGER, 'default');
$text .= e107::getNav()->pluginLinks( defset('E_16_PLUGMANAGER'), 'default');


$text .= "</tr>
Expand Down
2 changes: 1 addition & 1 deletion e107_admin/includes/tabbed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function render2()
}
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)
{
Expand Down
4 changes: 2 additions & 2 deletions e107_admin/lancheck.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ function check_core_lanfiles($checklan,$subdir='')
$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
Expand Down Expand Up @@ -1685,7 +1685,7 @@ function check_lanfiles($mode,$comp_name,$base_lan="English",$target_lan=null)
$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
Expand Down
10 changes: 5 additions & 5 deletions e107_admin/mailout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1713,8 +1713,8 @@ function options($parms, $value, $id, $attributes)
$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);

Expand All @@ -1728,8 +1728,8 @@ function options($parms, $value, $id, $attributes)
$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);
Expand Down Expand Up @@ -1900,7 +1900,7 @@ function options($parms, $value, $id, $attributes)
$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>";



Expand Down
4 changes: 2 additions & 2 deletions e107_admin/newspost.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,15 @@ function options($parms, $value, $id, $attributes)
// $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>";




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;
}

Expand Down
2 changes: 1 addition & 1 deletion e107_admin/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ protected function resendActivation($id, $lfile = '')
$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
{
Expand Down
4 changes: 2 additions & 2 deletions e107_core/bbcodes/bb_code.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ function toHTML($code_text, $parm)

$geshi->line_style1 = "font-family: 'Courier New', Courier, monospace; font-weight: normal; font-style: normal;";
$geshi->set_encoding('utf-8');
$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
$geshi->set_header_type(GESHI_HEADER_DIV);
$geshi->enable_line_numbers(defset('GESHI_NORMAL_LINE_NUMBERS'));
$geshi->set_header_type(defset('GESHI_HEADER_DIV'));
$CodeCache = $geshi->parse_code();
$e107cache->set('GeshiParsed_'.$code_md5, $CodeCache);
}
Expand Down
30 changes: 15 additions & 15 deletions e107_core/shortcodes/batch/admin_shortcodes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function cronUpdateRender($parm,$cacheData)
return '<ul class="nav navbar pill navbar-nav">
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_MESSAGES.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#">
'.E_16_E107.' <b class="caret"></b>
'.defset('E_16_E107').' <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<li class="nav-header dropdown-header navbar-header">'.LAN_UPDATE_AVAILABLE.'</li>
Expand Down Expand Up @@ -315,7 +315,7 @@ public function sc_admin_icon()
return $icon;
}

$icon = ($eplug_icon && file_exists(e_PLUGIN.$eplug_folder.$eplug_icon)) ? "<img src='".e_PLUGIN_ABS.$eplug_folder.$eplug_icon."' alt='' class='icon S32' />" : E_32_CAT_PLUG;
$icon = ($eplug_icon && file_exists(e_PLUGIN.$eplug_folder.$eplug_icon)) ? "<img src='".e_PLUGIN_ABS.$eplug_folder.$eplug_icon."' alt='' class='icon S32' />" : defset('E_32_CAT_PLUG');
}
else
{
Expand All @@ -324,7 +324,7 @@ public function sc_admin_icon()
return $icon;
}

return E_32_LOGOUT;
return defset('E_32_LOGOUT');
}

public function sc_admin_lang($parm=null)
Expand Down Expand Up @@ -619,7 +619,7 @@ function admin_log()

$sql = e107::getDb();
$ns = e107::getRender();
$text = "<ul class='list-group'><li class='list-group-item'>".E_16_ADMINLOG." <a style='cursor: pointer' onclick=\"expandit('adminlog')\">".ADLAN_116."</a></li></ul>\n";
$text = "<ul class='list-group'><li class='list-group-item'>".defset('E_16_ADMINLOG')." <a style='cursor: pointer' onclick=\"expandit('adminlog')\">".ADLAN_116."</a></li></ul>\n";
if (e_QUERY === 'logall')
{
$text .= "<div id='adminlog'>";
Expand Down Expand Up @@ -1376,25 +1376,25 @@ function admin_status($parm='')
// for BC only.


$oldconfigs['e-user'][0] = array('icon' =>E_16_USER, 'title' =>ADLAN_110, 'url' => e_ADMIN_ABS. 'users.php?searchquery=&amp;filter_options=user_ban__0', 'total' =>$members, 'invert' =>1);
$oldconfigs['e-user'][1] = array('icon' =>E_16_USER, 'title' =>ADLAN_111, 'url' => e_ADMIN. 'users.php?searchquery=&amp;filter_options=user_ban__2', 'total' =>$unverified);
$oldconfigs['e-user'][2] = array('icon' =>E_16_BANLIST, 'title' =>ADLAN_112, 'url' => e_ADMIN. 'users.php?searchquery=&filter_options=user_ban__1', 'total' =>$banned);
$oldconfigs['e-user'][0] = array('icon' =>defset('E_16_USER'), 'title' =>ADLAN_110, 'url' => e_ADMIN_ABS. 'users.php?searchquery=&amp;filter_options=user_ban__0', 'total' =>$members, 'invert' =>1);
$oldconfigs['e-user'][1] = array('icon' =>defset('E_16_USER'), 'title' =>ADLAN_111, 'url' => e_ADMIN. 'users.php?searchquery=&amp;filter_options=user_ban__2', 'total' =>$unverified);
$oldconfigs['e-user'][2] = array('icon' =>defset('E_16_BANLIST'), 'title' =>ADLAN_112, 'url' => e_ADMIN. 'users.php?searchquery=&filter_options=user_ban__1', 'total' =>$banned);


if(empty($pref['comments_disabled']) && varset($pref['comments_engine'],'e107') === 'e107')
{
$oldconfigs['e-comments'][0] = array('icon' =>E_16_COMMENT, 'title' =>LAN_COMMENTS, 'url' => e_ADMIN_ABS. 'comment.php', 'total' =>$comments);
$oldconfigs['e-comments'][0] = array('icon' => defset('E_16_COMMENT'), 'title' =>LAN_COMMENTS, 'url' => e_ADMIN_ABS. 'comment.php', 'total' =>$comments);
}
if($flo = $sql->count('generic', '(*)', "WHERE gen_type='failed_login'"))
{
//$text .= "\n\t\t\t\t\t<div style='padding-bottom: 2px;'>".E_16_FAILEDLOGIN." <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a></div>";
$oldconfigs['e-failed'][0] = array('icon' =>E_16_FAILEDLOGIN, 'title' =>ADLAN_146, 'url' =>e_ADMIN_ABS. 'banlist.php?mode=failed&action=list', 'total' =>$flo);
$oldconfigs['e-failed'][0] = array('icon' => defset('E_16_FAILEDLOGIN'), 'title' =>ADLAN_146, 'url' =>e_ADMIN_ABS. 'banlist.php?mode=failed&action=list', 'total' =>$flo);
}

if($emls = $sql->count('mail_recipients', '(*)', 'WHERE mail_status = 13'))
{
//$text .= "\n\t\t\t\t\t<div style='padding-bottom: 2px;'>".E_16_FAILEDLOGIN." <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a></div>";
$oldconfigs['e-mailout'][0] = array('icon' =>E_16_MAIL, 'title' =>ADLAN_167, 'url' =>e_ADMIN_ABS. 'mailout.php?mode=pending&action=list', 'total' =>$emls);
$oldconfigs['e-mailout'][0] = array('icon' => defset('E_16_MAIL'), 'title' =>ADLAN_167, 'url' =>e_ADMIN_ABS. 'mailout.php?mode=pending&action=list', 'total' =>$emls);
}


Expand Down Expand Up @@ -2374,7 +2374,7 @@ private function getOtherNav($type)
$tmp[5]['text'] = 'e107 Website';
$tmp[5]['description'] = '';
$tmp[5]['link'] = 'https://e107.org';
$tmp[5]['image'] = E_16_E107;
$tmp[5]['image'] = defset('E_16_E107');
$tmp[5]['image_large'] = '';
$tmp[5]['image_src'] = '';
$tmp[5]['image_large_src'] = '';
Expand All @@ -2384,7 +2384,7 @@ private function getOtherNav($type)
$tmp[6]['text'] = 'e107 on Twitter';
$tmp[6]['description'] = '';
$tmp[6]['link'] = 'https://twitter.com/e107';
$tmp[6]['image'] = E_16_TWITTER; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[6]['image'] = defset('E_16_TWITTER'); // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[6]['image_large'] = '';
$tmp[6]['image_src'] = '';
$tmp[6]['image_large_src'] = '';
Expand All @@ -2394,7 +2394,7 @@ private function getOtherNav($type)
$tmp[7]['text'] = 'e107 on Facebook';
$tmp[7]['description'] = '';
$tmp[7]['link'] = 'https://www.facebook.com/e107CMS';
$tmp[7]['image'] = E_16_FACEBOOK; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[7]['image'] = defset('E_16_FACEBOOK'); // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[7]['image_large'] = '';
$tmp[7]['image_src'] = '';
$tmp[7]['image_large_src'] = '';
Expand All @@ -2404,7 +2404,7 @@ private function getOtherNav($type)
$tmp[8]['text'] = 'e107 on Github';
$tmp[8]['description'] = '';
$tmp[8]['link'] = 'https://github.com/e107inc';
$tmp[8]['image'] = E_16_GITHUB; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[8]['image'] = defset('E_16_GITHUB'); // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$tmp[8]['image_large'] = '';
$tmp[8]['image_src'] = '';
$tmp[8]['image_large_src'] = '';
Expand Down Expand Up @@ -2547,7 +2547,7 @@ public function sc_admin_menumanager($parm=null) // List all menu-configs for e

$diz = MENLAN_58;

$caption .= "<span class='e-help-icon pull-right'><a data-placement=\"bottom\" class='e-tip' title=\"".e107::getParser()->toAttribute($diz). '">' .ADMIN_INFO_ICON. '</a></span>';
$caption .= "<span class='e-help-icon pull-right'><a data-placement=\"bottom\" class='e-tip' title=\"".e107::getParser()->toAttribute($diz). '">' .defset('ADMIN_INFO_ICON'). '</a></span>';

return e107::getNav()->admin($caption,$action, $var);

Expand Down
2 changes: 1 addition & 1 deletion e107_handlers/menumanager_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ function checklayout($str)
}
elseif(strpos($str, "LANGUAGELINKS") !== false)
{
echo "<div class=text style='padding: 2px; text-align: center'>[".LAN_LANGUAGE."]</div>";
echo "<div class=text style='padding: 2px; text-align: center'>[".defset('ADLAN_132', "Language")."]</div>";
}
elseif(strpos($str, "CUSTOM") !== false)
{
Expand Down
8 changes: 4 additions & 4 deletions e107_handlers/news_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ function submit_item($news, $smessages = false)
if($sql->getLastErrorNumber())
{
$error = true;
$emessage->add(LAN_NEWS_5, E_MESSAGE_ERROR, $smessages);
$message = "<strong>".LAN_NEWS_5."</strong>";
$emessage->add(defset('LAN_UPDATED_FAILED', "Update Failed"), E_MESSAGE_ERROR, $smessages);
$message = "<strong>".defset('LAN_UPDATED_FAILED', "Update Failed")."</strong>";
}
else
{
Expand All @@ -228,7 +228,7 @@ function submit_item($news, $smessages = false)
if ($data['data']['news_id'])
{
$data['news_id'] = $news['news_id'];
$message = LAN_NEWS_6;
$message = defset('LAN_SAVED', "Saved");
$emessage->add(LAN_CREATED, E_MESSAGE_SUCCESS, $smessages);
e107::getCache()->clear('news.php');

Expand All @@ -244,7 +244,7 @@ function submit_item($news, $smessages = false)
else
{
$error = true;
$message = "<strong>".LAN_NEWS_7."</strong>";
$message = "<strong>".defset('LAN_CREATED_FAILED')."</strong>";
$emessage->add(LAN_UPDATED, E_MESSAGE_ERROR, $smessages);
}
}
Expand Down
2 changes: 1 addition & 1 deletion e107_handlers/plugin_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public function getIcon($size = 16, $opt='')
$link = varset($this->_data[$this->_plugdir]['adminLinks']['link'][0]['@attributes']);

$k = array(16 => 'iconSmall', 24 => 'icon', 32 => 'icon', 128=>'icon128');
$def = array(16 => E_16_PLUGIN, 24 => E_24_PLUGIN, 32 => E_32_PLUGIN);
$def = array(16 => defset('E_16_PLUGIN'), 24 => defset('E_24_PLUGIN'), 32 => defset('E_32_PLUGIN'));

$key = $k[$size];

Expand Down
1 change: 0 additions & 1 deletion e107_handlers/search/search_event.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,3 @@
$text .= $bullet." <a href=\"event.php?".$event_start."\">{$event_title}</a>{$event_details}<br />";
}
$qtype = LAN_911;
?>
2 changes: 1 addition & 1 deletion e107_handlers/sitelinks_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ function hilite($link,$enabled = FALSE)
return TRUE;
}

if(($link_slf == e_SELF && !link_qry) || (e_QUERY && empty($link) == FALSE && strpos(e_SELF."?".e_QUERY,$link)!== FALSE) )
if(($link_slf == e_SELF && !$link_qry) || (e_QUERY && empty($link) == FALSE && strpos(e_SELF."?".e_QUERY,$link)!== FALSE) )
{
return TRUE;
}
Expand Down
2 changes: 1 addition & 1 deletion e107_handlers/upload_handler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ function file_upload($uploaddir, $avatar = FALSE, $fileinfo = "", $overwrite = "
$admin_log->
addEvent(10, __FILE__."|".__FUNCTION__."@".__LINE__, "DEBUG", "Upload Handler test", "Legacy return with ".count($ret)." files", FALSE, FALSE);
$messages = handle_upload_messages($ret, FALSE, TRUE); // Show all the error and acknowledgment messages
define(F_MESSAGE, $messages);
define('F_MESSAGE', $messages);

if (count($ret) == 1)
{
Expand Down
Loading

0 comments on commit d960829

Please sign in to comment.