From d0c5eabfbc64b948a50d8784757c80d62356ffee Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Fri, 15 Jan 2010 17:41:49 -0500 Subject: 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. --- .hgignore | 0 admin.php | 0 admin/comments.php | 0 admin/drafts.php | 0 admin/editLink.php | 0 admin/editPoll.php | 0 admin/editPost.php | 0 admin/editQuote.php | 0 admin/links.php | 0 admin/maintenance.php | 0 admin/modquotes.php | 0 admin/newLink.php | 0 admin/newPoll.php | 0 admin/newPost.php | 0 admin/pending.php | 0 admin/polls.php | 0 admin/posts.php | 0 admin/quotes.php | 0 admin/update.php | 0 admin/welcome.php | 0 includes/common.php | 46 ++++++++++++++----------------- includes/layout.php | 0 pages/archive.php | 0 pages/delete-comment.php | 0 pages/edit-comment.php | 0 pages/fuhsdiufgsadiufgaisfioas.php | 0 pages/poll-results.php | 0 pages/viewPost.php | 0 theme/admin/comments.tpl | 0 theme/admin/css/hack.css | 0 theme/admin/css/ie6.css | 0 theme/admin/css/ie7.css | 0 theme/admin/css/layout.css | 0 theme/admin/css/reset.css | 0 theme/admin/css/transdmin.css | 0 theme/admin/drafts.tpl | 0 theme/admin/footer.tpl | 0 theme/admin/header.tpl | 0 theme/admin/hgupdate.tpl | 0 theme/admin/img/btn_left.gif | Bin theme/admin/img/btn_right.gif | Bin theme/admin/img/button-submit.gif | Bin theme/admin/img/content.gif | Bin theme/admin/img/input-shaddow-hover.gif | Bin theme/admin/img/input-shaddow.gif | Bin theme/admin/img/left-menu-bg.gif | Bin theme/admin/img/select_left.gif | Bin theme/admin/img/select_right.gif | Bin theme/admin/img/top-menu-bg.gif | Bin theme/admin/img/top-menu-item-bg.gif | Bin theme/admin/img/transdmin-light.gif | Bin theme/admin/links.tpl | 0 theme/admin/maintenance.tpl | 0 theme/admin/modquotes.tpl | 0 theme/admin/pending.tpl | 0 theme/admin/polls.tpl | 0 theme/admin/posts.tpl | 0 theme/admin/quotes.tpl | 0 theme/admin/welcome.tpl | 0 theme/admin/writeLink.tpl | 0 theme/admin/writePoll.tpl | 0 theme/admin/writePost.tpl | 0 theme/admin/writeQuote.tpl | 0 theme/css.php | 0 theme/css/blog.php | 0 theme/css/ie.css | 0 theme/css/quotes.css | 0 theme/css/website.css | 0 theme/footer.tpl | 0 theme/fuhsdiufgsadiufgaisfioas.tpl | 0 theme/header.tpl | 0 theme/holidates.tpl | 0 theme/images/fourisland_header_night.png | Bin theme/images/header-repeat.png | Bin theme/images/header.png | Bin theme/images/icons/xhtml_valid.png | Bin theme/images/smilies/001_tongue.gif | Bin theme/images/smilies/biggrin.gif | Bin theme/js/jquery.js | 0 theme/layouts/4.5/day.css | 0 theme/layouts/4.5/headers.php | 0 theme/layouts/4.5/holiday.php | 0 theme/layouts/4.5/layout.tpl | 0 theme/layouts/4.5/navigation.css | 0 theme/layouts/4.5/night.css | 0 theme/layouts/4.5/style.css | 0 theme/layouts/6.2/layout.tpl | 0 theme/layouts/6.2/night.css | 0 theme/layouts/6.2/style.css | 0 theme/layouts/7/layout.tpl | 0 theme/layouts/7/style.css | 0 theme/new-comment.tpl | 0 92 files changed, 20 insertions(+), 26 deletions(-) mode change 100644 => 100755 .hgignore mode change 100644 => 100755 admin.php mode change 100644 => 100755 admin/comments.php mode change 100644 => 100755 admin/drafts.php mode change 100644 => 100755 admin/editLink.php mode change 100644 => 100755 admin/editPoll.php mode change 100644 => 100755 admin/editPost.php mode change 100644 => 100755 admin/editQuote.php mode change 100644 => 100755 admin/links.php mode change 100644 => 100755 admin/maintenance.php mode change 100644 => 100755 admin/modquotes.php mode change 100644 => 100755 admin/newLink.php mode change 100644 => 100755 admin/newPoll.php mode change 100644 => 100755 admin/newPost.php mode change 100644 => 100755 admin/pending.php mode change 100644 => 100755 admin/polls.php mode change 100644 => 100755 admin/posts.php mode change 100644 => 100755 admin/quotes.php mode change 100644 => 100755 admin/update.php mode change 100644 => 100755 admin/welcome.php mode change 100644 => 100755 includes/common.php mode change 100644 => 100755 includes/layout.php mode change 100644 => 100755 pages/archive.php mode change 100644 => 100755 pages/delete-comment.php mode change 100644 => 100755 pages/edit-comment.php mode change 100644 => 100755 pages/fuhsdiufgsadiufgaisfioas.php mode change 100644 => 100755 pages/poll-results.php mode change 100644 => 100755 pages/viewPost.php mode change 100644 => 100755 theme/admin/comments.tpl mode change 100644 => 100755 theme/admin/css/hack.css mode change 100644 => 100755 theme/admin/css/ie6.css mode change 100644 => 100755 theme/admin/css/ie7.css mode change 100644 => 100755 theme/admin/css/layout.css mode change 100644 => 100755 theme/admin/css/reset.css mode change 100644 => 100755 theme/admin/css/transdmin.css mode change 100644 => 100755 theme/admin/drafts.tpl mode change 100644 => 100755 theme/admin/footer.tpl mode change 100644 => 100755 theme/admin/header.tpl mode change 100644 => 100755 theme/admin/hgupdate.tpl mode change 100644 => 100755 theme/admin/img/btn_left.gif mode change 100644 => 100755 theme/admin/img/btn_right.gif mode change 100644 => 100755 theme/admin/img/button-submit.gif mode change 100644 => 100755 theme/admin/img/content.gif mode change 100644 => 100755 theme/admin/img/input-shaddow-hover.gif mode change 100644 => 100755 theme/admin/img/input-shaddow.gif mode change 100644 => 100755 theme/admin/img/left-menu-bg.gif mode change 100644 => 100755 theme/admin/img/select_left.gif mode change 100644 => 100755 theme/admin/img/select_right.gif mode change 100644 => 100755 theme/admin/img/top-menu-bg.gif mode change 100644 => 100755 theme/admin/img/top-menu-item-bg.gif mode change 100644 => 100755 theme/admin/img/transdmin-light.gif mode change 100644 => 100755 theme/admin/links.tpl mode change 100644 => 100755 theme/admin/maintenance.tpl mode change 100644 => 100755 theme/admin/modquotes.tpl mode change 100644 => 100755 theme/admin/pending.tpl mode change 100644 => 100755 theme/admin/polls.tpl mode change 100644 => 100755 theme/admin/posts.tpl mode change 100644 => 100755 theme/admin/quotes.tpl mode change 100644 => 100755 theme/admin/welcome.tpl mode change 100644 => 100755 theme/admin/writeLink.tpl mode change 100644 => 100755 theme/admin/writePoll.tpl mode change 100644 => 100755 theme/admin/writePost.tpl mode change 100644 => 100755 theme/admin/writeQuote.tpl mode change 100644 => 100755 theme/css.php mode change 100644 => 100755 theme/css/blog.php mode change 100644 => 100755 theme/css/ie.css mode change 100644 => 100755 theme/css/quotes.css mode change 100644 => 100755 theme/css/website.css mode change 100644 => 100755 theme/footer.tpl mode change 100644 => 100755 theme/fuhsdiufgsadiufgaisfioas.tpl mode change 100644 => 100755 theme/header.tpl mode change 100644 => 100755 theme/holidates.tpl mode change 100644 => 100755 theme/images/fourisland_header_night.png mode change 100644 => 100755 theme/images/header-repeat.png mode change 100644 => 100755 theme/images/header.png mode change 100644 => 100755 theme/images/icons/xhtml_valid.png mode change 100644 => 100755 theme/images/smilies/001_tongue.gif mode change 100644 => 100755 theme/images/smilies/biggrin.gif mode change 100644 => 100755 theme/js/jquery.js mode change 100644 => 100755 theme/layouts/4.5/day.css mode change 100644 => 100755 theme/layouts/4.5/headers.php mode change 100644 => 100755 theme/layouts/4.5/holiday.php mode change 100644 => 100755 theme/layouts/4.5/layout.tpl mode change 100644 => 100755 theme/layouts/4.5/navigation.css mode change 100644 => 100755 theme/layouts/4.5/night.css mode change 100644 => 100755 theme/layouts/4.5/style.css mode change 100644 => 100755 theme/layouts/6.2/layout.tpl mode change 100644 => 100755 theme/layouts/6.2/night.css mode change 100644 => 100755 theme/layouts/6.2/style.css mode change 100644 => 100755 theme/layouts/7/layout.tpl mode change 100644 => 100755 theme/layouts/7/style.css mode change 100644 => 100755 theme/new-comment.tpl diff --git a/.hgignore b/.hgignore old mode 100644 new mode 100755 diff --git a/admin.php b/admin.php old mode 100644 new mode 100755 diff --git a/admin/comments.php b/admin/comments.php old mode 100644 new mode 100755 diff --git a/admin/drafts.php b/admin/drafts.php old mode 100644 new mode 100755 diff --git a/admin/editLink.php b/admin/editLink.php old mode 100644 new mode 100755 diff --git a/admin/editPoll.php b/admin/editPoll.php old mode 100644 new mode 100755 diff --git a/admin/editPost.php b/admin/editPost.php old mode 100644 new mode 100755 diff --git a/admin/editQuote.php b/admin/editQuote.php old mode 100644 new mode 100755 diff --git a/admin/links.php b/admin/links.php old mode 100644 new mode 100755 diff --git a/admin/maintenance.php b/admin/maintenance.php old mode 100644 new mode 100755 diff --git a/admin/modquotes.php b/admin/modquotes.php old mode 100644 new mode 100755 diff --git a/admin/newLink.php b/admin/newLink.php old mode 100644 new mode 100755 diff --git a/admin/newPoll.php b/admin/newPoll.php old mode 100644 new mode 100755 diff --git a/admin/newPost.php b/admin/newPost.php old mode 100644 new mode 100755 diff --git a/admin/pending.php b/admin/pending.php old mode 100644 new mode 100755 diff --git a/admin/polls.php b/admin/polls.php old mode 100644 new mode 100755 diff --git a/admin/posts.php b/admin/posts.php old mode 100644 new mode 100755 diff --git a/admin/quotes.php b/admin/quotes.php old mode 100644 new mode 100755 diff --git a/admin/update.php b/admin/update.php old mode 100644 new mode 100755 diff --git a/admin/welcome.php b/admin/welcome.php old mode 100644 new mode 100755 diff --git a/includes/common.php b/includes/common.php old mode 100644 new mode 100755 index e4321d9..1239c68 --- a/includes/common.php +++ b/includes/common.php @@ -22,40 +22,34 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);} require('headerproc.php'); -include('includes/template.php'); -include('includes/session.php'); -include('includes/maintenance.php'); -include('includes/parsers.php'); -include('includes/xmlrpc/xmlrpc.inc'); -include('includes/specialdates.php'); -include('includes/functions.php'); -include('includes/hits.php'); +include('includes/template.php'); +include('includes/session.php'); +include('includes/maintenance.php'); +include('includes/parsers.php'); +include('includes/xmlrpc/xmlrpc.inc'); +include('includes/specialdates.php'); +include('includes/functions.php'); +include('includes/hits.php'); include('includes/updatePending.php'); -if (isset($_GET['layout'])) -{ - if (!file_exists('theme/layouts/' . basename($_GET['layout']))) - { - $_GET['layout'] = '7'; - } - +if (isset($_GET['layout'])) +{ + if (!file_exists('theme/layouts/' . basename($_GET['layout']))) + { + $_GET['layout'] = '7'; + } + setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); - unset($_GET['layout']); + unset($_GET['layout']); header('Location: ' . getRewriteURL()); - exit; + exit; } -if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) -{ - $usingIE = true; -} else { - if (getLayout() == '7') - { - header('Content-type: application/xhtml+xml'); - $xhtml = true; - } +if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) +{ + $usingIE = true; } ?> diff --git a/includes/layout.php b/includes/layout.php old mode 100644 new mode 100755 diff --git a/pages/archive.php b/pages/archive.php old mode 100644 new mode 100755 diff --git a/pages/delete-comment.php b/pages/delete-comment.php old mode 100644 new mode 100755 diff --git a/pages/edit-comment.php b/pages/edit-comment.php old mode 100644 new mode 100755 diff --git a/pages/fuhsdiufgsadiufgaisfioas.php b/pages/fuhsdiufgsadiufgaisfioas.php old mode 100644 new mode 100755 diff --git a/pages/poll-results.php b/pages/poll-results.php old mode 100644 new mode 100755 diff --git a/pages/viewPost.php b/pages/viewPost.php old mode 100644 new mode 100755 diff --git a/theme/admin/comments.tpl b/theme/admin/comments.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/css/hack.css b/theme/admin/css/hack.css old mode 100644 new mode 100755 diff --git a/theme/admin/css/ie6.css b/theme/admin/css/ie6.css old mode 100644 new mode 100755 diff --git a/theme/admin/css/ie7.css b/theme/admin/css/ie7.css old mode 100644 new mode 100755 diff --git a/theme/admin/css/layout.css b/theme/admin/css/layout.css old mode 100644 new mode 100755 diff --git a/theme/admin/css/reset.css b/theme/admin/css/reset.css old mode 100644 new mode 100755 diff --git a/theme/admin/css/transdmin.css b/theme/admin/css/transdmin.css old mode 100644 new mode 100755 diff --git a/theme/admin/drafts.tpl b/theme/admin/drafts.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/footer.tpl b/theme/admin/footer.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/header.tpl b/theme/admin/header.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/hgupdate.tpl b/theme/admin/hgupdate.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/img/btn_left.gif b/theme/admin/img/btn_left.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/btn_right.gif b/theme/admin/img/btn_right.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/button-submit.gif b/theme/admin/img/button-submit.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/content.gif b/theme/admin/img/content.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/input-shaddow-hover.gif b/theme/admin/img/input-shaddow-hover.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/input-shaddow.gif b/theme/admin/img/input-shaddow.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/left-menu-bg.gif b/theme/admin/img/left-menu-bg.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/select_left.gif b/theme/admin/img/select_left.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/select_right.gif b/theme/admin/img/select_right.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/top-menu-bg.gif b/theme/admin/img/top-menu-bg.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/top-menu-item-bg.gif b/theme/admin/img/top-menu-item-bg.gif old mode 100644 new mode 100755 diff --git a/theme/admin/img/transdmin-light.gif b/theme/admin/img/transdmin-light.gif old mode 100644 new mode 100755 diff --git a/theme/admin/links.tpl b/theme/admin/links.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/maintenance.tpl b/theme/admin/maintenance.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/modquotes.tpl b/theme/admin/modquotes.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/pending.tpl b/theme/admin/pending.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/polls.tpl b/theme/admin/polls.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/posts.tpl b/theme/admin/posts.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/quotes.tpl b/theme/admin/quotes.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/welcome.tpl b/theme/admin/welcome.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/writeLink.tpl b/theme/admin/writeLink.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/writePoll.tpl b/theme/admin/writePoll.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/writePost.tpl b/theme/admin/writePost.tpl old mode 100644 new mode 100755 diff --git a/theme/admin/writeQuote.tpl b/theme/admin/writeQuote.tpl old mode 100644 new mode 100755 diff --git a/theme/css.php b/theme/css.php old mode 100644 new mode 100755 diff --git a/theme/css/blog.php b/theme/css/blog.php old mode 100644 new mode 100755 diff --git a/theme/css/ie.css b/theme/css/ie.css old mode 100644 new mode 100755 diff --git a/theme/css/quotes.css b/theme/css/quotes.css old mode 100644 new mode 100755 diff --git a/theme/css/website.css b/theme/css/website.css old mode 100644 new mode 100755 diff --git a/theme/footer.tpl b/theme/footer.tpl old mode 100644 new mode 100755 diff --git a/theme/fuhsdiufgsadiufgaisfioas.tpl b/theme/fuhsdiufgsadiufgaisfioas.tpl old mode 100644 new mode 100755 diff --git a/theme/header.tpl b/theme/header.tpl old mode 100644 new mode 100755 diff --git a/theme/holidates.tpl b/theme/holidates.tpl old mode 100644 new mode 100755 diff --git a/theme/images/fourisland_header_night.png b/theme/images/fourisland_header_night.png old mode 100644 new mode 100755 diff --git a/theme/images/header-repeat.png b/theme/images/header-repeat.png old mode 100644 new mode 100755 diff --git a/theme/images/header.png b/theme/images/header.png old mode 100644 new mode 100755 diff --git a/theme/images/icons/xhtml_valid.png b/theme/images/icons/xhtml_valid.png old mode 100644 new mode 100755 diff --git a/theme/images/smilies/001_tongue.gif b/theme/images/smilies/001_tongue.gif old mode 100644 new mode 100755 diff --git a/theme/images/smilies/biggrin.gif b/theme/images/smilies/biggrin.gif old mode 100644 new mode 100755 diff --git a/theme/js/jquery.js b/theme/js/jquery.js old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/day.css b/theme/layouts/4.5/day.css old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/headers.php b/theme/layouts/4.5/headers.php old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/holiday.php b/theme/layouts/4.5/holiday.php old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/layout.tpl b/theme/layouts/4.5/layout.tpl old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/navigation.css b/theme/layouts/4.5/navigation.css old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/night.css b/theme/layouts/4.5/night.css old mode 100644 new mode 100755 diff --git a/theme/layouts/4.5/style.css b/theme/layouts/4.5/style.css old mode 100644 new mode 100755 diff --git a/theme/layouts/6.2/layout.tpl b/theme/layouts/6.2/layout.tpl old mode 100644 new mode 100755 diff --git a/theme/layouts/6.2/night.css b/theme/layouts/6.2/night.css old mode 100644 new mode 100755 diff --git a/theme/layouts/6.2/style.css b/theme/layouts/6.2/style.css old mode 100644 new mode 100755 diff --git a/theme/layouts/7/layout.tpl b/theme/layouts/7/layout.tpl old mode 100644 new mode 100755 diff --git a/theme/layouts/7/style.css b/theme/layouts/7/style.css old mode 100644 new mode 100755 diff --git a/theme/new-comment.tpl b/theme/new-comment.tpl old mode 100644 new mode 100755 -- cgit 1.4.1