mt-site Commit - 5608f9586369

Merge pull request #18 from mt-site rss-hotfix...

darkmorford -

5608f9586369

Not Reviewed

Context file:

Add another comment

Collapse all files

0 unresolved 0 Resolved

0 General 0 Inline

rss/rss.php ¶ +96 -60

             require_once('../LocalSettings.php');
             /* Get the database working */
-            $link = mysqli_connect(DB_SERVER, DB_READ_USER, DB_READ_PASS, DB_NAME) or trigger_error('Problem connecting to the SQL database server: '.mysqli_error($link), E_USER_ERROR);
+            $link = mysqli_connect(DB_SERVER, DB_READ_USER, DB_READ_PASS, DB_NAME)
+            	or trigger_error('Problem connecting to the SQL database server: ' . mysqli_error($link), E_USER_ERROR);
-            function numeric_entities($string){
+            function numeric_entities($string)
+            {
                 $mapping = array();
-                foreach (get_html_translation_table(HTML_ENTITIES, ENT_QUOTES) as $char => $entity){
+                foreach (get_html_translation_table(HTML_ENTITIES, ENT_QUOTES) as $char => $entity)
+            	{
                     $mapping[$entity] = '&#' . ord($char) . ';';
                 }
                 return str_replace(array_keys($mapping), $mapping, $string);
             }
-            function Excerpt( $excerpt ) {
+            function Excerpt($excerpt)
-            	$excerpt = strip_tags( $excerpt );
-            	if (strlen($excerpt) > 455) {
+            	$excerpt = strip_tags($excerpt);
-            		$excerpt = substr($excerpt,0,452) . '...';
+            	if (strlen($excerpt) > 455)
+            	{
+            		$excerpt = substr($excerpt, 0, 452) . '...';
             	}
             	return $excerpt;
             }
-            function datesort( $a , $b ) {
+            function datesort($a, $b)
-            	if( $a->udate == $b->udate ) return 0;
-            	return( $a->udate > $b->udate ) ? -1 : 1;
+            	if ($a->udate == $b->udate)
+            	{
+            		return 0;
+            	}
+            	return ($a->udate > $b->udate) ? -1 : 1;
             }
             function utfentities($string)
             {
-            	return htmlentities($string, ENT_COMPAT, 'UTF-8');
+            	return htmlentities($string, ENT_COMPAT | ENT_XML1);
             }
-            function _query( $s, $byid = false ) {
+            function _query($s, $byid = false)
+            {
             	global $link;
-            	$r = mysqli_query($link, $s ) or die( mysqli_error($link) );
+            	$r = mysqli_query($link, $s) or die(mysqli_error($link));
-            	$ret=array();
+            	$ret = array();
-            	$i=0;
+            	$i = 0;
-            	if( $byid ) {
+            	if ($byid)
-            		while ($row = mysqli_fetch_object($r) )
+            		while ($row = mysqli_fetch_object($r))
+            		{
             			$ret[$row->id] = $row;
-            	} else {
-            		while ($row = mysqli_fetch_object($r) )
+            	else
+            	{
+            		while ($row = mysqli_fetch_object($r))
+            		{
             			$ret[$i++] = $row;
+            		}
             	}
             	return $ret;
             }
             	$f_items = array_merge( $f_items, $s );
             }*/
-            if( $type == 'strips' or $type == '') {
+            if ($type == 'strips' or $type == '')
+            {
             	$f_title = 'Megatokyo Comics';
-            	$s = _query("SELECT DISTINCT s.id, UNIX_TIMESTAMP(s.published) as udate, t.description as chapdesc, t.name as chapname, s.title
-            			FROM media_t media, strip s, strip_t t
+            	$comic_query = 'SELECT s.id, UNIX_TIMESTAMP(s.published) as udate, t.description as chapdesc, t.name as chapname, s.title
-            			WHERE s.media = media.id AND s.published < NOW()
+            	                FROM strip s JOIN strip_t t ON s.type = t.id
-            			  AND s.type = t.id
+            	                WHERE s.published <= NOW()
-            			ORDER BY s.id DESC LIMIT 5") or die(mysqli_error($link));
+            	                ORDER BY s.id DESC LIMIT 5';
-            	foreach($s as $k=>$v) {
+            	$s = _query($comic_query) or die(mysqli_error($link));
+            	foreach($s as $k => $v)
+            	{
             		$s[$k]->link = SITE_HOST . SITE_PATH . "/strip/$v->id";
-            		#$s[$k]->title = "Comic [$v->id] \"" . utfentities($v->title, ENT_COMPAT, ini_get('default_charset')) . '"';
+            		$s[$k]->title = "Comic [$v->id] \"" . utfentities($v->title) . '"';
-            		$s[$k]->title = "Comic [$v->id] \"" . numeric_entities(utfentities($v->title)) . '"';
             		$s[$k]->desc = "<![CDATA[$v->chapdesc comic $v->id
-            					<br/>[<a href=\"http://www.megatokyo.com/\">read...</a>]
+            					<br />[<a href=\"https://megatokyo.com/\">read...</a>]
-            					<br/>[<a href=\"" . $s[$k]->link . "\">permalink</a>]
+            					<br />[<a href=\"" . $s[$k]->link . "\">permalink</a>]
             					]]>";
-            		$s[$k]->date = date( DATE_RSS, $v->udate );
+            		$s[$k]->date = date(DATE_RSS, $v->udate);
             		$s[$k]->guid = $s[$k]->link;
             		$s[$k]->perm = 'true';
             	}
-            	$f_items = array_merge( $f_items, $s );
+            	$f_items = array_merge($f_items, $s);
             }
-            if( $type == 'rants' or $type == '' ) {
+            if ($type == 'rants' or $type == '')
+            {
             	$f_title = 'Megatokyo Rants';
-            	$contributers = _query("SELECT * FROM contributor", true);
-            	$s = _query("SELECT r.id, r.body as body, UNIX_TIMESTAMP(r.published) as udate, r.author as authorno, r.title
+            	$rant_query = 'SELECT r.id, r.body, UNIX_TIMESTAMP(r.published) as udate, c.name, r.title
-            			FROM rant r
+            	               FROM rant r JOIN contributor c ON r.author = c.id
-            			WHERE r.published < NOW()
+            	               WHERE r.published <= NOW() AND r.status = "published"
-            			AND r.status = 'published'
+            	               ORDER BY r.published DESC LIMIT 5';
-            			ORDER BY udate DESC LIMIT 5");
-            	foreach($s as $k=>$v) {
+            	$s = _query($rant_query) or die(mysqli_error($link));
+            	foreach($s as $k => $v)
+            	{
             		$s[$k]->link = SITE_HOST . SITE_PATH . "/rant/$v->id";
-            		$s[$k]->author = utfentities( $contributers[$v->authorno]->name, ENT_COMPAT, ini_get('default_charset') );
+            		$s[$k]->author = utfentities($v->name);
-            		$s[$k]->title = "Rant [$v->id] \"" . utfentities($v->title, ENT_COMPAT, ini_get('default_charset')) . '"';
+            		$s[$k]->title = "Rant [$v->id] \"" . utfentities($v->title) . '"';
             		$s[$k]->desc = "<![CDATA[" . Excerpt($v->body) . "<p>[<a href=\"" . $s[$k]->link . "\">permalink</a>]</p>]]>";
-            		$s[$k]->date = date( DATE_RSS, $v->udate );
+            		$s[$k]->date = date(DATE_RSS, $v->udate);
             		$s[$k]->guid = $s[$k]->link;
             		$s[$k]->perm = 'true';
             	}
-            	$f_items = array_merge( $f_items, $s );
+            	$f_items = array_merge($f_items, $s);
             }
-            if( $type == '' )
+            if ($type == '')
             {
             	$f_title = 'Megatokyo Comics and News';
+            	/*
             	$s = _query("SELECT UNIX_TIMESTAMP(published) as udate, body, url FROM rss_comment ORDER BY published DESC LIMIT 5");
-            	foreach($s as $k=>$v)
+            	foreach($s as $k => $v)
             	{
             		$s[$k]->link = $v->url;
             		$s[$k]->title = $v->body;
             		$s[$k]->desc = '';
             		$s[$k]->perm = 'false';
             	}
             	$f_items = array_merge( $f_items, $s );
+            	*/
             }
-            usort( $f_items, 'datesort' );
+            usort($f_items, 'datesort');
             $f_date = $f_items[0]->date;
-            $rfc1123_date = gmdate( 'D, d M Y H:i:s ', $f_items[0]->udate ) . 'GMT';
+            $rfc1123_date = gmdate('D, d M Y H:i:s T', $f_items[0]->udate);
-            $etag = md5( $rfc1123_date );
+            $etag = md5($rfc1123_date);
             /* Conditional Get */
-            header( "Last-Modified: $rfc1123_date" );
+            header("Last-Modified: $rfc1123_date");
-            header( "ETag: \"$etag\"");
+            header("ETag: \"$etag\"");
-            if( isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $rfc1123_date ) {
+            if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $rfc1123_date)
+            {
             	header('HTTP/1.0 304 Not Modified');
             	exit;
             }
-            if( isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag ) {
+            if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag)
+            {
             	header('HTTP/1.0 304 Not Modified');
             	exit;
             }
             header("XX-Powered-By: Nikuman");
-            header("Content-Type: application/rss+xml;charset=utf-8");
+            header("Content-Type: application/rss+xml; charset=utf-8");
             echo '<?xml version="1.0" encoding="utf-8"?>', "\n";
             ?>
-            <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+            <rss version="2.0">
             	<channel>
             		<title><?php echo $f_title; ?></title>
-            		<link>http://www.megatokyo.com</link>
+            		<link>https://megatokyo.com</link>
-            		<atom:link href="<?php echo SITE_HOST . $_SERVER['REQUEST_URI'] ?>" rel="self" type="application/rss+xml" />
             		<description><?php echo $f_desc; ?></description>
-            		<language>en-us</language>
+            		<language>en-US</language>
             		<copyright>Fred Gallagher</copyright>
             		<managingEditor>piro@megatokyo.com (Fred Gallagher)</managingEditor>
+            		<docs>http://cyber.harvard.edu/rss/rss.html</docs>
             		<pubDate><?php echo $f_date; ?></pubDate>
             		<lastBuildDate><?php echo $f_date; ?></lastBuildDate>
             		<ttl>15</ttl>
-            <?php if( count( $f_items )) foreach( $f_items as $v ): ?>
+            <?php foreach ($f_items as $v) { ?>
             		<item>
             			<title><?php echo $v->title; ?></title>
             			<link><?php echo $v->link; ?></link>
             			<guid isPermaLink="<?php echo $v->perm; ?>"><?php echo $v->guid; ?></guid>
             			<pubDate><?php echo $v->date; ?></pubDate>
             		</item>
-            <?php endforeach; ?>
+            <?php } ?>
             	</channel>
             </rss>

rss/rss.old.php ¶ removed 0 -183

NO CONTENT: file was removed

Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings