From bc6a1d8cc900c4a52b84c840ea0ddc156a4a79a0 Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Thu, 28 Jan 2010 00:07:39 +0000
Subject: [PATCH] Added support for OPML.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@453 2b68903e-0b30-0410-9a39-a2e4f3c5be39
---
 inc/rssfeed.php     | 35 +++++++++++++++++++++++++++--------
 inc/versioninfo.php |  6 +++---
 rss.php             |  9 +++++----
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/inc/rssfeed.php b/inc/rssfeed.php
index 797c933..d5b3568 100644
--- a/inc/rssfeed.php
+++ b/inc/rssfeed.php
@@ -8,10 +8,10 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     Revised BSD License for more details.
 
-    Copyright 2004-2009 iDB Support - http://idb.berlios.de/
-    Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
+    Copyright 2004-2010 iDB Support - http://idb.berlios.de/
+    Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: rssfeed.php - Last Update: 12/10/2009 SVN 391 - Author: cooldude2k $
+    $FileInfo: rssfeed.php - Last Update: 01/27/2010 SVN 453 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="rssfeed.php"||$File3Name=="/rssfeed.php") {
@@ -22,8 +22,8 @@ if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
 $boardsname = htmlentities($Settings['board_name'], ENT_QUOTES, $Settings['charset']);
 $boardsname = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $boardsname);
 $_GET['feedtype'] = strtolower($_GET['feedtype']);
