mt-site Commit - 63a80366de05

Merge pull request #6 from mt-site xhtml...

darkmorford -

63a80366de05

Not Reviewed

Context file:

Add another comment

Collapse all files

0 unresolved 0 Resolved

0 General 0 Inline

.gitignore ¶ +5 0

             # Comic images
             strips
+            # Site assets
+            attachments
+            nameplates
+            rantimgs
             # Fred's random extra stuff
             extra
             naishou

archive.php ¶ +1 -1

             	$comics = mysqli_query($link,"SELECT distinct id, title,
             					DATE_FORMAT(published, '%M %D, %Y') AS pubdate
             					FROM strip WHERE published < NOW() ORDER BY id") or die(mysqli_error($link));
             	echo '<div class="content"><h2>Comics by Date</h2><div><ul>';
             	while($comic = mysqli_fetch_assoc($comics))

characters.php ¶ +1 -1

             <p><q>All right, all right!  I still don't feel like finishing these sections, but whatever (grumble)...</q><br />
             piro - fall 2007</p>
             <p>Believe it or not, the (page) is in production and will be incorporated into the new site launch. We just are not including them as part of this beta test
              (because they still need some work).</p>
             </div></div>

external.php ¶ +26 -26

             class MTAPIi
             {
             	private static $db_conn;
             	static function construct($db)
             	{
             		$db_conn = $db;
             		return mysqli_ping($db_conn);
             	}
             	static function destruct()
             	{
             		$db_conn = NULL;
             	}
             	#This just returns the current maximum comic
             	static function getNumStrips()
             	{
             			die("Invalid args: $comic $panel\n");
             			return false;
             		}
             		$script = build_panel_transcript($comic, $panel);
             		if(!$xml)
             		{
             		{
             			return false;
             		}
             		$panels = MTAPIi::getNumPanels($comic);
             		$query = 'SELECT DISTINCT speaker FROM transcript WHERE strip = '.(int)$comic;
             		$query .= ' AND panel = '.(int)$panel;
             		$query .= ' AND speaker NOT LIKE "#%" ';
             			$query .= " AND search != '' ";
             		}
             		$query .= 'ORDER BY speaker';
             		return query_to_array($query);
             	}
             		{
             			return false;
             		}
             		$query = 'SELECT DISTINCT speaker FROM transcript WHERE strip = '.(int)$comic;
             		$query .= ' AND speaker NOT LIKE "#%" ';
             		if($speakersOnly)
             			$query .= " AND search != '' ";
             		}
             		$query .= 'ORDER BY speaker';
             		return query_to_array($query);
             	}
             		$query = 'SELECT description FROM strip_t
             			JOIN strip ON strip.type = strip_t.id
             			WHERE strip.id = '.(int)$comic;
             		$qr = query_to_array($query);
             		return $qr[0];
             	}
             			JOIN strip_t ON meta.type = strip_t.id
             			JOIN strip ON strip.type = strip_t.id
             			WHERE strip.id = '.(int)$comic.' ORDER BY meta_t.id';
             		$qr = query_to_array($query);
             		return $qr;
             	}
             	static function getStrip($comic)
             	{
             		if(!validate_comic_id($comic))
             		$strip = load_strip($comic);
             		$strip['type'] = self::getStripTypeName($strip['type']);
             		$strip['number'] = self::getStripNumberInType($comic);
             		unset($strip['udate']);
             		return $strip;
             	}
             	static function getStripNumberInType($comic)
             	{
             		if(!validate_comic_id($comic))
             		{
             			return false;
             		}
             		$type = self::getStripType($comic);
             		$query = "SELECT count(*)
             			FROM strip_t JOIN strip ON strip_t.id = strip.type
             			WHERE strip.id < {$comic}+1
             			AND strip.type = {$type}";
             		$qr = query_to_array($query);
             		return $qr[0];
             	}
             			JOIN strip_t ON meta.type = strip_t.id
             			JOIN strip ON strip.type = strip_t.id
             			WHERE strip.id = '.(int)$comic.' ORDER BY meta_t.name';
             		$qr = query_to_array($query);
             		return $qr;
             	}
             		{
             			return false;
             		}
             		$query = 'SELECT meta_t.id FROM meta_t
             			JOIN meta ON meta_t.id = meta.meta
             			JOIN strip_t ON meta.type = strip_t.id
             			WHERE strip_t.id = '.(int)$type.' ORDER BY meta_t.id';
             		$qr = query_to_array($query);
             		return $qr;
             	}
             		{
             			return false;
             		}
             		$query = 'SELECT meta_t.name FROM meta_t
             			JOIN meta ON meta_t.id = meta.meta
             			JOIN strip_t ON meta.type = strip_t.id
             			WHERE strip_t.id = '.(int)$type.' ORDER BY meta_t.name';
             		$qr = query_to_array($query);
             		return $qr;
             	}
             		{
             			return false;
             		}
             		$query = 'SELECT strip.id FROM strip WHERE strip.type = '.(int)$type.' ORDER BY strip.id';
             		$qr = query_to_array($query);
             		return $qr;
             		{
             			return false;
             		}
             		$query = 'SELECT strip.id FROM strip
             			JOIN strip_t ON strip.type = strip_t.id
             			JOIN meta ON strip_t.id = meta.type

