Skip to content

Smfinfo cleanup #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbulen merged 2 commits into from
Nov 23, 2019
Merged

Smfinfo cleanup #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62eb75d
Remove extra LFs
sbulen Nov 23, 2019
53df261
Some cleanup
sbulen Nov 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 9 additions & 44 deletions smfinfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ function load_txt_strings()
$txt['db_char_set'] = 'Database Character Set';
$txt['db_table_info'] = 'Detailed Table Information';


// SMF Specific Info
$txt['smf_relevant'] = 'Relevant SMF Settings';
$txt['sef_urls'] = 'SEF URLs';
Expand Down Expand Up @@ -81,7 +80,6 @@ function load_txt_strings()
$txt['support_versions_forum'] = 'Your SMF Info version';
$txt['previousCharacterSet'] = 'Previous character set';


// PHP Specific Info
$txt['relevant_info'] = 'Relevant PHP Settings';
$txt['safe_mode'] = 'Safe Mode';
Expand Down Expand Up @@ -215,6 +213,14 @@ function show_header()
{
global $txt, $smfInfo, $context, $smfinfo_version;

// Find logo image...
if (file_exists('./Themes/default/images/smflogo.svg'))
$smflogo = './Themes/default/images/smflogo.svg';
elseif (file_exists('./Themes/default/images/smflogo.png'))
$smflogo = './Themes/default/images/smflogo.png';
else
$smflogo = './Themes/default/images/smflogo.gif';

echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
Expand Down Expand Up @@ -282,35 +288,6 @@ function show_header()
position:relative;
}






























.dynamic-tab-pane-control .tab-page{
border:1px solid #919b9c;
background:#f6f6f6;
Expand All @@ -324,11 +301,6 @@ function show_header()
float:left;
}






/* This is for phpinfo */
table.adminlist
{
Expand Down Expand Up @@ -458,12 +430,11 @@ function addLoadEvent(func)
</head>
<body>
<div id="header">
<a href="http://www.simplemachines.org/" target="_blank"><img src="./Themes/default/images/smflogo.gif" style="width: 258px; float: right;" alt="Simple Machines" border="0" /></a>
<a href="http://www.simplemachines.org/" target="_blank"><img src="' . $smflogo . '" style="width: 258px; float: right;" alt="Simple Machines" border="0" /></a>
<div>', $txt['title'], '</div>
</div>
<div id="content">';


if (allowedTo('admin_forum'))
echo '
<div class="windowbg" style="margin: 1ex; padding: 1ex 2ex; border: 1px dashed green; color: green;">
Expand Down Expand Up @@ -560,10 +531,6 @@ function show_system_info()
get_database_version();

echo '




<div class="tab-page" id="main"><h2 class="tab">', $txt['maininfo'], '</h2>
<script type="text/javascript">addSection("main", "', $txt['maininfo'], '" );</script>
<table border="0" width="100%" cellpadding="2" cellspacing="2">
Expand Down Expand Up @@ -1329,7 +1296,6 @@ function smfDetermineVersions()
if (document.getElementById("Templates"))
document.getElementById("Templates").style.display = "none";


if (typeof(window.smfVersions) == "undefined")
window.smfVersions = {};

Expand Down Expand Up @@ -1368,7 +1334,6 @@ function smfDetermineVersions()
setInnerHTML(document.getElementById("your" + filename), yourVersion);
}


if (typeof(window.smfLanguageVersions) == "undefined")
window.smfLanguageVersions = {};

Expand Down