From 9c3bb2457b1d05cb0c044260cfaaaad2a9935b96 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 12 Mar 2014 03:19:52 +0100
Subject: Fixed the path for the css file

---
 www/functions.php              | 12 ------------
 www/functions/func_failure.php |  2 +-
 www/functions/func_rewrite.php |  2 +-
 www/httperror.php              |  2 +-
 www/include.php                | 12 ++++++++++++
 www/index.php                  |  2 +-
 www/static/header.html         |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 www/functions.php
 create mode 100644 www/include.php

diff --git a/www/functions.php b/www/functions.php
deleted file mode 100644
index 76b4ba1..0000000
--- a/www/functions.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?
-
-$func_dir = "functions/";
-
-require_once($func_dir . "func_failure.php");		// 404 and other errors
-require_once($func_dir . "func_interface.php");		// presents the vfs content
-require_once($func_dir . "func_invite.php");		// handles the invite routine
-require_once($func_dir . "func_login.php");		// handles also logout
-require_once($func_dir . "func_register.php");		// processing the registration
-require_once($func_dir . "func_rewrite.php");		// rewrites URL if user forgot to add the username while loged in
-require_once($func_dir . "func_select.php");		// get the actual vfs content
-require_once($func_dir . "func_user.php");		// account specific stuff
diff --git a/www/functions/func_failure.php b/www/functions/func_failure.php
index cff18a0..f7eb43f 100644
--- a/www/functions/func_failure.php
+++ b/www/functions/func_failure.php
@@ -2,7 +2,7 @@
 /* --PAGE NOT FOUND - 404 -- */
 
 function get_404($working_path, $wrong_folder){
-        include("404.php");
+        include("httperror.php");
         exit;
 }
 
diff --git a/www/functions/func_rewrite.php b/www/functions/func_rewrite.php
index 5ca2171..ecc6db8 100644
--- a/www/functions/func_rewrite.php
+++ b/www/functions/func_rewrite.php
@@ -14,7 +14,7 @@ function rewrite($db){
 
                 if($_SESSION["login"]){
                         header("Refresh: 0; /" . $_SESSION[username] . "/" . $_GET["name"] . "/" . $_GET["folder"] . "");
-                        exit;
+                        return false;
                 } else {
 
                         $wrong_folder = $_GET["name"];
diff --git a/www/httperror.php b/www/httperror.php
index 1b06226..5deff9f 100644
--- a/www/httperror.php
+++ b/www/httperror.php
@@ -17,7 +17,7 @@
 
 
 <?php include("static/header.html");?>
-	<link rel="stylesheet" type="text/css" href="static/httperror.css">
+	<link rel="stylesheet" type="text/css" href="/static/httperror.css">
 <div id="Error-Page-content">
 	<h1 id="Error-Page-head" >404</h1>
 	<h2 id="Error-Page-description" >Wow! I didn&#39;t see that coming...Well, I&#39;m sorry...</h2>
diff --git a/www/include.php b/www/include.php
new file mode 100644
index 0000000..76b4ba1
--- /dev/null
+++ b/www/include.php
@@ -0,0 +1,12 @@
+<?
+
+$func_dir = "functions/";
+
+require_once($func_dir . "func_failure.php");		// 404 and other errors
+require_once($func_dir . "func_interface.php");		// presents the vfs content
+require_once($func_dir . "func_invite.php");		// handles the invite routine
+require_once($func_dir . "func_login.php");		// handles also logout
+require_once($func_dir . "func_register.php");		// processing the registration
+require_once($func_dir . "func_rewrite.php");		// rewrites URL if user forgot to add the username while loged in
+require_once($func_dir . "func_select.php");		// get the actual vfs content
+require_once($func_dir . "func_user.php");		// account specific stuff
diff --git a/www/index.php b/www/index.php
index 1f6a38a..2e28073 100644
--- a/www/index.php
+++ b/www/index.php
@@ -2,7 +2,7 @@
 
 session_start();
 
-require_once("functions.php");
+require_once("include.php");		// handles all the stuff that needs to be included
 
 $db = new SQLite3("../database/sqlite.db");
 
diff --git a/www/static/header.html b/www/static/header.html
index de1ff79..25eba61 100644
--- a/www/static/header.html
+++ b/www/static/header.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title>VFS</title>
-		<link rel="stylesheet" href="static/style.css">
+		<link rel="stylesheet" href="/static/style.css">
 	</head>
 
 	<body>
-- 
cgit v1.2.3