frontend.inc.php ¶ +14 -14

             	{
             		return false;
             	}
             	$rs = mysqli_query($link,'SELECT MAX(panel) FROM transcript WHERE strip = '.(int)$comic);
             	return current(mysqli_fetch_row($rs));
             }
             function build_panel_transcript($comic, $panel)
             {
             	$query = 'SELECT speaker, speech FROM transcript
             		WHERE strip = '.(int)$comic.' AND panel = '.(int)$panel.'
             		AND speaker NOT LIKE "#%" ORDER BY line';
             	$qr = query_to_nested($query);
             	return $qr;
             }
             		$ret[]= $row;
             	}
             	mysqli_free_result($rs);
             	return $ret;
             }
             		$ret[]= $row[0];
             	}
             	mysqli_free_result($rs);
             	return $ret;
             }
             {
             	if(!PERFORM_CONDITIONAL_CACHE)
             		return;
             	$f_date = gmdate( 'D, d M Y H:i:s T', $mtime );
             	header("Last-Modified: $f_date");
             			}
             			error_log( $message, 0 ); // Log to Syslog
             			$message .= "\r\n\r\nBacktrace:";
             			$backtrace = array_reverse(debug_backtrace());
             			$i=2;
             			$message .= "\r\n1:  " . $err_context . " at $errfile:$errline";
             			foreach($backtrace as $k=>$call) {
             				$message .= "\r\n" . str_pad("$i:", $i+4 ) . $call['function'] . '( ' . implode(', ', $call['args'])  . ' ) at ' . $call['file'] . ':' . $call['line'];
             				$i++;
             			}
             			$message .= "\r\n";
             			$message .= "\r\nRequest Details:"
             					. "\r\nscript_url: " . $_SERVER["SCRIPT_URL"]
             					. "\r\nquery_string: " . $_SERVER["QUERY_STRING"]
             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
-            	<meta charset="utf-8" />
+            	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
             	<meta name="description" content="MegaTokyo the Comic" />
             	<meta name="author" content="Frederick M. Gallagher III" />
             	<meta name="generator" content="Alan J Castonguay, Robert Sherby, Jeremy Wagner-Kaiser, Shawn Morford (!! nathanbp, jrl !!)" />
             	<link type="image/x-icon" rel="shortcut icon" href="favicon.ico" />
             	<link type="text/css" rel="stylesheet" href="styles/main.css" />
             	<link type="text/css" rel="stylesheet" href="styles/<?php echo $caller ?>.css" />
             	<?php
             		if($style != '')
             		{
             	<link type="application/rss+xml" rel="alternate" title="Strips Only" href="rss/strips.xml" />
             	<link type="application/rss+xml" rel="alternate" title="Rants Only" href="rss/rants.xml" />
             	<link type="application/rss+xml" rel="alternate" title="Strips and Rants" href="rss/megatokyo.xml" />
             	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
             	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
             	<script type="text/javascript" src="index.js"></script><?php /*
             <script type='text/javascript' src='<?php echo ADS_HOST, ADS_PATH ?>/www/delivery/spcjs.php?id=1'></script> */ ?>
             	<script type="text/javascript" src="resources.js"></script>
             		all rights reserved.</p>
             		<p>'megatokyo' is a registered trademark of
             		<a href="http://www.fredart.com">fredart studios llc</a>.</p>
             	</div><?php
             }

