Issue #4918 - Undefined constants cleanup.

2025-08-06 22:57:14 +02:00 · 2022-12-10 07:06:47 -08:00
parent 60d9c29af3
commit d960829532
30 changed files with 66 additions and 104 deletions
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -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/");
 		}	
 	}		
 	
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -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>";
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -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>";

 		}
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -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);


--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -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');
 			}
 		}

--- a/e107_admin/includes/categories.php
+++ b/e107_admin/includes/categories.php
@@ -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)
 		{
--- a/e107_admin/includes/classis.php
+++ b/e107_admin/includes/classis.php
@@ -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();

--- a/e107_admin/includes/combo.php
+++ b/e107_admin/includes/combo.php
@@ -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();
--- a/e107_admin/includes/compact.php
+++ b/e107_admin/includes/compact.php
@@ -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>
--- a/e107_admin/includes/tabbed.php
+++ b/e107_admin/includes/tabbed.php
@@ -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)
        		{
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -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
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -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>";
 		


--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -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;	
 			} 

--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -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
 		{
--- a/e107_core/bbcodes/bb_code.php
+++ b/e107_core/bbcodes/bb_code.php
@@ -70,8 +70,8 @@ class bb_code extends e_bb_base
 				
 				$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);
 			}
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -47,7 +47,7 @@ class admin_shortcodes extends e_shortcode
 				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>
@@ -315,7 +315,7 @@ class admin_shortcodes extends e_shortcode
 					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
 			{
@@ -324,7 +324,7 @@ class admin_shortcodes extends e_shortcode
 			return $icon;
 		}

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

 	public function sc_admin_lang($parm=null)
@@ -619,7 +619,7 @@ class admin_shortcodes extends e_shortcode

 					$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'>";
@@ -1376,25 +1376,25 @@ class admin_shortcodes extends e_shortcode
 					// 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);
 					}
 					
 					
@@ -2374,7 +2374,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$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'] 	= '';
@@ -2384,7 +2384,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$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'] 	= '';
@@ -2394,7 +2394,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$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'] 	= '';
@@ -2404,7 +2404,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$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'] 	= '';
@@ -2547,7 +2547,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>

 				$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);

