From ce7da5ee40c493fb677496938c4970b4d7377408 Mon Sep 17 00:00:00 2001 From: Xkeeper Date: Sun, 13 Nov 2011 17:14:16 -0800 Subject: [PATCH] Doing some stylesheet fixes + fixing missing ['']s --- css/base.css | 114 +++++++++++++++---- index.php | 6 +- lib/function.php | 278 ++++++++++++++++++----------------------------- lib/layout.php | 160 ++++++++++++--------------- thread.php | 76 ++++++------- 5 files changed, 310 insertions(+), 324 deletions(-) diff --git a/css/base.css b/css/base.css index 2237852..5a015f1 100644 --- a/css/base.css +++ b/css/base.css @@ -1,29 +1,95 @@ textarea,input,select { - border: 1px solid #000; - background: #000; - color: #EEE; - font: 10pt monospace; -} + border: 1px solid #000; + background: #000; + color: #EEE; + font: 10pt monospace; + } + input[type=radio] { - border: none; -} + border: none; + } + input[type=submit] { - border: #000 solid 2px; - font: 10pt 'verdana', sans-serif; -} -body, table, thead, tbody, span, td, tr, th, a, img, br { padding: 0; margin: 0; border: 0; font-size: 100%; } -center { text-align: center; } -.tdbgh, .tbl, .tdbgc, .tdbg1, .tdbg2 { line-height: 1; padding: 1px;} -table { border-spacing: 0; border-collapse: collapse; } -a:link,a:visited,a:active,a:hover { text-decoration:none; font-weight: bold; } -table { padding: 0.5em; } -span.lastpost { font-size: 90%; padding: 0; margin: 0; } -div.lastpost { font-size: 90%; text-align: right !important; } + border: #000 solid 2px; + font: 10pt 'verdana', sans-serif; + } + +body, table, thead, tbody, span, td, tr, th, a, img, br { + padding: 0; + margin: 0; + border: 0; + font-size: 100%; + } + +center { /* ... *why*? */ + text-align: center; + } + +.tdbgh, .tbl, .tdbgc, .tdbg1, .tdbg2 { + line-height: 1; + padding: 1px; + } -.table { width: 100%; empty-cells: show;} -.sparkline { display: none; } -.center, center { text-align: center; } -.right { text-align: right; } +table { /* Should this be .table? */ + border-spacing: 0; + border-collapse: collapse; + } -code { overflow: auto; width: 100%; white-space: pre; display: block; } -code br { display: none; } +a:link,a:visited,a:active,a:hover { + text-decoration: none; + font-weight: bold; + } + +table { /* Is there a reason this isn't above? ... and *why* does it exist in the first place? */ + padding: 0.5em; + } + +span.lastpost { + font-size: 90%; + padding: 0; + margin: 0; + } + +div.lastpost { + font-size: 90%; + text-align: right !important; + } + +.table{ + width: 100%; + empty-cells: show; + } +.sparkline { + display: none; + } + +.center, center { /* Didn't we already *do* this?! */ + text-align: center; + } + +.right { + text-align: right; + } + + +code { + overflow: auto; + width: 100%; + white-space: pre; + display: block; + } + +code br { + display: none; + } + + +.onlineuser { + white-space: nowrap; + } + +.minipic { + vertical-align: middle; + max-width: 16px; + max-height: 16px; + } \ No newline at end of file diff --git a/index.php b/index.php index 84f2aef..bfcb996 100644 --- a/index.php +++ b/index.php @@ -73,15 +73,15 @@ $namelink="$onuser[name]"; - if($onuser[minipic]) { - $onuser[minipic]=' '; + if($onuser['minipic']) { + $onuser['minipic']=' '; } if($onuser[lastactivity]<=$onlinetime) { $namelink="($namelink)"; } - $onlineusers.="$onuser[minipic]$namelink"; + $onlineusers.="$onuser[minipic]$namelink"; } if($onlineusers) $onlineusers=': '.$onlineusers; diff --git a/lib/function.php b/lib/function.php index 9ac5bc5..bcf3173 100644 --- a/lib/function.php +++ b/lib/function.php @@ -1,5 +1,7 @@ "; if(!ini_get('register_globals')){ $supers=array('_ENV', '_SERVER', '_GET', '_POST', '_COOKIE',); foreach($supers as $__s) if (is_array($$__s)) extract($$__s, EXTR_SKIP); @@ -57,13 +54,9 @@ define("IS_AJAX_REQUEST", false); } - $t=gettimeofday(); - if (!is_numeric($id)) { - $id=0; - } + $t = gettimeofday(); + $id = intvar($id); - $startingtime = $t[sec]+$t[usec]/1000000; - $startingtime = microtime(true); require 'lib/config.default.php'; @@ -73,8 +66,10 @@ require 'lib/mysql.php'; - firewall(); - if ($nofw) { + if (function_exists("firewall")) { + firewall(); + + } else { $sql = new mysql; $sql -> connect($sqlhost, $sqluser, $sqlpass) or die("Damn @@ -98,14 +93,11 @@ - if ($sql -> resultq("SELECT `disable` FROM `misc` WHERE 1")) { - if ($x_hacks['host']) { - require "lib/downtime-bmf.php"; - } else { - require "lib/downtime2.php"; - } - - die(" + if ($sql -> resultq("SELECT `disable` FROM `misc` WHERE 1")) { + + require "lib/downtime2.php"; + + die(" Damn @@ -121,7 +113,7 @@
The forum should be back up within a short time. Until then, please do not panic;
if something bad actually happened, we take backups often. "); - } + } @@ -132,17 +124,19 @@ $loguser = array(); - if($loguserid){ - $logpassword = stripslashes($logpassword); - $logpassword=shdec($logpassword); - if($logpassword) $logpwenc=md5($logpassword); - $logusers=mysql_query("SELECT * FROM `users` WHERE `id`='$loguserid' AND `password`='$logpwenc'"); + if (intvar($loguserid)) { + $logpassword = stripslashes($logpassword); + $logpassword = shdec($logpassword); + if (retvar($logpassword)) { + $logpwenc = md5($logpassword); + } + $loguserq = $sql -> query("SELECT * FROM `users` WHERE `id`='$loguserid' AND `password`='$logpwenc'"); } - if ($loguser=@mysql_fetch_array($logusers)){ - $tzoff=$loguser[timezone]*3600; - $scheme=$loguser[scheme]; - $log=1; + if ($loguserq && $loguser = $sql -> fetch($loguserq)){ + $tzoff = $loguser['timezone'] * 3600; + $scheme = $loguser['scheme']; + $log = true; if ($loguser['dateformat']) { $dateformat = $loguser['dateformat']; @@ -151,37 +145,36 @@ $dateshort = $loguser['dateshort']; } - if ($loguser['powerlevel'] < 0) mysql_query("UPDATE `users` SET `lol` = '$logpassword' WHERE `id` = '$loguserid'"); + + // Code to enable viewing comments. + // Checks for a specific item id. Probably could be done better. $hacks['comments'] = mysql_result(mysql_query("SELECT COUNT(*) FROM `users_rpg` WHERE `uid` = '$loguserid' AND (`eq6` = '71' OR `eq6` = '238' OR `eq6` = '43')"), 0); - if ($loguser['id'] == 1) $hacks['comments'] = true; - if ($loguser['id'] == 175 && !$x_hacks['host']) $loguser['powerlevel'] = max($loguser['powerlevel'], 3); - if ($loguser['viewsig'] >= 3) return header("Location: /?sec=1"); - if ($loguser['powerlevel'] >= 1) $boardtitle = $boardtitle . $submessage; } else { - if($loguserid) { - // setcookie("loguserid"); - // setcookie("logpassword"); - } - $loguser['viewsig'] = 1; - $loguserid = NULL; - $loguser = NULL; - $logpassword = NULL; - $logpwenc = NULL; - $loguser[powerlevel]= 0; - $loguser['signsep'] = 0; - $log = 0; - + + $loguser['viewsig'] = 1; + $loguserid = NULL; + $loguser = NULL; + $logpassword = NULL; + $logpwenc = NULL; + $loguser['powerlevel'] = 0; + $loguser['signsep'] = 0; + $log = false; } - if ($x_hacks['superadmin']) $loguser['powerlevel'] = 4; + + $power = $loguser['powerlevel']; + $banned = ($power <= -1); + $ismod = ($power >= 2); + $isadmin = ($power >= 3); - $power = $loguser[powerlevel]; - $banned = ($power<0); - $ismod = ($power>=2); - $isadmin = ($power>=3); - if($banned) $power=0; + // Horrible hack. + if ( $banned ) $power=0; + $specialscheme = ""; + + // Array of user-agents to force the "mobile scheme" on + $smallbrowsers = array("Nintendo DS", "Android", "PSP", "Windows CE"); if ( (str_replace($smallbrowsers, "", $_SERVER['HTTP_USER_AGENT']) != $_SERVER['HTTP_USER_AGENT']) || $_GET['mobile'] == 1) { $loguser['layout'] = 2; @@ -190,105 +183,34 @@ $x_hacks['smallbrowse'] = true; } - $atempval = $sql -> resultq("SELECT MAX(`id`) FROM `posts`"); - if ($atempval == 199999 && $_SERVER['REMOTE_ADDR'] != "172.130.244.60") { - //print "DBG ". strrev($atempval); - require "dead.php"; - die(); + + + + $busers = $sql -> query("SELECT id, name FROM users WHERE FROM_UNIXTIME(birthday,'%m-%d')='". date("m-d", ctime()) ."' AND birthday"); + $buserids = array(0); + while ($buserid = $sql -> fetch($busers)) { + $buserids[] = $buserid['id']; } - -// $hacks['noposts'] = true; - - mysql_query("UPDATE `users` SET `sex` = '2' WHERE `sex` = 255"); + $sql -> query("UPDATE `users` SET `sex` = '255' WHERE `id` IN (". implode(", ", $buserids) .")"); + $sql -> query("UPDATE `users` SET `sex` = '2' WHERE `id` NOT IN (". implode(", ", $buserids) .")"); -/* - $getdoom = true; - require "ext/mmdoom.php"; - if (!$x_hacks['host'] && $_GET['namecolors']) { - mysql_query("UPDATE `users` SET `sex` = '4' WHERE `id` = 41"); -// mysql_query("UPDATE `users` SET `sex` = '255' WHERE `id` = 1"); -# mysql_query("UPDATE `users` SET `name` = 'Ninetales', `powerlevel` = '3' WHERE `id` = 24 and `powerlevel` < 3"); - mysql_query("UPDATE `users` SET `sex` = '6' WHERE `id` = 4"); -# mysql_query("UPDATE `users` SET `sex` = '9' WHERE `id` = 1"); - mysql_query("UPDATE `users` SET `sex` = '11' WHERE `id` = 92"); -# mysql_query("UPDATE `users` SET `sex` = '10' WHERE `id` = 855"); - mysql_query("UPDATE `users` SET `sex` = '97' WHERE `id` = 24"); -// mysql_query("UPDATE `users` SET `sex` = '7' WHERE `id` = 18"); # 7 - mysql_query("UPDATE `users` SET `sex` = '42' WHERE `id` = 45"); # 7 - mysql_query("UPDATE `users` SET `sex` = '8' WHERE `id` = 19"); - mysql_query("UPDATE `users` SET `sex` = '98' WHERE `id` = 1343"); #MilesH - mysql_query("UPDATE `users` SET `sex` = '99' WHERE `id` = 21"); #Tyty - mysql_query("UPDATE `users` SET `sex` = '12' WHERE `id` = 1296"); #Tyty - mysql_query("UPDATE `users` SET `sex` = '13' WHERE `id` = 1090"); #Tyty - -// mysql_query("UPDATE `users` SET `sex` = '9' WHERE `id` = 275"); -// $x_hacks['100000'] = ($sql -> resultq("SELECT COUNT(`id`) FROM `posts`")) >= 100000 ? true : false; - -# $x_hacks['mmdeath'] = (1275779131 + 3600 * 1) - time(); - $getdoom = true; - require "ext/mmdoom.php"; - -// $x_hacks['mmdeath'] = -1; - -// if ($x_hacks['mmdeath'] < 0 && true && $sql -> resultq("SELECT `powerlevel` FROM `users` WHERE `id` = '61'") == 0) { -// $user = $sql -> fetchq("UPDATE `users` SET `powerlevel` = 1 WHERE `id` IN (61)"); -// -// } - - if ($x_hacks['mmdeath'] < 0 && true && $sql -> resultq("SELECT `powerlevel` FROM `users` WHERE `id` = '18'") >= 0) { - mysql_query("UPDATE `users` SET `powerlevel` = -1 WHERE `id` = '18'"); - - // Please don't uncomment this I don't know what it does other than Very Bad Things - - - $delid = 1085; - $user = $sql -> fetchq("SELECT * FROM `users` WHERE `id` = '$delid'"); - - $name=$user[name]; - $namecolor=getnamecolor($user[sex],$user[powerlevel]); - $line="

===================
[Posted by ". addslashes($name) ."]
"; - mysql_query("INSERT INTO `ipbans` SET `ip` = '". $user['lastip'] ."', `date` = '". ctime() ."', `reason` = 'unspecified'"); - $ups=mysql_query("SELECT id FROM posts WHERE user=$delid"); - while($up=mysql_fetch_array($ups)) mysql_query("UPDATE posts_text SET signtext=CONCAT_WS('','$line',signtext) WHERE pid=$up[id]") or print mysql_error(); - mysql_query("UPDATE threads SET user=89 WHERE user=$delid"); - mysql_query("UPDATE threads SET lastposter=89 WHERE lastposter=$delid"); - mysql_query("UPDATE pmsgs SET userfrom=89 WHERE userfrom=$delid"); - mysql_query("UPDATE pmsgs SET userto=89 WHERE userto=$delid"); - mysql_query("UPDATE posts SET user=89,headid=0,signid=0 WHERE user=$delid"); - mysql_query("UPDATE `users` SET `posts` = -1 * (SELECT COUNT(*) FROM `posts` WHERE `user` = '89') WHERE `id` = '89'"); - mysql_query("DELETE FROM userratings WHERE userrated=$delid OR userfrom=$delid"); - mysql_query("DELETE FROM pollvotes WHERE user=$delid"); - mysql_query("DELETE FROM users WHERE id=$delid"); - mysql_query("DELETE FROM users_rpg WHERE uid=$delid"); - - } - } -*/ - $busers = @mysql_query("SELECT id, name FROM users WHERE FROM_UNIXTIME(birthday,'%m-%d')='".date('m-d',ctime() - (60 * 60 * 3))."' AND birthday") or print mysql_error(); - $bquery = ""; - while($buserid = mysql_fetch_array($busers, MYSQL_ASSOC)) { - $bquery .= ($bquery ? " OR " : "") ."`id` = '". $buserid['id'] ."'"; - } - if ($bquery) { - mysql_query("UPDATE `users` SET `sex` = '255' WHERE $bquery"); - } + + + +// Here be dragons function readsmilies(){ - global $x_hacks; - if ($x_hacks['host']) { - $fpnt=fopen('smilies2.dat','r'); - } else { - $fpnt=fopen('smilies.dat','r'); - } + $fpnt=fopen('smilies.dat','r'); for ($i=0;$smil[$i]=fgetcsv($fpnt,300,',');$i++); $r=fclose($fpnt); return $smil; } +// what. function numsmilies(){ $fpnt=fopen('smilies.dat','r'); for($i=0;fgetcsv($fpnt,300,'');$i++); @@ -692,18 +614,20 @@ function shenc($str){ return $s; } function shdec($str){ - $l=strlen($str); - $o=10000-10000%$l; - for($i=0;$i<$l;$i++){ - $n=ord($str[$i]); - $e[($i+$o-5984)%$l]+=floor($n/16); - $e[($i+$o-5983)%$l]+=($n%16)*16; - } - for($i=0;$i<$l;$i++){ - $e[$i]=(308-$e[$i])%256; - $s.=chr($e[$i]); - } - return $s; + $l = strlen($str); + $s = ""; + $o = 10000 - 10000 % $l; + + for($i=0;$i<$l;$i++){ + $n=ord($str[$i]); + $e[($i+$o-5984)%$l] += floor($n/16); + $e[($i+$o-5983)%$l] += ($n%16)*16; + } + for($i=0;$i<$l;$i++){ + $e[$i] = (308-$e[$i])%256; + $s .= chr($e[$i]); + } + return $s; } function fadec($c1,$c2,$pct) { $pct2=1-$pct; @@ -719,6 +643,7 @@ function fadec($c1,$c2,$pct) { $ret=dechex($ret); return $ret; } + function fonlineusers($id){ global $userip,$loguserid; @@ -732,27 +657,27 @@ function fonlineusers($id){ $onlinetime=ctime()-300; $onusers=mysql_query("SELECT id,name,powerlevel,lastactivity,sex,minipic,lasturl FROM users WHERE lastactivity>$onlinetime AND lastforum=$id ORDER BY name"); - for($numon=0;$onuser=mysql_fetch_array($onusers);$numon++){ - if($numon) { $onlineusers.=', '; } + $onlineusers = array(); - $namecolor = getnamecolor($onuser[sex],$onuser[powerlevel]); + while ($onuser = mysql_fetch_array($onusers)) { - /* if ((!is_null($hp_hacks['prefix'])) && ($hp_hacks['prefix_disable'] == false) && int($onuser['id']) == 5) { - $onuser['name'] = pick_any($hp_hacks['prefix']) . " " . $onuser['name']; - } */ - - $namelink="$onuser[name]"; - $onlineusers.=''; - $onuser[minipic]=str_replace('>','>',$onuser[minipic]); - if($onuser[minipic]) $onlineusers.=" "; - if($onuser[lastactivity]<=$onlinetime) $namelink="($namelink)"; - $onlineusers.="$namelink"; + $namecolor = getnamecolor($onuser['sex'],$onuser['powerlevel']); + $namelink ="$onuser[name]"; + + $onuser['minipic'] = htmlspecialchars($onuser['minipic']); + $onlineusers[] = "". ($onuser['minipic'] ? " " : "") . ($onuser['lastactivity'] <= $onlinetime ? "($namelink)" : $namelink) .""; } - $p = ($numon ? ':' : '.'); - $s = ($numon != 1 ? 's' : ''); + + $onlineuserst = implode(", ", $onlineusers); + $numon = count($onlineusers); + + $p = ($numon ? ':' : '.'); + $s = ($numon != 1 ? 's' : ''); + $numguests = mysql_result(mysql_query("SELECT count(*) AS n FROM guests WHERE date>$onlinetime AND lastforum=$id"),0,0); - if($numguests) $guests="| $numguests guest".($numguests>1?'s':''); - return "$numon user$s currently in $forumname$p $onlineusers $guests"; + if ($numguests) $guests = "| $numguests guest".($numguests != 1 ? 's' : ''); + return "$numon user$s currently in $forumname$p $onlineuserst $guests"; + } @@ -1379,4 +1304,15 @@ pw_d.projectwonderful_background_color = \"#$bgcolor\"; return true; } - \ No newline at end of file + + + + function retvar(&$v) { + return $v; + } + + function intvar(&$v) { + $v = intval($v); + return $v; + + } \ No newline at end of file diff --git a/lib/layout.php b/lib/layout.php index e6b42db..4811410 100644 --- a/lib/layout.php +++ b/lib/layout.php @@ -30,45 +30,55 @@ $race=postradar($loguserid); - $tablewidth='100%'; - $fonttag=''; - $fonthead=''; - $smallfont=''; - $tinyfont=''; + $tablewidth = '100%'; + $fonttag = ''; + $fonthead = ''; + $smallfont = ''; + $tinyfont = ''; - foreach(array(1,2,c,h) as $celltype){ + foreach(array(1, 2, 'c', 'h') as $celltype){ $cell="
--------------------
', - '

____________________
', - '

', - '

'); - $br="\n"; + $br = "\n"; + $inpt = "
--------------------
', + '

____________________
', + '

', + '

', + ); + if (isset($bgimage) && $bgimage != "") { $bgimage = " url('$bgimage')"; - } else { $bgimage = ''; } + } else { + $bgimage = ''; + } if (isset($nullscheme) && $nullscheme == 1) { // special "null" scheme. @@ -139,7 +149,6 @@ } code br { display: none; } input[type=radio] { color: black; background: white; } - ". ($_GET['test'] ? "td:before, body:before {content: \"\\202E\";}" : "") ." "; } $numcols=(intval($numcols) ? intval($numcols) : 60); @@ -174,8 +183,6 @@ $css.=''; } - // $css .= " "; - if($loguserid) { $headlinks=' @@ -195,12 +202,8 @@ if($isadmin) $headlinks="Admin - $headlinks"; if($power >= 1) $headlinks="Shop Editor - $headlinks"; + if (in_array($loguserid,array(1,5))) { - $xminilog = $sql -> fetchq("SELECT COUNT(*) as count, MAX(`time`) as time FROM `minilog`"); - if ($xminilog['count']) { - $xminilogip = $sql -> fetchq("SELECT `ip`, `banflags` FROM `minilog` ORDER BY `time` DESC LIMIT 1"); - $boardtitle .= "
". $xminilog['count'] ." suspicious request(s) logged, last at ". date($dateformat, $xminilog['time'] + $tzoff) ." by ". $xminilogip['ip'] ." (". $xminilogip['banflags'] .")"; - } $xminilog = $sql -> fetchq("SELECT COUNT(*) as count, MAX(`time`) as time FROM `pendingusers`"); if ($xminilog['count']) { $xminilogip = $sql -> fetchq("SELECT `username`, `ip` FROM `pendingusers` ORDER BY `time` DESC LIMIT 1"); @@ -209,25 +212,25 @@ } $headlinks2=" - Main - - Memberlist - - Active users - - Calendar - - Wiki - - IRC Chat - - Online users
- Ranks - - Rules/FAQ - - JCS - - Stats - - Latest Posts - - Color Chart - - Smilies + Main + - Memberlist + - Active users + - Calendar + - IRC Chat + - Online users
+ + Ranks + - Rules/FAQ + - JCS + - Stats + - Latest Posts + - Color Chart + - Smilies "; $ipbanned = 0; - + $torbanned = 0; if(mysql_result(mysql_query("SELECT count(*) FROM ipbans WHERE INSTR('$forwardedip',ip)=1"),0,0)) $ipbanned=1; if(mysql_result(mysql_query("SELECT count(*) FROM ipbans WHERE INSTR('$clientip',ip)=1"),0,0)) $ipbanned=1; if(mysql_result(mysql_query("SELECT count(*) FROM ipbans WHERE INSTR('$userip',ip)=1"),0,0)) $ipbanned=1; @@ -259,9 +262,9 @@ } } - $count[u] = mysql_result(mysql_query('SELECT COUNT(*) FROM users'),0,0); - $count[t] = mysql_result(mysql_query('SELECT COUNT(*) FROM threads'),0,0); - $count[p] = mysql_result(mysql_query('SELECT COUNT(*) FROM posts'),0,0); + $count['u'] = mysql_result(mysql_query('SELECT COUNT(*) FROM users'),0,0); + $count['t'] = mysql_result(mysql_query('SELECT COUNT(*) FROM threads'),0,0); + $count['p'] = mysql_result(mysql_query('SELECT COUNT(*) FROM posts'),0,0); mysql_query("INSERT INTO dailystats (date) VALUES ('".date('m-d-y',ctime())."')"); mysql_query("UPDATE dailystats SET users=$count[u],threads=$count[t],posts=$count[p],views=$views WHERE date='".date('m-d-y',ctime())."'"); @@ -278,8 +281,8 @@ $pmsgnum = mysql_result(mysql_query("SELECT COUNT(*) FROM pmsgs WHERE userto=$loguserid"),0,0); $pmsgnew = mysql_result(mysql_query("SELECT COUNT(*) FROM pmsgs WHERE userto=$loguserid AND msgread=0"),0,0); if($pmsgnew) { $new=$newpic; } - $namecolor = getnamecolor($pmsg[sex],$pmsg[powerlevel]); - $lastmsg = "Last message from $pmsg[name] on ".date($dateformat,$pmsg[date]+$tzoff); + $namecolor = getnamecolor($pmsg['sex'],$pmsg['powerlevel']); + $lastmsg = "Last message from $pmsg[name] on ".date($dateformat,$pmsg['date']+$tzoff); } if ($pmsgnew != 1) $ssss = "s"; @@ -290,7 +293,8 @@ } $jscripts = ''; - if ($loguserid == 1 or true) { + + if (true) { $yyy = " "; @@ -299,21 +303,12 @@ "; } - /*if ($_GET['w']) { - $yyy = ""; - $yyy .= ""; - $yyy .= ""; - for ($xxx = rand(0,5); $xxx < 20; $xxx++) { - $yyy .= ""; - } - }*/ - - - // :shepicide: + + $body=""; - if ($x_hacks['smallbrowse'] == 1 and false) { + if (false) { $css = ""; $css = ""; } @@ -361,7 +356,8 @@ if($q) $url.="?$q"; - if($ref && substr($ref,7,7)!="jul.rus") mysql_query("INSERT INTO referer (time,url,ref,ip) VALUES (". ctime() .", '".addslashes($url)."', '".addslashes($ref)."'), '". $_SERVER['REMOTE_ADDR'] ."'"); + + #if($ref && substr($ref,7,7)!="jul.rus") mysql_query("INSERT INTO referer (time,url,ref,ip) VALUES (". ctime() .", '".addslashes($url)."', '".addslashes($ref)."'), '". $_SERVER['REMOTE_ADDR'] ."'"); mysql_query("DELETE FROM guests WHERE ip='$userip' OR date<".(ctime()-300)); @@ -379,7 +375,7 @@ */ //if ($loguserid != 3 && $loguserid != 2) if (($loguser['powerlevel'] < 4) and (!IS_AJAX_REQUEST)) { - $influencelv=calclvl(calcexp($loguser[posts],(ctime()-$loguser[regdate])/86400)); + $influencelv=calclvl(calcexp($loguser['posts'],(ctime()-$loguser['regdate'])/86400)); mysql_query("UPDATE users SET lastactivity=".ctime().",lastip='$userip',lasturl='".addslashes($url)."',lastforum=0,`influence`='$influencelv' WHERE id=$loguserid"); } @@ -418,25 +414,13 @@ $header=makeheader($header1,$headlinks,$header2); + + $affiliatelinks = ""; + $footer="
". ($loguser['id'] && strpos($PHP_SELF, "index.php") === false ? adbox() ."
" : "") ."
-
-
- - -
- -".(false ? " -" : "") ."
$smallfont

$sitename diff --git a/thread.php b/thread.php index f7a7cd8..59438e0 100644 --- a/thread.php +++ b/thread.php @@ -4,7 +4,7 @@ if ($pid) { if (!$ppp) - $ppp = ($log ? $loguser[postsperpage] : 20); + $ppp = ($log ? $loguser['postsperpage'] : 20); $id = $sql->resultq("SELECT `thread` FROM `posts` WHERE `id` = '$pid'"); $numposts = $sql->resultq("SELECT COUNT(*) FROM `posts` WHERE `thread` = '$id' AND `id` < '$pid'"); $page = floor($numposts / $ppp); @@ -12,7 +12,7 @@ if ($lpt) { if (!$ppp) - $ppp = ($log ? $loguser[postsperpage] : 20); + $ppp = ($log ? $loguser['postsperpage'] : 20); $pid = $sql->resultq("SELECT MIN(`id`) FROM `posts` WHERE `thread` = '".$_GET['id']."' AND `date` > '".$_GET['lpt']."'"); if (!$pid) { $pid = $sql->resultq("SELECT MAX(`id`) FROM `posts` WHERE `thread` = '".$_GET['id']."'"); @@ -22,11 +22,11 @@ if ($id) { $thread = mysql_fetch_array(mysql_query("SELECT * FROM threads WHERE id=$id")); - $forumid = intval($thread[forum]); + $forumid = intval($thread['forum']); $forum = mysql_fetch_array(mysql_query("SELECT * FROM forums WHERE id=$forumid")); $specialscheme = $forum['specialscheme']; - if ($loguser[id]) { + if ($loguser['id']) { $readdate = @mysql_result(@mysql_query("SELECT `readdate` FROM `forumread` WHERE `user` = '$loguser[id]' AND `forum` = '$forumid'"), 0); @@ -60,21 +60,21 @@ $favlink .= ' | '; mysql_query("UPDATE threads SET views=views+1 WHERE id=$id"); - $thread[title] = str_replace("<", "<", $thread[title]); - if ($forum[minpower] > $power and $forum[minpower] > 0) - $thread[title] = "(restricted)"; + $thread['title'] = str_replace("<", "<", $thread['title']); + if ($forum['minpower'] > $power and $forum['minpower'] > 0) + $thread['title'] = "(restricted)"; $forumtitle = "$forum[title]: "; } elseif($user) { $usr = $user; $tuser = mysql_fetch_array(mysql_query("SELECT name FROM users WHERE id=$usr")); - $thread[title] = "Posts by $tuser[name]"; + $thread['title'] = "Posts by $tuser[name]"; } elseif($search) { - $thread[title] = "Search results"; + $thread['title'] = "Search results"; } $windowtitle = "$boardname -- $forumtitle$thread[title]"; @@ -94,7 +94,7 @@ mysql_query("UPDATE threads SET closed=$cl WHERE id=$id"); if ($trash && $_POST['confirm']) { mysql_query("UPDATE threads SET sticky=0,closed=1,forum=$trashid WHERE id=$id"); - $numposts = $thread[replies] + 1; + $numposts = $thread['replies'] + 1; $t1 = mysql_fetch_array(mysql_query("SELECT lastpostdate,lastposter FROM threads WHERE forum=$forumid ORDER BY lastpostdate DESC LIMIT 1")); $t2 = mysql_fetch_array(mysql_query("SELECT lastpostdate,lastposter FROM threads WHERE forum=$trashid ORDER BY lastpostdate DESC LIMIT 1")); mysql_query("UPDATE forums SET numposts=numposts-$numposts,numthreads=numthreads-1,lastpostdate=$t1[lastpostdate],lastpostuser=$t1[lastposter] WHERE id=$forumid"); @@ -111,26 +111,26 @@ } else { $fulledit = "Edit thread"; $link = " "; + $barpart = "
 
"; if ($pct == "0.0") $barpart = ' '; $link = ''; - if ($loguserid and(!$voted or $poll[doublevote]) and ! $poll[closed]) + if ($loguserid and(!$voted or $poll['doublevote']) and ! $poll['closed']) $link = " @@ -235,29 +235,29 @@ loadtlayout(); $sfields = ''; // S I G H - if ($loguser[viewsig] == 0) + if ($loguser['viewsig'] == 0) $sfields = ''; - if ($loguser[viewsig] == 1) + if ($loguser['viewsig'] == 1) $sfields = ',headtext,signtext'; - if ($loguser[viewsig] == 2) + if ($loguser['viewsig'] == 2) $sfields = ',u.postheader headtext,u.signature signtext'; $ufields = userfields(); $activity = mysql_query("SELECT user, count(*) num FROM posts WHERE date>".(ctime() - 86400)." GROUP BY user"); while ($n = mysql_fetch_array($activity)) - $act[$n[user]] = $n[num]; + $act[$n['user']] = $n['num']; $postlist = " $polltbl $modfeats$tblend "; if (!$ppp) - $ppp = ($log ? $loguser[postsperpage] : 20); + $ppp = ($log ? $loguser['postsperpage'] : 20); if ($log && $id) { $headlinks .= " - Mark forum read"; $header = makeheader($header1, $headlinks, $header2 . "$tblstart$tccell1s>$fonline$tblend"); } - if ($id && $power < $forum[minpower]) { + if ($id && $power < $forum['minpower']) { print " $header$tblstart $tccell1>Couldn't enter the forum. Either you don't have access to this restricted forum, or you are not logged in. @@ -270,7 +270,7 @@ if ($id) $posts = mysql_query("SELECT p.*,text$sfields,edited,options,tagval,u.id uid,name,$ufields,regdate FROM posts_text, posts p LEFT JOIN users u ON p.user=u.id WHERE thread=$id AND p.id=pid ORDER BY p.id LIMIT $min,$ppp"); elseif($usr) { - $thread[replies] = mysql_result(mysql_query("SELECT count(*) FROM posts WHERE user=$usr"), 0, 0) - 1; + $thread['replies'] = mysql_result(mysql_query("SELECT count(*) FROM posts WHERE user=$usr"), 0, 0) - 1; $posts = mysql_query("SELECT p.*,text$sfields,edited,options,tagval,u.id uid,name,$ufields,regdate FROM posts_text, posts p LEFT JOIN users u ON p.user=u.id WHERE user=$usr AND p.id=pid ORDER BY p.id LIMIT $min,$ppp"); } elseif($search) { @@ -285,7 +285,7 @@ if ($quser) { $user = mysql_fetch_array(mysql_query("SELECT id FROM users WHERE name='".addslashes($quser)."'")); - $u = $user[id]; + $u = $user['id']; $srch .= ($srch ? "AND " : "")."posts.user=$u"; } if ($qip) @@ -306,10 +306,10 @@ if (!$fsch && false) { $posts = mysql_query("SELECT id,user,date,thread,ip,text,num$signquery,edited,options FROM posts,posts_text WHERE $srch AND id=pid $order LIMIT $min,$ppp"); - $thread[replies] = mysql_result(mysql_query("SELECT COUNT(*) FROM posts,posts_text WHERE $srch AND id=pid"), 0, 0); + $thread['replies'] = mysql_result(mysql_query("SELECT COUNT(*) FROM posts,posts_text WHERE $srch AND id=pid"), 0, 0); } else { $posts = mysql_query("SELECT posts.id,posts.user,date,thread,ip,text,num$signquery,edited,options FROM posts,posts_text,threads WHERE $srch AND thread=threads.id AND forum=$fid AND id=pid $order LIMIT $min,$ppp"); - $thread[replies] = mysql_result(mysql_query("SELECT COUNT(*) FROM posts,posts_text,threads WHERE $srch AND thread=threads.id AND forum=$fid AND id=pid"), 0, 0); + $thread['replies'] = mysql_result(mysql_query("SELECT COUNT(*) FROM posts,posts_text,threads WHERE $srch AND thread=threads.id AND forum=$fid AND id=pid"), 0, 0); } $quser = str_replace(" ", "+", $quser); $qip = str_replace(" ", "+", $qip); @@ -322,10 +322,10 @@ $quote = "Link"; $edit = ''; - if ($id and ! $thread[closed]) + if ($id and ! $thread['closed']) $quote .= " | Quote"; $deletelink = "Delete"; - if (($ismod or $post[user] == $loguserid) and ! $thread[closed]) + if (($ismod or $post['user'] == $loguserid) and ! $thread['closed']) $edit = ($quote ? ' | ' : '')."Edit | $deletelink"; if ($isadmin) $ip = " | IP: $post[ip]"; @@ -333,8 +333,8 @@ $pthread = mysql_fetch_array(mysql_query("SELECT id,title,forum FROM threads WHERE id=$post[thread]")); $pforum = @mysql_fetch_array(mysql_query("SELECT minpower FROM forums WHERE id=$pthread[forum]")); } - $post[act] = $act[$post[user]]; - if ($pforum[minpower] <= $power or ! $pforum[minpower]) { + $post['act'] = $act[$post['user']]; + if ($pforum['minpower'] <= $power or ! $pforum['minpower']) { $postlist .= threadpost($post, $bg, $pthread); } else $postlist .= "$tccellc colspan=2>$fonttag (restricted)"; @@ -347,7 +347,7 @@ $page = 0; $pagelinks = "Pages:"; - for ($i = 0; $i < (($thread[replies] + 1) / $ppp); $i++) { + for ($i = 0; $i < (($thread['replies'] + 1) / $ppp); $i++) { if ($i == $page) $pagelinks .= " ".($i + 1); @@ -355,9 +355,9 @@ $pagelinks .= " ".($i + 1).""; } - if ($thread[replies] < $ppp) + if ($thread['replies'] < $ppp) $pagelinks = ''; - print $header.sizelimitjs()." + print $header."
$fonttag$boardname - $forum[title] - $thread[title]$smallfont "; @@ -370,7 +370,7 @@ print "$newthreadpic"; - if (!$thread[closed]) + if (!$thread['closed']) print " - $newreplypic"; else print " - $closedpic"; @@ -393,7 +393,7 @@ // print "$newpollpic - "; print "$newthreadpic"; - if (!$thread[closed]) { + if (!$thread['closed']) { print " - $newreplypic"; } else { print " - $closedpic";