index.php ¶ +2 -2

             						$tmp = explode(':', $qr[0]);
             						$tooltip .= $tmp[0].", Number ".$qr[1].", ".$STRIP['pubdate'];
             					}
             					$alttext = "Strip ".$EFFECTIVE_ID;
             					if($STRIP['book'])
             						$alttext .= ", Volume ".$STRIP['book'];
             					if($STRIP['page'])
             						$alttext .= ", Page ".$STRIP['page'];

mtapi.php ¶ +4 -4

             		}
             	}
             	write($xml, $data);
             	$xml->endElement();
             	return $xml->outputMemory(true);
             }
             if( $API->hasMethod($_GET['method']) ) {
             	$method = $API->getMethod($_GET['method']);
             	$parameters = $method->getParameters();
             	$method_parameters = Array();
             	foreach($parameters as $parameter) {
             		$param = (Array) $parameter;
             			printf( 'Parameter %s is required but not supplied', $parameter_name );
             		}
             	}
             	$result = $method->invokeArgs($API, $method_parameters);
             	switch($_GET['output-type']) {
             		case 'json':
             			$result = json_encode($result);

navswitch.js ¶ +6 -6

             	f = document.getElementById('searchprevnext');
             	f.style.display="none";
             	b = document.getElementById('q');
             	for( i=0; i<b.form.elements.length; i++ ) {
             		if( b.form.elements[i].type=="checkbox" ) {
             			b.form.elements[i].onclick = navrecheck;
             		}
             	}
             	b.onblur = navrecheck;
             	b.onchange = navrecheck;
             	b.onkeyup = navrecheck;
             	b = document.getElementById('q');
             	n = document.getElementById('normalprevnext');
             	f = document.getElementById('searchprevnext');
             	find = b.value;
             	if(!find ) {
             		for( i=0; i<b.form.elements.length; i++ ) {
             				find = 1;
             				break;
             			}
+            		}
             	}
             	if( find ) {
             		n.style.display="none";
             		f.style.display="";
             		n.style.display="";
             		f.style.display="none";
             	}
             }
             navwait('q');

