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

Fixes #4737 Removal of type="text/javascript" and type="text/css"

Browse Source
This commit is contained in:
Cameron
2022-03-31 08:24:34 -07:00
parent 21fa07ec3b
commit 025ff07aab
39 changed files with 98 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/administrator.php
View File

@@ -200,11 +200,11 @@ function headerjs()
/*
require_once(e_HANDLER.'js_helper.php');
$ret = "
<script type='text/javascript'>
<script>
//add required core lan - delete confirm message
('".LAN_JSCONFIRM."').addModLan('core', 'delete_confirm');
</script>
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
<script src='".e_JS."core/admin.js'></script>
";
return $ret;*/

2
e107_admin/auth.php
View File

@@ -285,7 +285,7 @@ class auth
{
e107::lan('core', 'login');
$text .= e107::getMessage()->render(); // see e107_handlers/login.php L622
$text .= "<script type='text/javascript'>
$text .= "<script>
window.setTimeout(function() {
$('.alert').fadeTo(500, 0).slideUp(500, function(){
$(this).remove();

8
e107_admin/fileinspector.php
View File

@@ -1184,7 +1184,6 @@ class file_inspector {
// Core CSS - XXX awaiting for path changes
if(!isset($no_core_css) || !$no_core_css)
{
//echo "<link rel='stylesheet' href='".e_FILE_ABS."e107.css' type='text/css' />\n";
$e_js->otherCSS('{e_WEB_CSS}e107.css');
}
@@ -1192,19 +1191,16 @@ class file_inspector {
if(!deftrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss'])
{
$css_file = file_exists(THEME.'admin_'.$pref['admincss']) ? 'admin_'.$pref['admincss'] : $pref['admincss'];
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
$e_js->themeCSS($css_file);
}
elseif(isset($pref['themecss']) && $pref['themecss'])
{
$css_file = file_exists(THEME.'admin_'.$pref['themecss']) ? 'admin_'.$pref['themecss'] : $pref['themecss'];
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
$e_js->themeCSS($css_file);
}
else
{
$css_file = file_exists(THEME.'admin_style.css') ? 'admin_style.css' : 'style.css';
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
$e_js->themeCSS($css_file);
}
@@ -1230,7 +1226,7 @@ class file_inspector {
echo "\n<!-- footer_inline_css -->\n";
$text = "
<style type='text/css'>
<style>
<!--\n";
if (vartrue($_POST['regex']))
{
@@ -1358,7 +1354,7 @@ e107::js('footer', '{e_WEB}js/core/front.jquery.js', 'jquery', 1); // Load all d
$text = e107::getJs()->renderJs('footer', 1, true, true);
$text .= "<script type='text/javascript'>
$text .= "<script>
<!--
c = new Image(); c = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/contract.png';
e = '".SITEURLBASE.e_IMAGE_ABS."fileinspector/expand.png';

2
e107_admin/footer.php
View File

@@ -289,7 +289,7 @@ if (isset($footer_js) && is_array($footer_js))
$footer_js = array_unique($footer_js);
foreach ($footer_js as $fname)
{
echo "<script type='text/javascript' src='{$fname}'></script>\n";
echo "<script src='{$fname}'></script>\n";
$js_included[] = $fname;
}
}

8
e107_admin/header.php
View File

@@ -140,7 +140,6 @@ $e_js = e107::getJs();
// Core CSS - XXX awaiting for path changes
if(!isset($no_core_css) || !$no_core_css)
{
//echo "<link rel='stylesheet' href='".e_FILE_ABS."e107.css' type='text/css' />\n";
$e_js->otherCSS('{e_WEB_CSS}e107.css');
}
@@ -294,7 +293,7 @@ if(!empty($eplug_js))
foreach($eplug_js as $vjss)
{
echo "<script type='text/javascript' src='{$vjss}'></script>\n";
echo "<script src='{$vjss}'></script>\n";
}
}
@@ -303,13 +302,12 @@ if(!empty($eplug_js))
if(file_exists(THEME . 'theme.js'))
{
e107::js('theme', 'theme.js', null, 3);
// echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n";
}
if(is_readable(e_FILE . 'user.js') && filesize(e_FILE . 'user.js'))
{
echo "<script type='text/javascript' src='" . e_FILE_ABS . "user.js'></script>\n";
echo "<script src='" . e_FILE_ABS . "user.js'></script>\n";
}
@@ -356,7 +354,7 @@ if(!USER && ($pref['user_tracking'] == "session") && varset($pref['password_CHAP
$js_body_onload[] = "expandit('loginmenuchap');";
$js_body_onload[] = "expandit('nologinmenuchap');";
}
echo "<script type='text/javascript' src='" . e_JS . "chap_script.js'></script>\n";
echo "<script src='" . e_JS . "chap_script.js'></script>\n";
$js_body_onload[] = "getChallenge();";
}

6
e107_admin/mailout.php
View File

@@ -2436,7 +2436,7 @@ function sendImmediately($id)
//Initiate the Function in the Background.
$text .= "
<script type='text/javascript'>
<script>
//<![CDATA[
new Ajax.Updater('mstatus', '".e_SELF."?mode=process&id=".intval($id)."', {
@@ -2448,7 +2448,7 @@ function sendImmediately($id)
// Update the Progress in real-time.
$text .= "
<script type='text/javascript'>
<script>
//<![CDATA[
x = new Ajax.PeriodicalUpdater('progress', '".e_SELF."?mode=progress&id=".intval($id)."',
@@ -2735,7 +2735,7 @@ if(!function_exists('headerjs'))
{
$text = "
<script type='text/javascript'>
<script>
function bouncedisp(type)

2
e107_admin/notify.php
View File

@@ -471,7 +471,7 @@ if(!function_exists('headerjs'))
{
$js = "
<script type='text/javascript'>
<script>
function mail_field(val,id)
{

4
e107_admin/ugflag.php
View File

@@ -128,7 +128,7 @@ require_once (e_ADMIN."footer.php");
function headerjs()
{
$ret = "
<script type='text/javascript'>
<script>
//Ajax Support
var CoreUgflagAjaxPage = function(e_event) {
\$('updatesettings').observe('click', function(event) {
@@ -149,7 +149,7 @@ function headerjs()
}
</script>
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
<script src='".e_JS."core/admin.js'></script>
";
return $ret;