--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -1669,7 +1669,7 @@ class e_menuManager
 		}
 		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)
 		{
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -201,8 +201,8 @@ class news {
 				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
 				{
@@ -228,7 +228,7 @@ class news {
 			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');

@@ -244,7 +244,7 @@ class news {
 			else
 			{
 				$error = true;
-				$message = "<strong>".LAN_NEWS_7."</strong>";
+				$message = "<strong>".defset('LAN_CREATED_FAILED')."</strong>";
 				$emessage->add(LAN_UPDATED, E_MESSAGE_ERROR, $smessages);
 			}
 		}
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -365,7 +365,7 @@ class e_plugin
 		$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];

--- a/e107_handlers/search/search_event.php
+++ b/e107_handlers/search/search_event.php
@@ -69,4 +69,3 @@ while (list($event_id, $event_stake, $event_ward, $event_organisation, $event_st
 	$text .= $bullet." <a href=\"event.php?".$event_start."\">{$event_title}</a>{$event_details}<br />";
 }
 $qtype = LAN_911;
-?>
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -634,7 +634,7 @@ class sitelinks
 			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;
 		}
--- a/e107_handlers/upload_handler.php
+++ b/e107_handlers/upload_handler.php
@@ -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)
 	{
--- a/e107_plugins/download/includes/admin.php
+++ b/e107_plugins/download/includes/admin.php
@@ -1974,7 +1974,7 @@ $columnInfo = array(
 		  
 	      if ($delete == "mirror")
 	      {
-	         $mes->addAuto($sql ->delete("download_mirror", "mirror_id=".$del_id), delete, DOWLAN_135);
+	         $mes->addAuto($sql ->delete("download_mirror", "mirror_id=".$del_id), 'delete', DOWLAN_135);
 	         e107::getLog()->add('DOWNL_14','ID: '.$del_id,E_LOG_INFORMATIVE,'');
 	      }
 	
--- a/e107_plugins/download/languages/English/English_admin.php
+++ b/e107_plugins/download/languages/English/English_admin.php
@@ -127,17 +127,17 @@ define("DOWLAN_112", "Limits");
 define("DOWLAN_113", "Userclass"); //FIXME Use Generic
 define("DOWLAN_114", "Add New Limit");
 define("DOWLAN_115", "Update limits");
-// define("DOWLAN_116", "Limit for that userclass already exists");
-// define("DOWLAN_117", "Limit successfully added");
-// define("DOWLAN_118", "Limit not added - unknown error");
-// define("DOWLAN_119", "Limit successfully removed");
-// define("DOWLAN_120", "Limit not removed - unknown error");
-// define("DOWLAN_121", "Limit successfully updated");
+define("DOWLAN_116", "Limit for that userclass already exists");
+define("DOWLAN_117", "Limit successfully added");
+define("DOWLAN_118", "Limit not added - unknown error");
+define("DOWLAN_119", "Limit successfully removed");
+define("DOWLAN_120", "Limit not removed - unknown error");
+define("DOWLAN_121", "Limit successfully updated");
 define("DOWLAN_122", "Inactive");
 define("DOWLAN_123", "Active - File is subject to download limits");
 define("DOWLAN_124", "Active - File is NOT subject to download limits");
 define("DOWLAN_125", "Download limits active");
-// define("DOWLAN_126", "Activation status updated");
+define("DOWLAN_126", "Activation status updated");
 // define("DOWLAN_127", "Only enter filesize if the download is an external file"); // TODO not used?
 define("DOWLAN_128", "Mirrors");
 define("DOWLAN_129", "leave blank if not using mirrors");
--- a/e107_plugins/forum/forum_admin.php
+++ b/e107_plugins/forum/forum_admin.php
@@ -857,7 +857,7 @@ e107::css('inline',"
 				$linkQ = e_SELF."?searchquery=&filter_options=page_chapter__".$id."&mode=page&action=list";
 			//	$level_image = $parent ? '<img src="'.e_IMAGE_ABS.'generic/branchbottom.gif" class="icon" alt="" style="margin-left: '.($level * 20).'px" />&nbsp;' : '';

-				$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;
 			}
@@ -895,7 +895,7 @@ e107::css('inline',"

 				//	$ret['inlineParms'] = array('pre'=>'<img src="'.e_IMAGE_ABS.'generic/branchbottom.gif" class="level-'.$level.' icon" alt="" />');

-					$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')));

 				}

@@ -1099,7 +1099,7 @@ e107::css('inline',"
 				$topic = $this->getController()->getListModel()->get('gen_ip');
 				$topidId = $this->getController()->getListModel()->get('gen_intdata');
 				$text = "<div class='btn-group'>";
-				$text .= "<a class='e-modal btn btn-default'  data-modal-caption='Topic: ".$topic."'  href='".e_SELF."?mode=post&action=list&id=". $topidId."' rel='external'>".ADMIN_VIEW_ICON."</a>";
+				$text .= "<a class='e-modal btn btn-default'  data-modal-caption='Topic: ".$topic."'  href='".e_SELF."?mode=post&action=list&id=". $topidId."' rel='external'>".defset('ADMIN_VIEW_ICON')."</a>";

 				$text .= $this->renderValue('options',$value,array('readParms'=>'edit=0'), $id);
 				$text .= "</div>";
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -248,7 +248,7 @@ class forum_shortcodes extends e_shortcode
 			$total_new_threads = defined('USERLV') ? e107::getDb()->count('forum_thread', '(*)', "WHERE thread_datestamp>'" . USERLV . "' ") : 0;
 			$total_read_threads = 0;

-			if(defset('USERVIEWED') != "")
+			if(defined('USERVIEWED') && defset('USERVIEWED') != "")
 			{
 				$tmp = explode(".", USERVIEWED); // List of numbers, separated by single period
 				$total_read_threads = count($tmp);
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -301,12 +301,12 @@ class gsitemap_ui extends e_admin_ui
 				$id = 'gs-'.$k;

 				$class = '';
-				$classLabel = ADMIN_FALSE_ICON;
+				$classLabel = defset('ADMIN_FALSE_ICON');

 				if(isset($ia['class']) && ((int) $ia['class'] === e_UC_PUBLIC))
 				{
 					$class = 'label-success';
-					$classLabel = ADMIN_TRUE_ICON;
+					$classLabel = defset('ADMIN_TRUE_ICON');
 				}


@@ -747,10 +747,6 @@ class gsitemap
 		{
 		//	$this->importSme();
 		}
-		else if(e_QUERY == "instructions")
-		{
-			$this->instructions();
-		}
 		else if(!vartrue($_POST['edit']))
 		{
 			$this->showList();
@@ -828,8 +824,8 @@ class gsitemap

 				<td class='center' style='white-space:nowrap'>
 				<div>
-				<button class='btn btn-default' type='submit' name='edit[{$row2['gsitemap_id']}]' value='edit' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' >".ADMIN_EDIT_ICON."</button>
-				<button class='btn btn-default btn-secondary action delete' type='submit' name='delete[{$row2['gsitemap_id']}]' value='del' data-confirm='".$tp->toAttribute(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."' title='".LAN_DELETE."' >".ADMIN_DELETE_ICON."</button>
+				<button class='btn btn-default' type='submit' name='edit[{$row2['gsitemap_id']}]' value='edit' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' >".defset('ADMIN_EDIT_ICON')."</button>
+				<button class='btn btn-default btn-secondary action delete' type='submit' name='delete[{$row2['gsitemap_id']}]' value='del' data-confirm='".$tp->toAttribute(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."' title='".LAN_DELETE."' >".defset('ADMIN_DELETE_ICON')."</button>
 				</div>
 				</td>
 				</tr>
@@ -1026,39 +1022,6 @@ class gsitemap
 	}


-	function instructions()
-	{
-		$mes = e107::getMessage();
-		$ns = e107::getRender();
-		
-		
-		$LINK_1 = "https://search.google.com/search-console/";
-		$LINK_2 = "http://www.google.com/support/webmasters/?hl=en";
-		
-		$srch[0] = "[URL]";
-		$repl[0] = "<a href='".$LINK_1."'>".$LINK_1."</a>";
-		
-		$srch[1] = "[URL2]";
-		$repl[1] = "<blockquote><b>".SITEURL."sitemap.xml</b></blockquote>";
-		
-		$srch[2] = "[";
-		$repl[2] = "<a href='".e_ADMIN."prefs.php'>";
-		
-		$srch[3] = "]";
-		$repl[3] = "</a>";		
-		
-		$text = "<b>".GSLAN_33."</b><br /><br />
-		<ul>
-			<li>".GSLAN_34."</li>
-			<li>".GSLAN_35."</li>
-			<li>".GSLAN_36."</li>
-			<li>".str_replace($srch,$repl,GSLAN_37)."</li>
-			<li>".str_replace("[URL]","<a href='".$LINK_2."'>".$LINK_2."</a>",GSLAN_38)."</li>
-		<ul>
-		";
-
-		$ns->tablerender(GSLAN_32, $mes->render(). $text);
-	}

 }

--- a/e107_plugins/import/admin_import.php
+++ b/e107_plugins/import/admin_import.php
@@ -304,7 +304,7 @@ class import_main_ui extends e_admin_ui
 					 foreach($this->importTables as $key=>$val)
 					 {
 					 	if(vartrue($val['nolist'])){ continue; }
-		 			 	$text .= "<td class='center'>".(in_array($key,$info['supported']) ? ADMIN_TRUE_ICON : "&nbsp;")."</td>\n";
+		 			 	$text .= "<td class='center'>".(in_array($key,$info['supported']) ? defset('ADMIN_TRUE_ICON') : "&nbsp;")."</td>\n";
 					 }
 		
 		             $text .= "
--- a/e107_plugins/newsletter/admin_config.php
+++ b/e107_plugins/newsletter/admin_config.php
@@ -450,7 +450,7 @@ class newsletter
 		$mailData = array(
 			'mail_content_status' => MAIL_STATUS_TEMP,
 			'mail_create_app' => 'newsletter',
-			'mail_title' => NLLAN_01.' '.$issue,
+			'mail_title' => LAN_PLUGIN_NEWSLETTER_NAME.' '.$issue,
 			'mail_subject' => $newsletterParentInfo['newsletter_title'] .': '.$newsletterInfo['newsletter_title'],
 			'mail_sender_email' => $pref['siteadminemail'],
 			'mail_sender_name'	=> $pref['siteadmin'],
--- a/e107_plugins/newsletter/nl_archive.php
+++ b/e107_plugins/newsletter/nl_archive.php
@@ -119,7 +119,7 @@ else
 				// Display parent footer
 				$text .= "$parent_newsletter_footer<br />";
 				// Display back to newsletter overview button
-				$text .= "<br /><a href='javascript:history.go(-1);'><input class='btn btn-default btn-secondary button' type='submit' value='".NLLAN_71."'</a>";
+				$text .= "<br /><a href='javascript:history.go(-1);'><input class='btn btn-default btn-secondary button' type='submit' value='".defset('LAN_BACK', 'Back')."'</a>";
 			}
 			else
 			{