diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 63366e2783..fe7075c83a 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -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/
".e_ADMIN_ABS."htmlarea/");
+ $mes->addWarning(e_HANDLER."htmlarea/
".e_ADMIN_ABS."htmlarea/");
}
}
diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 92e89b08b5..b64f7f7499 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -144,7 +144,7 @@ function options($parms, $value, $id, $attributes)
$query = http_build_query($query, '', '&');
$text = "
- ".ADMIN_EDIT_ICON."";
+ ".defset('ADMIN_EDIT_ICON')."";
if($this->getController()->getMode() === 'overview' && getperms('J1')) // Page/Menu Delete Perms.
{
@@ -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 .= "".ADMIN_PAGES_ICON.""; //
+ $text .= "".defset('ADMIN_PAGES_ICON').""; //
}
$text .= "";
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index e39dfa9dfb..969aea3764 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -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 "".ADMIN_INFO_ICON."
+ return "".defset('ADMIN_INFO_ICON')."
";
$text .= $bom_error . $utf_error;
- $text .= (!$er && !$bom_error && !$utf_error) ? ADMIN_TRUE_ICON : $er." "; + $text .= (!$er && !$bom_error && !$utf_error) ? defset('ADMIN_TRUE_ICON') : $er." "; $text .= " | ";
}
else
@@ -1685,7 +1685,7 @@ function check_lanfiles($mode,$comp_name,$base_lan="English",$target_lan=null)
$style = ($er) ? "forumheader2" : "forumheader3";
$text .= "";
$text .= $bom_error . $utf_error;
- $text .= (!$er && !$bom_error && !$utf_error) ? ADMIN_TRUE_ICON : $er." "; + $text .= (!$er && !$bom_error && !$utf_error) ? defset('ADMIN_TRUE_ICON') : $er." "; $text .= " | ";
}
else
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 9ae585196e..0aea0505c7 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -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 .= "";
- $text .= "".E_32_MAIL."";
- $text .= "".E_32_SEARCH."";
+ $text .= "".defset('E_32_MAIL')."";
+ $text .= "".defset('E_32_SEARCH')."";
$text .= $this->renderValue('options',$value,$attributes,$id);
@@ -1728,8 +1728,8 @@ function options($parms, $value, $id, $attributes)
$preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user;
$text = "";
- $text .= "".E_32_USER."";
- $text .= "".E_32_SEARCH."";
+ $text .= "".defset('E_32_USER')."";
+ $text .= "".defset('E_32_SEARCH')."";
$attributes['readParms']['editClass'] = e_UC_NOBODY;
$text .= $this->renderValue('options',$value,$attributes,$id);
@@ -1900,7 +1900,7 @@ function options($parms, $value, $id, $attributes)
$preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user;
$text = "";
- $text .= "".E_32_SEARCH."";
+ $text .= "".defset('E_32_SEARCH')."";
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 91e7b9fdbd..872cbfe5c4 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -390,7 +390,7 @@ function options($parms, $value, $id, $attributes)
// $text .= "";
- $text = "".ADMIN_VIEW_ICON."";
+ $text = "".defset('ADMIN_VIEW_ICON')."";
@@ -398,7 +398,7 @@ function options($parms, $value, $id, $attributes)
if($approved == 0)
{
//$text = $this->submit_image('submitnews['.$id.']', 1, 'execute', NWSLAN_58);
- $text .= "".ADMIN_EXECUTE_ICON."";
+ $text .= "".defset('ADMIN_EXECUTE_ICON')."";
// NWSLAN_103;
}
diff --git a/e107_admin/users.php b/e107_admin/users.php
index ac250740c1..a089f6d682 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -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.": ".$sysuser->getName()." (".$sysuser->getValue('email').") ({$lan}) ");
+ $mes->addSuccess(USRLAN_140.": ".$sysuser->getName()." (".$sysuser->getValue('email').") ({$lan}) ");
}
else
{
diff --git a/e107_core/bbcodes/bb_code.php b/e107_core/bbcodes/bb_code.php
index 2840263589..663bd267a8 100644
--- a/e107_core/bbcodes/bb_code.php
+++ b/e107_core/bbcodes/bb_code.php
@@ -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);
}
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 149fda2c31..1856907d27 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -47,7 +47,7 @@ function cronUpdateRender($parm,$cacheData)
return '