| ... | ... |
@@ -31,7 +31,7 @@ if(!defined("_CHARSET")) exit( );
|
| 31 | 31 |
dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 0 WHERE sid = ".$_GET['remove']);
|
| 32 | 32 |
if(isset($_GET['feature'])) |
| 33 | 33 |
dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);
|
| 34 |
- $fresult = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.updated) as updated, UNIX_TIMESTAMP(stories.date) as date FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = "._UIDFIELD." ORDER BY stories.featured");
|
|
| 34 |
+ $fresult = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = "._UIDFIELD." ORDER BY stories.featured");
|
|
| 35 | 35 |
$output .= "<div id='pagetitle'>"._FEATUREDSTORIES."</div>"; |
| 36 | 36 |
if(!dbnumrows($fresult)) $output .= write_message(_NORESULTS); |
| 37 | 37 |
else {
|
| ... | ... |
@@ -70,7 +70,7 @@ if(uLEVEL > 3) accessDenied(); |
| 70 | 70 |
$count = dbquery("SELECT COUNT(nid) FROM ".TABLEPREFIX."fanfiction_news");
|
| 71 | 71 |
list($numrows)= dbrow($count); |
| 72 | 72 |
|
| 73 |
- $result = dbquery("SELECT n.*, UNIX_TIMESTAMP(n.time) as date, count(c.cid) as comments FROM ".TABLEPREFIX."fanfiction_news as n LEFT JOIN ".TABLEPREFIX."fanfiction_comments as c ON n.nid = c.nid GROUP BY n.nid ORDER BY time DESC LIMIT $offset, $itemsperpage");
|
|
| 73 |
+ $result = dbquery("SELECT n.*, n.time as date, count(c.cid) as comments FROM ".TABLEPREFIX."fanfiction_news as n LEFT JOIN ".TABLEPREFIX."fanfiction_comments as c ON n.nid = c.nid GROUP BY n.nid ORDER BY time DESC LIMIT $offset, $itemsperpage");
|
|
| 74 | 74 |
if(file_exists("$skindir/newsbox.tpl")) $news = new TemplatePower( "$skindir/newsbox.tpl" );
|
| 75 | 75 |
else $news = new TemplatePower( "default_tpls/newsbox.tpl" ); |
| 76 | 76 |
$news->prepare(); |
| ... | ... |
@@ -31,7 +31,7 @@ function featured( ) {
|
| 31 | 31 |
mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 2 WHERE sid = ".$_GET['retire']);
|
| 32 | 32 |
if($_GET['feature']) |
| 33 | 33 |
mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);
|
| 34 |
- $fquery = "SELECT stories.*, stories.title as title, author.penname, DATE_FORMAT(stories.updated, '%Y.%m.%d') as updatesort, DATE_FORMAT(stories.date, '$datim') as date, DATE_FORMAT(stories.updated, '$datim') as updated FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = author.uid ORDER BY stories.featured"; |
|
| 34 |
+ $fquery = "SELECT stories.*, stories.title as title, author.penname, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '%Y.%m.%d') as updatesort, DATE_FORMAT(stories.date, '$datim') as date, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '$datim') as updated FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = author.uid ORDER BY stories.featured"; |
|
| 35 | 35 |
$fresult = mysql_query($fquery) or die(_FATALERROR."Query: ".$fquery."<br />Error: (".mysql_errno( ).") ".mysql_error( ));
|
| 36 | 36 |
$output .= "<center><table class=\"tblborder\" cellpadding=\"5\"><tr><th colspan=\"2\" align=\"center\">"._FEATUREDSTORIES."</th></tr>"; |
| 37 | 37 |
if(!mysql_num_rows($fresult)) $output .= "<tr><td colspan=\"2\" align=\"center\">"._NOSTORIES."</td><tr>"; |
| ... | ... |
@@ -83,7 +83,7 @@ function validate( ) {
|
| 83 | 83 |
if($admincats == "0" || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats)))) {
|
| 84 | 84 |
include("includes/emailer.php");
|
| 85 | 85 |
if($validated != "1") {
|
| 86 |
- mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = NOW() WHERE sid = '".$_GET['sid']."'");
|
|
| 86 |
+ mysql_query("UPDATE ".TABLEPREFIX. "fanfiction_stories SET validated = '1', updated = '".time()."' WHERE sid = '".$_GET['sid']."'");
|
|
| 87 | 87 |
$categories = explode(",", $catid);
|
| 88 | 88 |
include("functions.php");
|
| 89 | 89 |
foreach($categories as $cat) {
|
| ... | ... |
@@ -107,7 +107,7 @@ function validate( ) {
|
| 107 | 107 |
} |
| 108 | 108 |
} |
| 109 | 109 |
mysql_query("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '".$_GET['chapid']."'");
|
| 110 |
- mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = NOW( ) WHERE sid = '$sid'");
|
|
| 110 |
+ mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");
|
|
| 111 | 111 |
$output .= "<center><b>"._STORYVALIDATED."</b></center>"; |
| 112 | 112 |
} |
| 113 | 113 |
else |
| ... | ... |
@@ -80,7 +80,7 @@ function preview_story($stories) {
|
| 80 | 80 |
if(uLEVEL == 1 || (empty($admincats) || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats))))) {
|
| 81 | 81 |
include("includes/emailer.php");
|
| 82 | 82 |
if(!$storyvalid) {
|
| 83 |
- dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = NOW() WHERE sid = '$_GET[sid]'");
|
|
| 83 |
+ dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = '" . time() . "' WHERE sid = '$_GET[sid]'");
|
|
| 84 | 84 |
foreach(explode(",", $catid) as $cat) {
|
| 85 | 85 |
categoryitems($cat, 1); |
| 86 | 86 |
} |
| ... | ... |
@@ -125,7 +125,7 @@ function preview_story($stories) {
|
| 125 | 125 |
if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_CHAPTER, USERPENNAME, USERUID, $title, $sid, $author, $authoruid, $inorder))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS', " . time() . ")");
|
| 126 | 126 |
} |
| 127 | 127 |
dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '$_GET[chapid]'");
|
| 128 |
- dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = NOW( ) WHERE sid = '$sid'");
|
|
| 128 |
+ dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");
|
|
| 129 | 129 |
$count = dbquery("SELECT SUM(wordcount) as totalcount FROM ".TABLEPREFIX."fanfiction_chapters WHERE sid = '$sid' and validated = 1");
|
| 130 | 130 |
list($totalcount) = dbrow($count); |
| 131 | 131 |
if($totalcount) {
|
| ... | ... |
@@ -142,7 +142,7 @@ function preview_story($stories) {
|
| 142 | 142 |
} |
| 143 | 143 |
else {
|
| 144 | 144 |
if(isNumber($_GET['chapid'])) {
|
| 145 |
- $result = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.updated) as updated, UNIX_TIMESTAMP(stories.date) as date, chapter.uid as uid, chapter.inorder, chapter.title as chaptertitle, chapter.storytext, chapter.chapid, chapter.notes, chapter.endnotes FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$_GET[chapid]' AND chapter.sid = stories.sid AND chapter.uid = "._UIDFIELD);
|
|
| 145 |
+ $result = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date, chapter.uid as uid, chapter.inorder, chapter.title as chaptertitle, chapter.storytext, chapter.chapid, chapter.notes, chapter.endnotes FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$_GET[chapid]' AND chapter.sid = stories.sid AND chapter.uid = "._UIDFIELD);
|
|
| 146 | 146 |
$stories = dbassoc($result); |
| 147 | 147 |
$output .= preview_story($stories); |
| 148 | 148 |
|
| ... | ... |
@@ -46,7 +46,7 @@ $output .= "</select></form></div>"; |
| 46 | 46 |
$countquery = dbquery("SELECT COUNT(log_id) FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : ""));
|
| 47 | 47 |
list($count) = dbrow($countquery); |
| 48 | 48 |
if($count > 0) {
|
| 49 |
- $result = dbquery("SELECT log_action, INET_NTOA(log_ip) as log_ip, UNIX_TIMESTAMP(log_timestamp) as log_timestamp FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : "")." ORDER BY log_timestamp DESC LIMIT $offset, $itemsperpage");
|
|
| 49 |
+ $result = dbquery("SELECT log_action, INET_NTOA(log_ip) as log_ip, log_timestamp as log_timestamp FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : "")." ORDER BY log_timestamp DESC LIMIT $offset, $itemsperpage");
|
|
| 50 | 50 |
$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" style=\"width: 90%; margin: 0 auto;\"><tr class=\"tblborder\"><th>"._ACTION."</th><th>"._IP."</th><th>"._DATE."</th></tr>"; |
| 51 | 51 |
while ($item = dbassoc($result)) {
|
| 52 | 52 |
$output .= "<tr class=\"tblborder\"> |
| ... | ... |
@@ -33,7 +33,7 @@ if(!defined("_CHARSET")) exit( );
|
| 33 | 33 |
else include_once(_BASEDIR."blocks/news/en.php"); |
| 34 | 34 |
|
| 35 | 35 |
$news->prepare(); |
| 36 |
- $newsquery = dbquery("SELECT nid, author, title, story, UNIX_TIMESTAMP(time) as date, comments FROM ".TABLEPREFIX."fanfiction_news ORDER BY time DESC LIMIT $numupdated");
|
|
| 36 |
+ $newsquery = dbquery("SELECT nid, author, title, story, time as date, comments FROM ".TABLEPREFIX."fanfiction_news ORDER BY time DESC LIMIT $numupdated");
|
|
| 37 | 37 |
$count = 0; |
| 38 | 38 |
while($stories = dbassoc($newsquery)) {
|
| 39 | 39 |
|
| ... | ... |
@@ -24,7 +24,7 @@ include("blocks/".$blocks['poll']['file']);
|
| 24 | 24 |
$n = $num + 1; |
| 25 | 25 |
$final .= (isset($results[$n]) ? $results[$n] : "0"); |
| 26 | 26 |
} |
| 27 |
- $closepoll =dbquery("UPDATE ".TABLEPREFIX."fanfiction_poll SET poll_results = '$final', poll_end = NOW( ) WHERE poll_id = '".$currentpoll['poll_id']."'");
|
|
| 27 |
+ $closepoll =dbquery("UPDATE ".TABLEPREFIX."fanfiction_poll SET poll_results = '$final', poll_end = '" . time() . "' WHERE poll_id = '".$currentpoll['poll_id']."'");
|
|
| 28 | 28 |
if($closepoll) $emptyvotes = dbquery("TRUNCATE TABLE `".TABLEPREFIX."fanfiction_poll_votes`");
|
| 29 | 29 |
$output .= write_message(_ACTIONSUCCESSFUL); |
| 30 | 30 |
} |
| ... | ... |
@@ -36,7 +36,7 @@ include("blocks/".$blocks['poll']['file']);
|
| 36 | 36 |
if(strlen(trim(preg_replace("! !", " ", $opt))) > 0) $new_opts[] = $opt;
|
| 37 | 37 |
} |
| 38 | 38 |
$new_opts = escapestring(implode("|#|", $new_opts));
|
| 39 |
- $newpoll = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll(`poll_question`, `poll_opts`, `poll_start`) VALUES('$poll_question', '$new_opts', NOW( ))");
|
|
| 39 |
+ $newpoll = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll(`poll_question`, `poll_opts`, `poll_start`) VALUES('$poll_question', '$new_opts', '" . time() . "')");
|
|
| 40 | 40 |
include("blocks/".$blocks['poll']['file']);
|
| 41 | 41 |
$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 200px; margin: 0 auto; text-align: left;\">$content</div><br /></div>"; |
| 42 | 42 |
} |
| ... | ... |
@@ -63,7 +63,7 @@ if($poll) {
|
| 63 | 63 |
} |
| 64 | 64 |
else {
|
| 65 | 65 |
$output .= "<div id='pagetitle'>"._POLLARCHIVE."</div>"; |
| 66 |
- $listquery = dbquery("SELECT poll_id, poll_question, UNIX_TIMESTAMP(poll_start) as start, UNIX_TIMESTAMP(poll_end) as end FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NOT NULL OR poll_end != '0000-00-00 00:00:00' ORDER BY poll_id DESC");
|
|
| 66 |
+ $listquery = dbquery("SELECT poll_id, poll_question, poll_startas start, poll_end as end FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NOT NULL OR poll_end != '0000-00-00 00:00:00' ORDER BY poll_id DESC");
|
|
| 67 | 67 |
if(dbnumrows($listquery) > 0) {
|
| 68 | 68 |
$output .= "<table class='tblborder' style='margin: 1em auto;'><tr><th class='tblborder'>"._POLLARCHQUESTION."</th><th class='tblborder'>"._START."</th><th class='tblborder'>"._END."</th></tr>"; |
| 69 | 69 |
while($poll = dbassoc($listquery)) {
|
| ... | ... |
@@ -26,7 +26,7 @@ if(!defined("_CHARSET")) exit( );
|
| 26 | 26 |
|
| 27 | 27 |
// Build the user's profile information |
| 28 | 28 |
$tpl->newBlock("profile");
|
| 29 |
-$result2 = dbquery("SELECT *, UNIX_TIMESTAMP(date) as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
|
| 29 |
+$result2 = dbquery("SELECT *, date as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
|
| 30 | 30 |
$userinfo = dbassoc($result2); |
| 31 | 31 |
$nameinfo = ""; |
| 32 | 32 |
if($userinfo['email']) |
| ... | ... |
@@ -8,7 +8,7 @@ define ("_EMAILFIELD", "author.email"); // Do not change the aliasing (the "aut
|
| 8 | 8 |
define ("_PASSWORDFIELD", "author.password"); // Do not change the aliasing (the "author." part)!
|
| 9 | 9 |
define ("_AUTHORTABLE", $tableprefix."fanfiction_authors as author"); // Do not change the aliasing (the "as author" part)!
|
| 10 | 10 |
|
| 11 |
-define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".$tableprefix."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 11 |
+define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".$tableprefix."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 12 | 12 |
define ("_STORYCOUNT", "SELECT count(sid) FROM ".$tableprefix."fanfiction_stories as stories WHERE validated > 0");
|
| 13 | 13 |
define ("_SERIESQUERY", "SELECT series.*, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE.", ".$tableprefix."fanfiction_series as series WHERE "._UIDFIELD." = series.uid ");
|
| 14 | 14 |
define ("_SERIESCOUNT", "SELECT COUNT(seriesid) FROM ".$tableprefix."fanfiction_series as series ");
|
| ... | ... |
@@ -30,7 +30,7 @@ if($uid > 0) {
|
| 30 | 30 |
$query = dbquery("SELECT "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
| 31 | 31 |
list($penname) = dbrow($query); |
| 32 | 32 |
$output = "<div id='pagetitle'>".stripslashes($penname)."</div>\n"; |
| 33 |
- $squery = "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 $squery AND (stories.uid = '$uid' OR coauth.uid = '$uid') "._ORDERBY;
|
|
| 33 |
+ $squery = "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 $squery AND (stories.uid = '$uid' OR coauth.uid = '$uid') "._ORDERBY;
|
|
| 34 | 34 |
$cquery = "SELECT count(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON stories.sid = coauth.sid WHERE validated > 0 $countquery AND (stories.uid = '$uid' OR coauth.uid = '$uid')"; |
| 35 | 35 |
$numrows = search($squery, $cquery, "browse.php?"); |
| 36 | 36 |
} |
| ... | ... |
@@ -10,7 +10,7 @@ define ("_EMAILFIELD", "author.email"); // Do not change the aliasing (the "aut
|
| 10 | 10 |
define ("_PASSWORDFIELD", "author.password"); // Do not change the aliasing (the "author." part)!
|
| 11 | 11 |
define ("_AUTHORTABLE", _AUTHORPREFIX."fanfiction_authors as author"); // Do not change the aliasing (the "as author" part)!
|
| 12 | 12 |
|
| 13 |
-define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 13 |
+define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 14 | 14 |
define ("_STORYCOUNT", "SELECT count(sid) FROM ".TABLEPREFIX."fanfiction_stories as stories WHERE validated > 0");
|
| 15 | 15 |
define ("_SERIESQUERY", "SELECT series.*, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_series as series WHERE "._UIDFIELD." = series.uid ");
|
| 16 | 16 |
define ("_SERIESCOUNT", "SELECT COUNT(seriesid) FROM ".TABLEPREFIX."fanfiction_series as series ");
|
| ... | ... |
@@ -187,7 +187,7 @@ switch ($_GET['step']) |
| 187 | 187 |
else $fail = write_message(_PASSWORDTWICE); |
| 188 | 188 |
if (!isset($fail)) |
| 189 | 189 |
{
|
| 190 |
- $result = dbquery("INSERT INTO " . $tableprefix . "fanfiction_authors(`penname`, `email`, `password`, `date`) VALUES('$penname', '" . $_POST['email'] . "', '$encryptpassword', now( ))");
|
|
| 190 |
+ $result = dbquery("INSERT INTO " . $tableprefix . "fanfiction_authors(`penname`, `email`, `password`, `date`) VALUES('$penname', '" . $_POST['email'] . "', '$encryptpassword', '" . time() . "')");
|
|
| 191 | 191 |
define("USERUID", dbinsertid());
|
| 192 | 192 |
$skinquery = dbquery("SELECT skin FROM " . $settingsprefix . "fanfiction_settings WHERE sitekey = '" . SITEKEY . "'");
|
| 193 | 193 |
list($skin) = dbrow($skinquery); |
| ... | ... |
@@ -53,7 +53,7 @@ if($nid) {
|
| 53 | 53 |
$insert = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_comments WHERE cid = '$cid'");
|
| 54 | 54 |
if($insert) dbquery("UPDATE ".TABLEPREFIX."fanfiction_news SET comments = comments - 1 WHERE nid = '$nid' LIMIT 1");
|
| 55 | 55 |
} |
| 56 |
- $newsquery = dbquery("SELECT n.*, UNIX_TIMESTAMP(n.time) as date FROM ".TABLEPREFIX."fanfiction_news as n WHERE n.nid = '$nid' LIMIT 1");
|
|
| 56 |
+ $newsquery = dbquery("SELECT n.*, n.time as date FROM ".TABLEPREFIX."fanfiction_news as n WHERE n.nid = '$nid' LIMIT 1");
|
|
| 57 | 57 |
$stories = dbassoc($newsquery); |
| 58 | 58 |
if(file_exists("./$skindir/newsbox.tpl"))
|
| 59 | 59 |
$news = new TemplatePower( "./$skindir/newsbox.tpl" ); |
| ... | ... |
@@ -79,7 +79,7 @@ if($nid) {
|
| 79 | 79 |
$cquery = dbquery("SELECT COUNT(cid) FROM ".TABLEPREFIX."fanfiction_comments WHERE nid = '$nid'");
|
| 80 | 80 |
list($ccount) = dbrow($cquery); |
| 81 | 81 |
if($ccount) {
|
| 82 |
- $query2 = dbquery("SELECT c.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(c.time) as date FROM ".TABLEPREFIX."fanfiction_comments as c LEFT JOIN "._AUTHORTABLE." ON c.uid = "._UIDFIELD." WHERE c.nid = '$nid' ORDER BY time LIMIT $offset, $itemsperpage");
|
|
| 82 |
+ $query2 = dbquery("SELECT c.*, "._PENNAMEFIELD." as penname, c.time as date FROM ".TABLEPREFIX."fanfiction_comments as c LEFT JOIN "._AUTHORTABLE." ON c.uid = "._UIDFIELD." WHERE c.nid = '$nid' ORDER BY time LIMIT $offset, $itemsperpage");
|
|
| 83 | 83 |
$output .= "<div class=\"sectionheader\">"._COMMENTS."</div>"; |
| 84 | 84 |
if(file_exists("$skindir/comments.tpl")) $c = new TemplatePower( "$skindir/comments.tpl" );
|
| 85 | 85 |
else $c = new TemplatePower( "default_tpls/comments.tpl" ); |
| ... | ... |
@@ -121,7 +121,7 @@ else {
|
| 121 | 121 |
$news->prepare( ); |
| 122 | 122 |
$cquery = dbquery("SELECT count(nid) FROM ".TABLEPREFIX."fanfiction_news");
|
| 123 | 123 |
list($count) = dbrow($cquery); |
| 124 |
- $newsquery = dbquery("SELECT n.*, UNIX_TIMESTAMP(n.time) as date FROM ".TABLEPREFIX."fanfiction_news as n ORDER BY n.time DESC LIMIT $offset, $itemsperpage");
|
|
| 124 |
+ $newsquery = dbquery("SELECT n.*, n.time as date FROM ".TABLEPREFIX."fanfiction_news as n ORDER BY n.time DESC LIMIT $offset, $itemsperpage");
|
|
| 125 | 125 |
$counter = 0; |
| 126 | 126 |
while($stories = dbassoc($newsquery)) {
|
| 127 | 127 |
|
| ... | ... |
@@ -308,7 +308,7 @@ else {
|
| 308 | 308 |
$jumpmenu .= "</select></form>"; |
| 309 | 309 |
} |
| 310 | 310 |
$tpl->assign("jumpmenu", $jumpmenu );
|
| 311 |
- $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, UNIX_TIMESTAMP(review.date) as date, series.title as seriestitle, stories.title as title FROM ".TABLEPREFIX."fanfiction_reviews as review LEFT JOIN ".TABLEPREFIX."fanfiction_series as series ON review.item = series.seriesid AND review.type = 'SE' LEFT JOIN ".TABLEPREFIX."fanfiction_stories as stories ON stories.sid = review.item AND review.type ='ST' WHERE |
|
| 311 |
+ $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, review.date as date, series.title as seriestitle, stories.title as title FROM ".TABLEPREFIX."fanfiction_reviews as review LEFT JOIN ".TABLEPREFIX."fanfiction_series as series ON review.item = series.seriesid AND review.type = 'SE' LEFT JOIN ".TABLEPREFIX."fanfiction_stories as stories ON stories.sid = review.item AND review.type ='ST' WHERE |
|
| 312 | 312 |
((series.seriesid = '$item' AND series.seriesid = review.item AND review.type = 'SE')". |
| 313 | 313 |
(isset($storylist) ? " OR (FIND_IN_SET(review.item, '".(implode(",", $storieslist))."') > 0 AND review.type = 'ST')" : "").
|
| 314 | 314 |
(isset($serieslist) ? " OR (FIND_IN_SET(item, '".(implode(",", $serieslist))."') > 0 AND type = 'SE')" : "").
|
| ... | ... |
@@ -318,11 +318,11 @@ else {
|
| 318 | 318 |
} |
| 319 | 319 |
else if($type == "ST") {
|
| 320 | 320 |
if(isset($chapid)) {
|
| 321 |
- $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, UNIX_TIMESTAMP(date) as date, chapter.title as title, chapter.inorder as inorder FROM ".TABLEPREFIX."fanfiction_reviews as review, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$chapid' AND chapter.chapid = review.chapid AND review.review != 'No Review' "; |
|
| 321 |
+ $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, date as date, chapter.title as title, chapter.inorder as inorder FROM ".TABLEPREFIX."fanfiction_reviews as review, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$chapid' AND chapter.chapid = review.chapid AND review.review != 'No Review' "; |
|
| 322 | 322 |
$count = "SELECT count(reviewid) FROM ".TABLEPREFIX."fanfiction_reviews as review WHERE chapid = '$chapid' AND review != 'No Review'"; |
| 323 | 323 |
} |
| 324 | 324 |
else {
|
| 325 |
- $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, UNIX_TIMESTAMP(review.date) as date, chapter.title as title, chapter.inorder as inorder FROM ".TABLEPREFIX."fanfiction_reviews as review, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.sid = '$item' AND chapter.chapid = review.chapid AND review.review != 'No Review' AND review.type = 'ST'"; |
|
| 325 |
+ $query = "SELECT review.reviewid, review.respond, review.review, review.uid, review.reviewer, review.rating, review.date as date, chapter.title as title, chapter.inorder as inorder FROM ".TABLEPREFIX."fanfiction_reviews as review, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.sid = '$item' AND chapter.chapid = review.chapid AND review.review != 'No Review' AND review.type = 'ST'"; |
|
| 326 | 326 |
$count = "SELECT count(reviewid) FROM ".TABLEPREFIX."fanfiction_reviews as review WHERE item = '$item' AND review != 'No Review' AND type = 'ST'"; |
| 327 | 327 |
} |
| 328 | 328 |
$jumpmenu = "<form name=\"jump\" action=\"\">"; |
| ... | ... |
@@ -51,7 +51,7 @@ if(isset($_POST['submit']) || isset($_GET['offset'])) {
|
| 51 | 51 |
$countquery = array(); |
| 52 | 52 |
$scountquery = array(); |
| 53 | 53 |
if($searchtype == "fulltext") {
|
| 54 |
- $query = "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext LIKE '%$searchterm%' AND chapter.sid = stories.sid AND stories.uid = "._UIDFIELD; |
|
| 54 |
+ $query = "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext LIKE '%$searchterm%' AND chapter.sid = stories.sid AND stories.uid = "._UIDFIELD; |
|
| 55 | 55 |
$countquery = "SELECT count(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext LIKE '%$searchterm%' AND chapter.sid = stories.sid GROUP BY stories.sid"; |
| 56 | 56 |
$query .= " "._ORDERBY; |
| 57 | 57 |
search($query, $countquery); |
| ... | ... |
@@ -82,7 +82,7 @@ if(isset($_POST['submit']) || isset($_GET['offset'])) {
|
| 82 | 82 |
} |
| 83 | 83 |
if(count($authorlist) > 0) {
|
| 84 | 84 |
$authors = implode(",",$authorlist);
|
| 85 |
- $query = "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0) ";
|
|
| 85 |
+ $query = "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0) ";
|
|
| 86 | 86 |
$countquery = "SELECT COUNT(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0)"; |
| 87 | 87 |
search($query, $countquery); |
| 88 | 88 |
$tpl->assign("output", $output);
|
| ... | ... |
@@ -222,7 +222,7 @@ function newstory( ) {
|
| 222 | 222 |
if($store == "mysql") |
| 223 | 223 |
{
|
| 224 | 224 |
if(!$newchapter) {
|
| 225 |
- $insert = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stories (title, summary, storynotes, catid, classes, charid, rid, date, updated, uid, validated, rr, completed, wordcount, featured, coauthors) VALUES ('".addslashes($title)."', '".addslashes(format_story($summary))."', '".addslashes(format_story($storynotes))."', '".($catid ? implode(",", $catid) : "")."', '".($classes? implode(",", $classes) : "")."', '".($charid ? implode(",", $charid) : "")."', '$rid', now(), now(), '$uid', '$validated', '$rr', '$complete', '$wordcount', '$feat', '$coauthors')");
|
|
| 225 |
+ $insert = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stories (title, summary, storynotes, catid, classes, charid, rid, date, updated, uid, validated, rr, completed, wordcount, featured, coauthors) VALUES ('".addslashes($title)."', '".addslashes(format_story($summary))."', '".addslashes(format_story($storynotes))."', '".($catid ? implode(",", $catid) : "")."', '".($classes? implode(",", $classes) : "")."', '".($charid ? implode(",", $charid) : "")."', '$rid', '" . time() ."', '" . time() . "', '$uid', '$validated', '$rr', '$complete', '$wordcount', '$feat', '$coauthors')");
|
|
| 226 | 226 |
$sid = dbinsertid( ); |
| 227 | 227 |
$inorder = 1; |
| 228 | 228 |
} |
| ... | ... |
@@ -236,7 +236,7 @@ function newstory( ) {
|
| 236 | 236 |
else if ($store == "files") |
| 237 | 237 |
{
|
| 238 | 238 |
if(!$newchapter) {
|
| 239 |
- $insertstory = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stories (title, summary, storynotes, catid, classes, charid, rid, date, updated, uid, validated, rr, completed, wordcount, featured, coauthors) VALUES ('".addslashes($title)."', '".addslashes(format_story($summary))."', '".addslashes(format_story($storynotes))."', '".($catid ? implode(",", $catid) : "")."', '".($classes ? implode(",", $classes) : "")."', '".($charid ? implode(",", $charid) : "")."', '$rid', now(), now(), '$uid', '$validated', '$rr', '$complete', '$wordcount', '$feat', '$coauthors')");
|
|
| 239 |
+ $insertstory = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stories (title, summary, storynotes, catid, classes, charid, rid, date, updated, uid, validated, rr, completed, wordcount, featured, coauthors) VALUES ('".addslashes($title)."', '".addslashes(format_story($summary))."', '".addslashes(format_story($storynotes))."', '".($catid ? implode(",", $catid) : "")."', '".($classes ? implode(",", $classes) : "")."', '".($charid ? implode(",", $charid) : "")."', '$rid', '" . time() ."', '" . time() . "', '$uid', '$validated', '$rr', '$complete', '$wordcount', '$feat', '$coauthors')");
|
|
| 240 | 240 |
$sid = dbinsertid( ); |
| 241 | 241 |
$inorder = 1; |
| 242 | 242 |
} |
| ... | ... |
@@ -323,7 +323,7 @@ function newstory( ) {
|
| 323 | 323 |
sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html"); |
| 324 | 324 |
} |
| 325 | 325 |
} |
| 326 |
- $update = dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = NOW( ) WHERE sid = '$sid'");
|
|
| 326 |
+ $update = dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");
|
|
| 327 | 327 |
list($chapters, $words) = dbrow(dbquery("SELECT COUNT(chapid), SUM(wordcount) FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated > 0"));
|
| 328 | 328 |
list($authors) = dbrow(dbquery("SELECT COUNT(uid) FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE stories > 0"));
|
| 329 | 329 |
dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats set wordcount = '$words', chapters = '$chapters', authors = '$authors'");
|
| ... | ... |
@@ -358,7 +358,7 @@ function newstory( ) {
|
| 358 | 358 |
return $output; |
| 359 | 359 |
} |
| 360 | 360 |
if($newchapter) {
|
| 361 |
- $storyinfo = dbquery("SELECT s.*, UNIX_TIMESTAMP(s.updated) as updated, UNIX_TIMESTAMP(s.date) as date, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_stories as s, "._AUTHORTABLE." WHERE "._UIDFIELD." = s.uid AND sid = '$sid' LIMIT 1");
|
|
| 361 |
+ $storyinfo = dbquery("SELECT s.*, s.updated as updated, s.date as date, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_stories as s, "._AUTHORTABLE." WHERE "._UIDFIELD." = s.uid AND sid = '$sid' LIMIT 1");
|
|
| 362 | 362 |
$stories = dbassoc($storyinfo); |
| 363 | 363 |
$uid = $stories['uid']; |
| 364 | 364 |
$chapterquery = dbquery("SELECT COUNT(sid) FROM ".TABLEPREFIX."fanfiction_chapters WHERE sid = '$sid'");
|
| ... | ... |
@@ -738,7 +738,7 @@ function editstory($sid) {
|
| 738 | 738 |
sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html"); |
| 739 | 739 |
} |
| 740 | 740 |
} |
| 741 |
- $update = dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '$validated', updated = NOW( ) WHERE sid = '$sid'");
|
|
| 741 |
+ $update = dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '$validated', updated = '" . time() . "' WHERE sid = '$sid'");
|
|
| 742 | 742 |
$update2 = dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = 1 WHERE sid = '$sid'");
|
| 743 | 743 |
$coauths = dbquery("SELECT uid FROM ".TABLEPREFIX."fanfiction_coauthors WHERE sid = '$sid'");
|
| 744 | 744 |
while($c = dbassoc($coauths)) {
|
| ... | ... |
@@ -831,14 +831,14 @@ function editstory($sid) {
|
| 831 | 831 |
|
| 832 | 832 |
if(isset($_POST['submit']) && $_POST['submit'] != _PREVIEW) {
|
| 833 | 833 |
$submit = _PREVIEW; |
| 834 |
- $storyquery = dbquery("SELECT title, summary, storynotes, rr, completed, rid, classes, charid, catid, featured, uid, coauthors, UNIX_TIMESTAMP(date) as date FROM ".TABLEPREFIX."fanfiction_stories WHERE sid = '$sid' LIMIT 1");
|
|
| 834 |
+ $storyquery = dbquery("SELECT title, summary, storynotes, rr, completed, rid, classes, charid, catid, featured, uid, coauthors, date as date FROM ".TABLEPREFIX."fanfiction_stories WHERE sid = '$sid' LIMIT 1");
|
|
| 835 | 835 |
$story = dbassoc($storyquery); |
| 836 | 836 |
$output .= $formbegin.storyform($story, $preview); |
| 837 | 837 |
$output .= "<input type=\"hidden\" name=\"oldcats\" value =\"".$story['catid']."\">"; |
| 838 | 838 |
} |
| 839 | 839 |
else {
|
| 840 | 840 |
$submit = _PREVIEW; |
| 841 |
- $storyinfo = dbquery("SELECT s.*, UNIX_TIMESTAMP(s.date) as date, UNIX_TIMESTAMP(s.updated) as updated, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_stories as s, "._AUTHORTABLE." WHERE "._UIDFIELD." = s.uid AND sid = '$sid' LIMIT 1");
|
|
| 841 |
+ $storyinfo = dbquery("SELECT s.*, s.date as date, s.updated as updated, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_stories as s, "._AUTHORTABLE." WHERE "._UIDFIELD." = s.uid AND sid = '$sid' LIMIT 1");
|
|
| 842 | 842 |
$stories = dbassoc($storyinfo); |
| 843 | 843 |
if($stories['coauthors'] && !isset($_POST['submit'])) {
|
| 844 | 844 |
$au = array(); |
| ... | ... |
@@ -42,7 +42,7 @@ if(!defined("_CHARSET")) exit( );
|
| 42 | 42 |
} |
| 43 | 43 |
break; |
| 44 | 44 |
case "favstories": |
| 45 |
- $result = dbquery("SELECT count( fav.item ) AS count, stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ".TABLEPREFIX."fanfiction_favorites AS fav, "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.uid = "._UIDFIELD." AND stories.validated > 0 AND fav.item = stories.sid AND fav.type = 'ST' GROUP BY stories.sid ORDER BY count DESC LIMIT 10");
|
|
| 45 |
+ $result = dbquery("SELECT count( fav.item ) AS count, stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ".TABLEPREFIX."fanfiction_favorites AS fav, "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.uid = "._UIDFIELD." AND stories.validated > 0 AND fav.item = stories.sid AND fav.type = 'ST' GROUP BY stories.sid ORDER BY count DESC LIMIT 10");
|
|
| 46 | 46 |
if(dbnumrows($result) == 0) $output .= write_message(_NORESULTS); |
| 47 | 47 |
$tpl->newBlock("listings");
|
| 48 | 48 |
while($stories = dbassoc($result)) {
|
| ... | ... |
@@ -71,20 +71,20 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6)) //3.5.5 |
| 71 | 71 |
dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_authors` DROP `date_tmp`");
|
| 72 | 72 |
} |
| 73 | 73 |
/****************************************************************************************************************/ |
| 74 |
- $tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'date'"));
|
|
| 75 |
- |
|
| 74 |
+ $tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp'"));
|
|
| 75 |
+ |
|
| 76 | 76 |
if ($tmp['Type'] == "datetime") |
| 77 | 77 |
{
|
| 78 |
- $updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'date_tmp'"));
|
|
| 78 |
+ $updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp_tmp'"));
|
|
| 79 | 79 |
if (!$updated) |
| 80 | 80 |
{
|
| 81 |
- dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` ADD `date_tmp` int(11) NOT NULL default '0'");
|
|
| 81 |
+ dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` ADD `log_timestamp_tmp` int(11) NOT NULL default '0'");
|
|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 |
- dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` SET `date_tmp` = UNIX_TIMESTAMP( `log_timestamp` )");
|
|
| 84 |
+ dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` SET `log_timestamp_tmp` = UNIX_TIMESTAMP( `log_timestamp` )");
|
|
| 85 | 85 |
dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` CHANGE `log_timestamp` `log_timestamp` INT NOT NULL");
|
| 86 |
- dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` set log_timestamp = date_tmp");
|
|
| 87 |
- dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` DROP `date_tmp`");
|
|
| 86 |
+ dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` set log_timestamp = log_timestamp_tmp");
|
|
| 87 |
+ dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` DROP `log_timestamp_tmp`");
|
|
| 88 | 88 |
} |
| 89 | 89 |
/****************************************************************************************************************/ |
| 90 | 90 |
/* fanfiction_comments `time` datetime NOT NULL default '0000-00-00 00:00:00' */ |
| ... | ... |
@@ -150,7 +150,24 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6)) //3.5.5 |
| 150 | 150 |
dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_stories` set updated = updated_tmp");
|
| 151 | 151 |
dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_stories` DROP `updated_tmp`");
|
| 152 | 152 |
} |
| 153 |
+ |
|
| 154 |
+ /****************************************************************************************************************/ |
|
| 155 |
+ /* fanfiction_news `time` datetime default NULL, */ |
|
| 156 |
+ $tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time'"));
|
|
| 153 | 157 |
|
| 158 |
+ if ($tmp['Type'] == "datetime") |
|
| 159 |
+ {
|
|
| 160 |
+ $updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time_tmp'"));
|
|
| 161 |
+ if (!$updated) |
|
| 162 |
+ {
|
|
| 163 |
+ dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_news` ADD `time_tmp` int(11) NOT NULL default '0'");
|
|
| 164 |
+ } |
|
| 165 |
+ |
|
| 166 |
+ dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_news` SET `time_tmp` = UNIX_TIMESTAMP( `time` )");
|
|
| 167 |
+ dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_news` CHANGE `time` `time` INT NOT NULL");
|
|
| 168 |
+ dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_news` set time = time_tmp");
|
|
| 169 |
+ dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_news` DROP `time_tmp`");
|
|
| 170 |
+ } |
|
| 154 | 171 |
} |
| 155 | 172 |
$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '" . $version . "' WHERE sitekey = '" . SITEKEY . "'");
|
| 156 | 173 |
if ($update) $output .= write_message(_ACTIONSUCCESSFUL); |
| ... | ... |
@@ -81,7 +81,7 @@ if(empty($favorites)) accessDenied( ); |
| 81 | 81 |
} |
| 82 | 82 |
} |
| 83 | 83 |
else if(!isset($_POST['submit'])) {
|
| 84 |
- $storyquery = "SELECT stories.*, "._PENNAMEFIELD." as penname, fav.comments as comments, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_favorites as fav, "._AUTHORTABLE." WHERE fav.uid = '$uid' AND fav.type = 'ST' AND stories.uid = "._UIDFIELD." AND fav.item = stories.sid "._ORDERBY; |
|
| 84 |
+ $storyquery = "SELECT stories.*, "._PENNAMEFIELD." as penname, fav.comments as comments, stories.date as date, stories.updated as updated FROM ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_favorites as fav, "._AUTHORTABLE." WHERE fav.uid = '$uid' AND fav.type = 'ST' AND stories.uid = "._UIDFIELD." AND fav.item = stories.sid "._ORDERBY; |
|
| 85 | 85 |
$countquery = dbquery("SELECT COUNT(item) FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '$uid' AND type = 'ST' GROUP BY uid");
|
| 86 | 86 |
list($storycount) = dbrow($countquery); |
| 87 | 87 |
if($storycount) {
|
| ... | ... |
@@ -26,7 +26,7 @@ if(!defined("_CHARSET")) exit( );
|
| 26 | 26 |
|
| 27 | 27 |
// Build the user's profile information |
| 28 | 28 |
$tpl->newBlock("profile");
|
| 29 |
-$result2 = dbquery("SELECT *, UNIX_TIMESTAMP(date) as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
|
| 29 |
+$result2 = dbquery("SELECT *, date as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
|
| 30 | 30 |
$userinfo = dbassoc($result2); |
| 31 | 31 |
$nameinfo = ""; |
| 32 | 32 |
if($userinfo['email']) |
| ... | ... |
@@ -8,7 +8,7 @@ define ("_EMAILFIELD", "author.email"); // Do not change the aliasing (the "aut
|
| 8 | 8 |
define ("_PASSWORDFIELD", "author.password"); // Do not change the aliasing (the "author." part)!
|
| 9 | 9 |
define ("_AUTHORTABLE", TABLEPREFIX."fanfiction_authors as author"); // Do not change the aliasing (the "as author" part)!
|
| 10 | 10 |
|
| 11 |
-define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 11 |
+define ("_STORYQUERY", "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 ");
|
|
| 12 | 12 |
define ("_STORYCOUNT", "SELECT count(sid) FROM ".TABLEPREFIX."fanfiction_stories as stories WHERE validated > 0");
|
| 13 | 13 |
define ("_SERIESQUERY", "SELECT series.*, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_series as series WHERE "._UIDFIELD." = series.uid ");
|
| 14 | 14 |
define ("_SERIESCOUNT", "SELECT COUNT(seriesid) FROM ".TABLEPREFIX."fanfiction_series as series ");
|
| ... | ... |
@@ -37,7 +37,7 @@ else {
|
| 37 | 37 |
$revcount = dbquery("SELECT COUNT(reviewid) FROM ".TABLEPREFIX."fanfiction_reviews WHERE uid = '$uid' AND review != 'No Review'");
|
| 38 | 38 |
list($reviewcount) = dbrow($revcount); |
| 39 | 39 |
if($reviewcount) {
|
| 40 |
- $revquery = dbquery("SELECT rev.*, UNIX_TIMESTAMP(rev.date) as date, "._PENNAMEFIELD." FROM ".TABLEPREFIX."fanfiction_reviews as rev, "._AUTHORTABLE." WHERE rev.uid = "._UIDFIELD." AND rev.uid = '$uid' AND rev.review != 'No Review' ORDER BY type, item LIMIT $offset, $itemsperpage");
|
|
| 40 |
+ $revquery = dbquery("SELECT rev.*, rev.date as date, "._PENNAMEFIELD." FROM ".TABLEPREFIX."fanfiction_reviews as rev, "._AUTHORTABLE." WHERE rev.uid = "._UIDFIELD." AND rev.uid = '$uid' AND rev.review != 'No Review' ORDER BY type, item LIMIT $offset, $itemsperpage");
|
|
| 41 | 41 |
$counter = 0; |
| 42 | 42 |
$count = 0; |
| 43 | 43 |
while($reviews = dbassoc($revquery)) {
|
| ... | ... |
@@ -46,7 +46,7 @@ if(!defined("_CHARSET")) exit( );
|
| 46 | 46 |
else {
|
| 47 | 47 |
$reviewid = isset($_GET['reviewid']) && isNumber($_GET['reviewid']) ? $_GET['reviewid'] : false; |
| 48 | 48 |
if(!$reviewid) accessDenied( ); |
| 49 |
- $result = dbquery("SELECT review.*, UNIX_TIMESTAMP(review.date) as date FROM ".TABLEPREFIX."fanfiction_reviews as review LEFT JOIN ".TABLEPREFIX."fanfiction_authors as member ON member.uid = review.uid WHERE review.reviewid = '$reviewid' LIMIT 1");
|
|
| 49 |
+ $result = dbquery("SELECT review.*, review.date as date FROM ".TABLEPREFIX."fanfiction_reviews as review LEFT JOIN ".TABLEPREFIX."fanfiction_authors as member ON member.uid = review.uid WHERE review.reviewid = '$reviewid' LIMIT 1");
|
|
| 50 | 50 |
$reviews = dbassoc($result); |
| 51 | 51 |
if(!empty($reviews['respond'])) {
|
| 52 | 52 |
$tpl->assign("output", write_message(_ALREADYRESPONDED));
|
| ... | ... |
@@ -34,7 +34,7 @@ if($numstories) {
|
| 34 | 34 |
$count = 0; |
| 35 | 35 |
$tpl->newBlock("listings");
|
| 36 | 36 |
$tpl->assign("stories", "<div class='sectionheader'>"._STORIESBY." $penname</div>");
|
| 37 |
- $storyquery = dbquery("SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 AND (stories.uid = '$uid' OR coauth.uid = '$uid') GROUP BY stories.sid "._ORDERBY." LIMIT $offset, $itemsperpage");
|
|
| 37 |
+ $storyquery = dbquery("SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 AND (stories.uid = '$uid' OR coauth.uid = '$uid') GROUP BY stories.sid "._ORDERBY." LIMIT $offset, $itemsperpage");
|
|
| 38 | 38 |
while($stories = dbassoc($storyquery)) {
|
| 39 | 39 |
$tpl->newBlock("storyblock");
|
| 40 | 40 |
include("includes/storyblock.php");
|
| ... | ... |
@@ -1,3 +1,17 @@ |
| 1 | 1 |
<?php |
| 2 | 2 |
if(!defined("_CHARSET")) exit( );
|
| 3 |
-$version = "3.5.6"; |
|
| 4 | 3 |
\ No newline at end of file |
| 4 |
+$version = "3.5.6"; |
|
| 5 |
+ |
|
| 6 |
+/* shortcut |
|
| 7 |
+$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'date'"));
|
|
| 8 |
+if($tmp['Type'] == "datetime") {
|
|
| 9 |
+ dbquery("UPDATE " . TABLEPREFIX . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");
|
|
| 10 |
+} |
|
| 11 |
+*/ |
|
| 12 |
+ |
|
| 13 |
+$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time'"));
|
|
| 14 |
+ |
|
| 15 |
+if ($tmp['Type'] == "datetime") |
|
| 16 |
+{
|
|
| 17 |
+ dbquery("UPDATE " . TABLEPREFIX . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");
|
|
| 18 |
+} |
|
| 5 | 19 |
\ No newline at end of file |
| ... | ... |
@@ -32,7 +32,7 @@ else $textsize = 0; |
| 32 | 32 |
if(empty($chapter)) $chapter = isset($_GET['chapter']) && isNumber($_GET['chapter']) ? $_GET['chapter'] : false; |
| 33 | 33 |
|
| 34 | 34 |
// Get the story information |
| 35 |
- $storyquery = dbquery("SELECT "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid, story.*, UNIX_TIMESTAMP(story.date) as date, UNIX_TIMESTAMP(story.updated) as updated, story.validated as valid FROM ".TABLEPREFIX."fanfiction_stories as story, "._AUTHORTABLE." WHERE story.sid = '".$sid."' AND story.uid = "._UIDFIELD);
|
|
| 35 |
+ $storyquery = dbquery("SELECT "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid, story.*, story.date as date, story.updated as updated, story.validated as valid FROM ".TABLEPREFIX."fanfiction_stories as story, "._AUTHORTABLE." WHERE story.sid = '".$sid."' AND story.uid = "._UIDFIELD);
|
|
| 36 | 36 |
$storyinfo = dbassoc($storyquery); |
| 37 | 37 |
if($storyinfo['coauthors'] == 1) {
|
| 38 | 38 |
$coauthors = array(); |