-if($_GET['feedtype']!="rss"&&$_GET['feedtype']!="atom"&&
-	$_GET['feedtype']!="oldrss"&&$_GET['feedtype']!="opensearch") { 
+if($_GET['feedtype']!="rss"&&$_GET['feedtype']!="atom"&&$_GET['feedtype']!="oldrss"&&
+	$_GET['feedtype']!="opml"&&$_GET['feedtype']!="opensearch") { 
 	$_GET['feedtype'] = "rss"; }
 //$basepath = pathinfo($_SERVER['REQUEST_URI']);
 /*if(dirname($_SERVER['REQUEST_URI'])!="."||
@@ -64,6 +64,7 @@ $checkfeedtype = "application/rss+xml";
 if($_GET['feedtype']=="oldrss") { $checkfeedtype = "application/xml"; }
 if($_GET['feedtype']=="rss") { $checkfeedtype = "application/rss+xml"; }
 if($_GET['feedtype']=="atom") { $checkfeedtype = "application/atom+xml"; }
+if($_GET['feedtype']=="opml") { $checkfeedtype = "text/x-opml"; }
 if($_GET['feedtype']=="opensearch") { $checkfeedtype = "application/opensearchdescription+xml"; }
 if(stristr($_SERVER["HTTP_ACCEPT"],$checkfeedtype) ) {
 header("Content-Type: ".$checkfeedtype."; charset=".$Settings['charset']); }
@@ -78,6 +79,9 @@ $prequery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."forums\" WHE
 $preresult=sql_query($prequery,$SQLStat);
 $prenum=sql_num_rows($preresult);
 $prei=0;
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
+ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
+gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $ForumID=sql_result($preresult,0,"id");
 $ForumName=sql_result($preresult,0,"Name");
 $ForumName = htmlentities($ForumName, ENT_QUOTES, $Settings['charset']);
@@ -174,6 +178,7 @@ $RSS .= '<item>'."\n".'<pubDate>'.$TheTime.'</pubDate>'."\n".'<author>'.$UsersNa
 ++$i; sql_free_result($presult); }
 sql_free_result($result);
 ++$glti; }
+$endtag = "  <!-- Renee Sabonis ^_^ -->\n";
 xml_doc_start("1.0",$Settings['charset']);
 if($Settings['showverinfo']=="on") { ?>
 <!-- generator="<?php echo $VerInfo['iDB_Ver_Show']; ?>" -->
@@ -224,7 +229,7 @@ if($Settings['showverinfo']=="on") { ?>
 	<title><?php echo $boardsname; ?></title>
 	<link><?php echo $AltBoardURL; ?></link>
    </image>
-   <!-- Renee Sabonis ^_^ -->
+ <?php echo $endtag; ?>
  <?php echo "\n".$RSS."\n"; ?></channel>
 </rss>
 <?php } if($_GET['feedtype']=="atom") { ?>
@@ -240,9 +245,23 @@ if($Settings['showverinfo']=="on") { ?>
    <generator><?php echo $iDB; ?></generator>
    <?php } ?>
   <icon><?php echo $AltBoardURL.$SettDir['inc']; ?>rss.gif</icon>
-  <!-- Renee Sabonis ^_^ -->
+<?php echo $endtag; ?>
  <?php echo "\n".$Atom."\n"; ?>
 </feed>
+<?php } if($_GET['feedtype']=="opml") { ?>
+<opml version="1.0">
+  <head>
+    <dateCreated><?php echo gmdate("d-M-Y"); ?></dateCreated>
+  </head>
+  <body>
+    <?php /*<!--
+	<outline text="<?php echo $ForumName; ?> Topics RSS 1.0 Feed" type="link" url="<?php echo $BoardURL.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" htmlUrl="<?php echo $BoardURL.url_maker($exfile[$ForumType],$Settings['file_ext'],"act=view&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>" xmlUrl="<?php echo $BoardURL.url_maker($exfile['rss'],$Settings['rss_ext'],"act=oldrss&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['rss'],$exqstr['rss']); ?>" />
+	-->*/ ?>
+<outline text="<?php echo $ForumName; ?> Topics RSS 2.0 Feed" type="rss" url="<?php echo $BoardURL.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" htmlUrl="<?php echo $BoardURL.url_maker($exfile[$ForumType],$Settings['file_ext'],"act=view&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>" xmlUrl="<?php echo $BoardURL.url_maker($exfile['rss'],$Settings['rss_ext'],"act=rss&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['rss'],$exqstr['rss']); ?>" />
+    <outline text="<?php echo $ForumName; ?> Topics Atom Feed" type="atom" url="<?php echo $BoardURL.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" htmlUrl="<?php echo $BoardURL.url_maker($exfile[$ForumType],$Settings['file_ext'],"act=view&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>" xmlUrl="<?php echo $BoardURL.url_maker($exfile['rss'],$Settings['rss_ext'],"act=atom&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['rss'],$exqstr['rss']); ?>" />
+  </body>
+</opml>
+<?php echo $endtag; ?>
 <?php } if($_GET['feedtype']=="opensearch") { ?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
                        xmlns:moz="http://www.mozilla.org/2006/browser/search/">
@@ -256,7 +275,7 @@ if($Settings['showverinfo']=="on") { ?>
   <Param name="type" value="wildcard"/>
   <Param name="page" value="1"/>
 </Url>
-  <!-- Renee Sabonis ^_^ -->
+<?php echo $endtag; ?>
 <moz:SearchForm><?php echo $BoardURL.url_maker("search",$Settings['file_ext'],null,"search","search"); ?></moz:SearchForm>
 </OpenSearchDescription>
 <?php } if($_GET['debug']=="true"||$_GET['debug']=="on") {
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 6cd374b..8aeb936 100644
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 01/26/2010 SVN 452 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 01/27/2010 SVN 453 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
 	return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 3; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 452; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 01; $SVNDay[1] = 26; $SVNDay[2] = 2010; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 453; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 01; $SVNDay[1] = 27; $SVNDay[2] = 2010; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);
diff --git a/rss.php b/rss.php
index 80ceca0..40e6f9d 100644
--- a/rss.php
+++ b/rss.php
@@ -8,10 +8,10 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     Revised BSD License for more details.
 
-    Copyright 2004-2009 iDB Support - http://idb.berlios.de/
-    Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
+    Copyright 2004-2010 iDB Support - http://idb.berlios.de/
+    Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: rss.php - Last Update: 12/07/2009 SVN 381 - Author: cooldude2k $
+    $FileInfo: rss.php - Last Update: 01/27/2010 SVN 453 - Author: cooldude2k $
 */
 if(ini_get("register_globals")) {
 require_once('inc/misc/killglobals.php'); }
@@ -29,7 +29,8 @@ header("Content-Type: text/plain; charset=".$Settings['charset']);
 ob_clean(); echo "Sorry RSS Feeds are not enabled for this board."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($_GET['act']==null) { $_GET['act'] = "rss"; }
-if($_GET['act']=="rss"||$_GET['act']=="oldrss"||$_GET['act']=="atom"||$_GET['act']=="opensearch") {
+if($_GET['act']=="rss"||$_GET['act']=="oldrss"||$_GET['act']=="atom"||
+	$_GET['act']=="opml"||$_GET['act']=="opensearch") {
 	$_GET['feedtype'] = $_GET['act']; $Feed['Feed']="Done";
 	require($SettDir['inc'].'rssfeed.php'); }
 ?>
-- 
2.11.4.GIT