Fixed voting issue

Because XHTML was accidentally disabled in the previous changeset, a new error was found that, when in HTML mode (required for IE and layouts prior to 7),
voting did not work due to the encoded ampherstand in the query string. This is odd because what works in XHTML should also work in HTML. So, to fix this,
XHTML was re-enabled and now the ampherstand is only encoded when XHTML mode is on.

Also fixed some positioning errors with the tails of bubbles.

12 files changed, 64 insertions, 32 deletions

@@ -22,21 +22,6 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 

 require('headerproc.php');

 

-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']);

-
-        header('Location: ' . getRewriteURL());
-        exit;

-}

-

 $template = new FITemplate('layouts/' . getLayout() . '/layout');

 

 $template->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none');

@@ -20,14 +20,6 @@
 

 require('headerproc.php');

 

-if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched))

-{

-        header('Content-type: text/html');

-        $usingIE = true;

-} else {

-//      header('Content-type: application/xhtml+xml');

-}

-

 header('X-Pingback: http://fourisland.com/xmlrpc.php');

 

 include('../security/config.php');

@@ -42,6 +34,32 @@ 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';

+        }

+

+        setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com');
+
+        unset($_GET['layout']);

+
+        header('Location: ' . getRewriteURL());
+        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 (strpos($_SERVER['REQUEST_URI'],'index.php'))
 {
         header('Location: ' . getRewriteURL());
@@ -29,6 +29,9 @@ if (isset($_GET['post']))
 {
         $template = new FITemplate('post');
         $template->adds_block('INTERNAL',array('exi'=>1));
+        $template->add('IFXAMP', $xhtml ? '&' : '&');
+        $template->add('IFXLT', $xhtml ? '&lt;' : '<');
+        $template->add('IFXGT', $xhtml ? '&gt;' : '>');
 
         $getpost = "SELECT * FROM updates WHERE slug = \"" . urldecode($_GET['post']) . "\"";
         $getpost2 = mysql_query($getpost);
@@ -187,7 +187,11 @@ if (isset($_GET['id']) && !(is_numeric($_GET['id'])))
 
 function quote_generation($query, $origin, $page = 1, $quote_limit = 50, $page_limit = 10)
 {
+        global $xhtml;
+
         $template = new FITemplate('quotes/browse');
+        $template->add('IFXAMP', $xhtml ? '&amp;' : '&');
+
         if ($page != -1)
         {
                 $template->adds_block('PAGENUMBERS',array('exi'=>1));
@@ -31,6 +31,9 @@ $hatNav = array(        array(  'title' => 'Archive',
 
 $template = new FITemplate('post');
 $template->adds_block('EXTERNAL',array('exi'=>1));
+$template->add('IFXAMP', $xhtml ? '&amp;' : '&');
+$template->add('IFXLT', $xhtml ? '&lt;' : '<');
+$template->add('IFXGT', $xhtml ? '&gt;' : '>');
 
 $curID = 0;
 
@@ -1,8 +1,6 @@
-<a name="comments" />
+<a name="comments"></a>
 
 <!--BEGIN COMMENTS-->
-<a name="comment-<!--COMMENTS.ID-->" />
-
 <!--BEGIN COMMENTS.EDITOR-->
 <form action="/edit-comment.php?id=<!--COMMENTS.ID-->" method="post">
 <!--END COMMENTS.EDITOR-->
@@ -8,7 +8,6 @@
 
 div.module + cite {
         position: relative;
-        top: -0.15em;
         left: 0.2em;
         margin: 0;
         padding: 15px 0px 0px 15px;
@@ -18,7 +17,6 @@ div.module + cite {
 }
 
 div.module.unrounded + cite {
-        top: -0.5em;
         padding-top: 10px;
 }
 
@@ -231,3 +231,11 @@ div#flash {
 * > html div#flash {
  position: absolute;
 }
+
+div.module + cite {
+        top: -0.15em;
+}
+
+div.module.unrounded + cite {
+        top: -0.4em;
+}
@@ -245,3 +245,11 @@ span.post-vote {
  position: relative;
  top: -20px;
 }
+
+div.module + cite {
+        top: -0.15em;
+}
+
+div.module.unrounded + cite {
+        top: -0.4em;
+}
@@ -181,3 +181,10 @@ div#sidebar ul li.active a, div#sidebar ul li a:hover {
         color: black;
 }
 
+div.module + cite {
+        top: -0.4em;
+}
+
+div.module.unrounded + cite {
+        top: -0.7em;
+}
@@ -7,13 +7,13 @@
 
 function ratePost(id, dir)
 {
-        jQuery("#post-"+id+" .post-rating-up").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_up.png' alt='+1' /&gt;");
-        jQuery("#post-"+id+" .post-rating-down").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_down.png' alt='-1' /&gt;");
+        jQuery("#post-"+id+" .post-rating-up").addClass("post-action-done").html("<!--IFXLT-->img src='/theme/images/icons/thumb_up.png' alt='+1' /<!--IFXGT-->");
+        jQuery("#post-"+id+" .post-rating-down").addClass("post-action-done").html("<!--IFXLT-->img src='/theme/images/icons/thumb_down.png' alt='-1' /<!--IFXGT-->");
         jQuery("#flash").text("Processing....").slideDown();
         jQuery.ajax({
                 type: "GET",
                 url: "/vote.php",
-                data: "id="+id+"&amp;dir="+dir,
+                data: "id="+id+"<!--IFXAMP-->dir="+dir,
                 dataType: "text",
                 success: function(msg) {
                         if (msg != "")
@@ -10,7 +10,7 @@ function voteQuote(id, dir)
         jQuery.ajax({
                 type: "GET",
                 url: "/quotes/vote.php",
-                data: "id="+id+"&amp;dir="+dir,
+                data: "id="+id+"<!--IFXAMP-->dir="+dir,
                 dataType: "text",
                 success: function(msg) {
                         if (msg != "")