diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2010-01-15 17:41:49 -0500 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2010-01-15 17:41:49 -0500 |
| commit | d0c5eabfbc64b948a50d8784757c80d62356ffee (patch) | |
| tree | a9086c49e457e04f18f3c5a3b3fba17069fa8393 /includes | |
| parent | 30ef1534d45b4bf14d59e78df79ee461431e208a (diff) | |
| download | fourisland-d0c5eabfbc64b948a50d8784757c80d62356ffee.tar.gz fourisland-d0c5eabfbc64b948a50d8784757c80d62356ffee.tar.bz2 fourisland-d0c5eabfbc64b948a50d8784757c80d62356ffee.zip | |
Removed XHTML
XHTML was causing so many problems that it was simply unbearable. Four Island 3.0 will be sure to have no traces left of this annoyance. Also, a lot of files are showing up as being changed because this commit was on the server and I had to modifiy permissions for files (all of the files that were new since my last server commit) so I could commit.
Diffstat (limited to 'includes')
| -rwxr-xr-x[-rw-r--r--] | includes/common.php | 46 | ||||
| -rwxr-xr-x[-rw-r--r--] | includes/layout.php | 0 |
2 files changed, 20 insertions, 26 deletions
| diff --git a/includes/common.php b/includes/common.php index e4321d9..1239c68 100644..100755 --- a/includes/common.php +++ b/includes/common.php | |||
| @@ -22,40 +22,34 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);} | |||
| 22 | 22 | ||
| 23 | require('headerproc.php'); | 23 | require('headerproc.php'); |
| 24 | 24 | ||
| 25 | include('includes/template.php'); | 25 | include('includes/template.php'); |
| 26 | include('includes/session.php'); | 26 | include('includes/session.php'); |
| 27 | include('includes/maintenance.php'); | 27 | include('includes/maintenance.php'); |
| 28 | include('includes/parsers.php'); | 28 | include('includes/parsers.php'); |
| 29 | include('includes/xmlrpc/xmlrpc.inc'); | 29 | include('includes/xmlrpc/xmlrpc.inc'); |
| 30 | include('includes/specialdates.php'); | 30 | include('includes/specialdates.php'); |
| 31 | include('includes/functions.php'); | 31 | include('includes/functions.php'); |
| 32 | include('includes/hits.php'); | 32 | include('includes/hits.php'); |
| 33 | include('includes/updatePending.php'); | 33 | include('includes/updatePending.php'); |
| 34 | 34 | ||
| 35 | if (isset($_GET['layout'])) | 35 | if (isset($_GET['layout'])) |
| 36 | { | 36 | { |
| 37 | if (!file_exists('theme/layouts/' . basename($_GET['layout']))) | 37 | if (!file_exists('theme/layouts/' . basename($_GET['layout']))) |
| 38 | { | 38 | { |
| 39 | $_GET['layout'] = '7'; | 39 | $_GET['layout'] = '7'; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); | 42 | setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); |
| 43 | 43 | ||
| 44 | unset($_GET['layout']); | 44 | unset($_GET['layout']); |
| 45 | 45 | ||
| 46 | header('Location: ' . getRewriteURL()); | 46 | header('Location: ' . getRewriteURL()); |
| 47 | exit; | 47 | exit; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) | 50 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) |
| 51 | { | 51 | { |
| 52 | $usingIE = true; | 52 | $usingIE = true; |
| 53 | } else { | ||
| 54 | if (getLayout() == '7') | ||
| 55 | { | ||
| 56 | header('Content-type: application/xhtml+xml'); | ||
| 57 | $xhtml = true; | ||
| 58 | } | ||
| 59 | } | 53 | } |
| 60 | 54 | ||
| 61 | ?> | 55 | ?> |
| diff --git a/includes/layout.php b/includes/layout.php index b11c56f..b11c56f 100644..100755 --- a/includes/layout.php +++ b/includes/layout.php | |||