rant-archive.php ¶ +4 -4

             											AND rant.status = 'published' ORDER BY rant.published") or die(mysqli_error($link));
             	echo '<div class="content"><h2>Rants by Date</h2><div><ol>';
             	while($rant = mysqli_fetch_assoc($rants))
             	{
             		printf('<li><a title="%s" name="%d" href="./rant/%d">%s - %s</a></li>', $rant['pubdate'], $rant['id'], $rant['id'],
             			$rant['author'], utfentities($rant['title']));
             	}
             	echo '</ol></div></div>';
             }
             else
             		?></ul></div>
             	</div>
             	<?php
             	mysqli_data_seek($AUTHORS, 0);
             	while ($author = mysqli_fetch_assoc($AUTHORS)) {
             		$rants = mysqli_query($link,"SELECT distinct id, title,
             		if (mysqli_num_rows($rants) <= 0)
             					continue;
             		echo '<div class="content"><h2><a id="', $author['name'], '">', utfentities($author['name']), '</a></h2><div><ol>';
             		while($rant = mysqli_fetch_assoc($rants))
             		{
             			printf('<li><a title="%s" name="%d" href="./rant/%d">%s</a></li>', $rant['pubdate'], $rant['id'], $rant['id'],

rewrite_searchbox.js ¶ +1 -1

             	var t = checks[4].checked;
             	checks[4].checked = true;
             	checks[4].checked = false;
             	checks[4].checked = t;
             	for(i=0; i<checks.length; i++) {
             		if( checks[i].value == match[1] ) {

rss/rss.old.php ¶ +5 -5

             	$r = mysqli_query($link, $s ) or die( mysqli_error($link) );
             	$ret=array();
             	$i=0;
             	if( $byid ) {
             		while ($row = mysqli_fetch_object($r) )
             			$ret[$row->id] = $row;
             	foreach( $s as $k=>$v ) {
             		$s[$k]->link = 'http://www.megatokyo.com/';
             		$s[$k]->title = "Update: $v->percentage%: " . htmlentities($v->text, ENT_COMPAT, ini_get('default_charset'));
             		$d = date( 'l F jS, H:i', $v->eta );
             		$dd = (int)  (( $v->eta - $v->udate )/3600);
             {
             	$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)
             	{
             		$s[$k]->link = $v->url;
             		<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 ): ?>
             		<item>
             			<title><?php echo $v->title; ?></title>
             		</item>
             <?php endforeach; ?>
             	</channel>
             </rss>

rss/rss.php ¶ +5 -6

             	$r = mysqli_query($link, $s ) or die( mysqli_error($link) );
             	$ret=array();
             	$i=0;
             	if( $byid ) {
             		while ($row = mysqli_fetch_object($r) )
             			$ret[$row->id] = $row;
             	foreach( $s as $k=>$v ) {
             		$s[$k]->link = 'http://www.megatokyo.com/';
             		$s[$k]->title = "Update: $v->percentage%: " . htmlentities($v->text, ENT_COMPAT, ini_get('default_charset'));
             		$d = date( 'l F jS, H:i', $v->eta );
             		$dd = (int)  (( $v->eta - $v->udate )/3600);
             {
             	$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)
             	{
             		$s[$k]->link = $v->url;
             		<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 ): ?>
             		<item>
             			<title><?php echo $v->title; ?></title>
             		</item>
             <?php endforeach; ?>
             	</channel>
             </rss>

search-help.php ¶ +1 -1

             	<?php pagefoot(); ?>
             </body>
-            </html>
  No newline at end of file
+            </html>

search.php ¶ +44 -44

             if(isset($_REQUEST['q']))
             {
             	if( isset($_GET['method-fp_x']) || isset($_GET['method-fp_y'])
             			|| isset($_GET['method-fp.x']) || isset($_GET['method-fp.y']) ) {
             		array_push($magic, 'max');
             		array_push($value, $_GET['current'] - 1);
             		array_push($magic, 'method');
             		array_push($value, 'Find Previous');
             	}
             	if( isset($_GET['method-fn_x']) || isset($_GET['method-fn_y'])
             			|| isset($_GET['method-fn.x']) || isset($_GET['method-fn.y']) ) {
             		array_push($magic, 'min');
             		array_push($value, $_GET['current'] + 1);
             		array_push($magic, 'method');
             		array_push($value, 'Find Next');
             	}
             			$_REQUEST['q'] = trim("$_REQUEST[q] $k:\"$v\"");
             		}
             	}
             	if(get_magic_quotes_gpc())
             		$_REQUEST['q'] = stripslashes($_REQUEST['q']);
             	$tokens = tpw_parse_line('\s+', $_REQUEST['q']);
             	# Protect against SQL injection in the event of Register Globals being on.
             	$SEARCH_MIN = $SEARCH_MAX = null;
             	foreach($tokens as $token) {
             		$token = strtolower($token);
             		}
             		$subtokens = preg_match('/(?:\w+|[#*]):/', $token) ? preg_split('/:/', $token, 2) : Array( false, $token );
             		# Magic values are easy, just throw them on the list
             		array_push($loop_magic, $subtokens[0]);
             		# Values, however, need a bit more cleaning up first
             		if('""' == $subtokens[1])
             			array_push($loop_value, '""');
             		else
             			array_push($loop_value, preg_replace('/[[:punct:]]|(?<=\s)\s+/', '', $subtokens[1]));
             	}
             	#DEBUG
             	#print_r($magic);
             	#echo "<br>";
             					  WHERE (strip.published < NOW())
             					  AND (transcript.speaker NOT LIKE \"#%\"
             						OR transcript.speaker IS NULL) ";
             			$flag = false;
             			if($m)  #attempt to short-circuit on no magic
             			{
             				# well, we have magic
             					$flag = true;
             				}
             			}
             			#now, handle the $value portion of the string
             			# first, handle for ""
             			switch($sub_value[$i]) {
             					}
             					$query.=") ";
             			}
             			array_push($sub_queries, $query);
             		}
             		foreach($sub_queries as $q)
             		{
             			#DEBUG: run the search
             			#echo $q;
             			$result = mysqli_query($link,$q);
             			if(!$result)
             			{
             				continue;
             			}
             			while($row = mysqli_fetch_row($result))
             			{
             				#and put all the hits onto an array
             				  WHERE (strip.published < NOW())
             				  AND (transcript.speaker NOT LIKE \"#%\"
             					OR transcript.speaker IS NULL) ";
             		$flag = false;
             		if($m)  #attempt to short-circuit on no magic
             		{
             			# well, we have magic
             				$flag = true;
             			}
             		}
             		#now, handle the $value portion of the string
             		# first, handle for ""
             		switch($value[$i]) {
             				}
             				$query.=") ";
             		}
             		array_push($queries, $query);
             	}
             	if(count($queries) == 0)
             	{
             		array_push($queries, $query);
             		#second, collapse them into one clause
             		$modifier .= " AND (" . implode(" OR ", $SEARCH_TEMP) . ") ";
             	}
             	#now the metatypes, just like the types
             	if(count($META_TYPES) > 0)
             	{
             		#second, collapse them into one clause
             		$modifier .= " AND (" . implode(" OR ", $META_TEMP) . ") ";
             	}
             	#now do min and max
             	if(isset($SEARCH_MIN))
             	{
             	{
             		$modifier .= "AND (strip.id <= $SEARCH_MAX) ";
             	}
             	#and now book and page
             	if(isset($BOOK))
             	{
             	{
             		$modifier .= $PAGE;
             	}
             	foreach($queries as $q)
             	{
             		#apply modifiers
             			continue;
             		}
             		$result = mysqli_query($link,$q);
             		if(!$result)
             		{
             			continue;
             		}
             		while($row = mysqli_fetch_row($result))
             		{
             			#and put all the hits onto an array
             	#so, now all the raw hits are in the same spot
             	#now comes The Magic
             	# if book and page are used, break out
             	if(isset($BOOK) && isset($PAGE) && count($rhits) != 0)
             	{
             		header('Location: ' . SITE_HOST . SITE_PATH . "/strip/$rhits[0]");
             		exit(0);
             	}
             	#first, reverse sort and uniquify a copy
             	rsort($rhits);
             	$uhits = array_unique($rhits);
             	#do the same for the subtraction hits
             	$sub_uhits = array_unique($sub_rhits);
             	#now... the subtraction!
             	$uhits = array_diff($uhits, $sub_uhits);
             	#if we're redirecting, break out of the normal search logic here
             	if(isset($METHOD) && count($uhits) > 0)
             	{
             		{
             			$target = $rhits[0];
             		}
             		//die($METHOD);
             		header('HTTP/1.0 301 Moved Permanently');
             		header('Location: ' . SITE_HOST . SITE_PATH . "/index.php?strip_id=$target" . "&q=" . urlencode($_REQUEST['q']));
             		exit(0);
             	}
             	$revhits = array_reverse($rhits);
             	#now create a count for each unique hit
             	foreach($uhits as $key => $value)
             	{
             		$first = array_search($value, $rhits);
             		$last = array_search($value, $revhits);
             		$numhits = count($rhits) - $first - $last;
             		array_push($hcount, $numhits);
             	}
             	if(count($uhits) > 0) {
             		if($random)
             		{
             			$entry.= " - ". htmlentities($result[1]) . "</a></li>";
             			array_push($strings, $entry);
             		}
             		#now, a clever multisort...
             		array_multisort($hcount, SORT_DESC, SORT_NUMERIC,
             			$uhits, SORT_DESC, SORT_NUMERIC,
             		<input type="submit" value="Search" />
             	</div></form>
             	<?php if(count($uhits) > 0) {
             		echo '<div class="content"><div><ol class="results">';
             		/*$qsearch = mysqli_query($link,'SELECT id, title FROM strip WHERE id IN(' . implode(', ', $uhits) . ')');
             		while($result = mysqli_fetch_array($qsearch))
             		}
             		echo '</ol></div>';
             		echo '<div><p class="results"><a href="search_help">Learn to direct search ninjas!</a></p></div></div>';
             		?>
             	<form class="search" action="search.php" method="get"><div>
             		<input type="text" name="q" <?php if( $_REQUEST['q'] ) { printf('value="%s"', utfentities($_REQUEST['q']) ); } ?> />
             		<input type="submit" value="Search" />
             	</div></form>
             		<?php
             	} elseif(isset($_REQUEST['q']) && (strlen($_REQUEST['q']) > 0)) {
             		echo '<div class="content"><div><p class="results">So sorry. Search ninjas obey without fail, yet find nothing.</p></div>';
             		echo '<div class="content"><div><p class="results"><a href="search_help">Learn to direct search ninjas!</a></p></div></div>';
             	}
             	#search_help();
             	?>
             	<?php pagefoot() ?>

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