Merge pull request #147 from aharris88/master

header issue #146
This commit is contained in:
mattpass
2013-02-01 09:31:34 -08:00
2 changed files with 4 additions and 6 deletions

View File

@@ -1,4 +1,3 @@
<!DOCTYPE html>
<?php include("lib/settings.php");
// Check IP permissions
@@ -16,7 +15,7 @@ if ($ICEcoder["checkUpdates"]) {
}
}
?>
<!DOCTYPE html>
<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
<head>
<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?></title>

View File

@@ -232,6 +232,9 @@ if ($_SESSION['loggedIn']) {
$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
}
if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_SERVER['SCRIPT_NAME'],"lib/settings.php")) {
header('Location: lib/settings.php');
}
// If we're due to show the settings screen
if (!$_SESSION['loggedIn']) {
// If the password hasn't been set and we're setting it
@@ -285,8 +288,4 @@ echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
</html>
<?php
}
if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_SERVER['SCRIPT_NAME'],"lib/settings.php")) {
header('Location: lib/settings.php');
}
?>