mt-site Commit - 8280669ab025

26

return $excerpt;

26

return $excerpt;

27

}

27

}

28

29

function datesort($a , $b)

29

function datesort($a, $b)

30

{

30

{

31

if ($a->udate == $b->udate)

31

if ($a->udate == $b->udate)

32

{

32

{

38

39

function utfentities($string)

39

function utfentities($string)

40

{

40

{

41

return htmlentities($string, ENT_COMPAT, ~~'UTF-8'~~);

41

return htmlentities($string, ENT_COMPAT | ENT_XML1);

42

}

42

}

43

44

function _query($s, $byid = false)

44

function _query($s, $byid = false)

110

foreach($s as $k => $v)

110

foreach($s as $k => $v)

111

{

111

{

112

$s[$k]->link = SITE_HOST . SITE_PATH . "/strip/$v->id";

112

$s[$k]->link = SITE_HOST . SITE_PATH . "/strip/$v->id";

113

$s[$k]->title = "Comic [$v->id] \"" . ~~numeric_entities~~(utfentities($v->title)) . '"';

113

$s[$k]->title = "Comic [$v->id] \"" . utfentities($v->title) . '"';

114

$s[$k]->desc = "<![CDATA[$v->chapdesc comic $v->id

114

$s[$k]->desc = "<![CDATA[$v->chapdesc comic $v->id

115

<br/>[<a href=\"http://www.megatokyo.com/\">read...</a>]

115

<br />[<a href=\"http://www.megatokyo.com/\">read...</a>]

116

<br/>[<a href=\"" . $s[$k]->link . "\">permalink</a>]

116

<br />[<a href=\"" . $s[$k]->link . "\">permalink</a>]

117

]]>";

117

]]>";

118

$s[$k]->date = date(DATE_RSS, $v->udate);

118

$s[$k]->date = date(DATE_RSS, $v->udate);

119

$s[$k]->guid = $s[$k]->link;

119

$s[$k]->guid = $s[$k]->link;

130

$rant_query = 'SELECT r.id, r.body, UNIX_TIMESTAMP(r.published) as udate, c.name, r.title

130

$rant_query = 'SELECT r.id, r.body, UNIX_TIMESTAMP(r.published) as udate, c.name, r.title

131

FROM rant r JOIN contributor c ON r.author = c.id

131

FROM rant r JOIN contributor c ON r.author = c.id

132

WHERE r.published <= NOW() AND r.status = "published"

132

WHERE r.published <= NOW() AND r.status = "published"

133

ORDER BY ~~udate~~ DESC LIMIT 5';

133

ORDER BY r.published DESC LIMIT 5';

134

135

$s = _query($rant_query) or die(mysqli_error($link));

135

$s = _query($rant_query) or die(mysqli_error($link));

136

173

174

$f_date = $f_items[0]->date;

174

$f_date = $f_items[0]->date;

175

176

$rfc1123_date = gmdate(~~'D, d M Y H:i:s'~~, $f_items[0]->udate) . ~~' GMT'~~;

176

$rfc1123_date = gmdate(DATE_RFC1123, $f_items[0]->udate);

177

$etag = md5($rfc1123_date);

177

$etag = md5($rfc1123_date);

178

179

/* Conditional Get */

179

/* Conditional Get */

202

202

203

203

204

204

205

205

206

<copyright>Fred Gallagher</copyright>

206

<copyright>Fred Gallagher</copyright>

207

<managingEditor>piro@megatokyo.com (Fred Gallagher)</managingEditor>

207

<managingEditor>piro@megatokyo.com (Fred Gallagher)</managingEditor>

208

<docs>http://cyber.harvard.edu/rss/rss.html</docs>

208

<docs>http://cyber.harvard.edu/rss/rss.html</docs>

210

210

211

211

212

213

<?php ~~if (count($f_items) > 0)~~ foreach ($f_items as $v) { ?>

213

<?php foreach ($f_items as $v) { ?>

214

<item>

214

<item>

215

<title><?php echo $v->title; ?></title>

215

<title><?php echo $v->title; ?></title>

216

216

	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

             	return $excerpt;
             }
-            function datesort($a , $b)
+            function datesort($a, $b)
             {
             	if ($a->udate == $b->udate)
             	{
             function utfentities($string)
             {
-            	return htmlentities($string, ENT_COMPAT, 'UTF-8');
+            	return htmlentities($string, ENT_COMPAT | ENT_XML1);
             }
             function _query($s, $byid = false)
             	foreach($s as $k => $v)
             	{
             		$s[$k]->link = SITE_HOST . SITE_PATH . "/strip/$v->id";
-            		$s[$k]->title = "Comic [$v->id] \"" . numeric_entities(utfentities($v->title)) . '"';
+            		$s[$k]->title = "Comic [$v->id] \"" . utfentities($v->title) . '"';
             		$s[$k]->desc = "<![CDATA[$v->chapdesc comic $v->id
-            					<br/>[<a href=\"http://www.megatokyo.com/\">read...</a>]
+            					<br />[<a href=\"http://www.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]->guid = $s[$k]->link;
             	$rant_query = 'SELECT r.id, r.body, UNIX_TIMESTAMP(r.published) as udate, c.name, r.title
             	               FROM rant r JOIN contributor c ON r.author = c.id
             	               WHERE r.published <= NOW() AND r.status = "published"
-            	               ORDER BY udate DESC LIMIT 5';
+            	               ORDER BY r.published DESC LIMIT 5';
             	$s = _query($rant_query) or die(mysqli_error($link));
             $f_date = $f_items[0]->date;
-            $rfc1123_date = gmdate('D, d M Y H:i:s', $f_items[0]->udate) . ' GMT';
+            $rfc1123_date = gmdate(DATE_RFC1123, $f_items[0]->udate);
             $etag = md5($rfc1123_date);
             /* Conditional Get */
             		<title><?php echo $f_title; ?></title>
             		<link>https://megatokyo.com</link>
             		<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>
             		<lastBuildDate><?php echo $f_date; ?></lastBuildDate>
             		<ttl>15</ttl>
-            <?php if (count($f_items) > 0) foreach ($f_items as $v) { ?>
+            <?php foreach ($f_items as $v) { ?>
             		<item>
             			<title><?php echo $v->title; ?></title>
             			<link><?php echo $v->link; ?></link>