[parasy commit] r53 - in trunk/upload: . images/way include include/javascript parasy templates/babel templates/css

2 views

Skip to first unread message

codesite...@google.com

unread,

Jun 10, 2008, 4:10:58 AM6/10/08

to project...@googlegroups.com

Author: Saiccc
Date: Tue Jun 10 01:09:33 2008
New Revision: 53

Added:
trunk/upload/images/way/bg_summer_3.jpg (contents, props changed)
trunk/upload/include/db_mysql.class.php
trunk/upload/redirect.php
Removed:
trunk/upload/images/way/bg_space.jpg
Modified:
trunk/upload/.htaccess
trunk/upload/include/common.inc.php
trunk/upload/include/global.func.php
trunk/upload/include/javascript/home_tabs.js
trunk/upload/parasy/ParasyCore.php
trunk/upload/parasy/ParasySettings.inc.php
trunk/upload/parasy/SimpleCommon.inc.php
trunk/upload/parasy_now_api.php
trunk/upload/parasy_operation.php
trunk/upload/templates/babel/dashboard.htm
trunk/upload/templates/babel/dashboard_topic.htm
trunk/upload/templates/babel/i_avatar.htm
trunk/upload/templates/babel/i_fav.htm
trunk/upload/templates/babel/viewpro_classic.htm
trunk/upload/templates/babel/viewthread.htm
trunk/upload/templates/css/css_babel.css
trunk/upload/templates/css/dashboard.css
trunk/upload/viewpro.php
trunk/upload/viewthread.php

Log:
UIs Updated,Friendly URL

Modified: trunk/upload/.htaccess
==============================================================================
--- trunk/upload/.htaccess (original)
+++ trunk/upload/.htaccess Tue Jun 10 01:09:33 2008
@@ -27,6 +27,10 @@
RewriteRule ^forum/([0-9]+)/([0-9]+)$ forumdisplay.php?fid=$1&page=$2 [L]
RewriteRule ^channel/([0-9]*).html$ parasy_channel.php?channel_id=$1 [L]

+RewriteRule ^topic/view/([0-9]+)\.html$ viewthread.php?tid=$1&page=1[L]
+RewriteRule ^topic/view/([0-9]+)/([0-9]+)\.html$ viewthread.php?tid=$1&page=$2[L]
+
+
RewriteRule ^go/([a-zA-Z0-9\-]+)$ forumdisplay.php?name=$1 [L]
RewriteRule ^go/([a-zA-Z0-9\-]+)/$ forumdisplay.php?name=$1 [L]

Added: trunk/upload/images/way/bg_summer_3.jpg
==============================================================================
Binary file. No diff available.

Modified: trunk/upload/include/common.inc.php
==============================================================================
--- trunk/upload/include/common.inc.php (original)
+++ trunk/upload/include/common.inc.php Tue Jun 10 01:09:33 2008
@@ -15,6 +15,7 @@

define('IN_DISCUZ', TRUE);
define('DISCUZ_ROOT', substr(dirname(__FILE__), 0, -7));
+define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());

if(PHP_VERSION < '4.1.0') {
$_GET = &$HTTP_GET_VARS;
@@ -43,13 +44,14 @@
exit(header("HTTP/1.1 403 Forbidden"));
}

-define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());
foreach(array('_COOKIE', '_POST', '_GET') as $_request) {
foreach($$_request as $_key => $_value) {
$_key{0} != '_' && $$_key = daddslashes($_value);
}
}
-(!MAGIC_QUOTES_GPC) && $_FILES = daddslashes($_FILES);
+if (!MAGIC_QUOTES_GPC && $_FILES) {
+ $_FILES = daddslashes($_FILES);
+}

$charset = $dbcharset = $forumfounders = $metakeywords = $extrahead = $seodescription = '';
$plugins = $hooks = $admincp = $jsmenu = $forum = $thread = $language = $actioncode = $modactioncode = $lang = array();
@@ -121,7 +123,7 @@
}

$db = new dbstuff;
-$db->connect($dbhost, $dbuser, $dbpw, $dbname, $pconnect);
+$db->connect($dbhost, $dbuser, $dbpw, $dbname, $pconnect, true, $dbcharset);
$dbuser = $dbpw = $dbname = $pconnect = NULL;

$sid = daddslashes(($transsidstatus || (defined('CURSCRIPT') && CURSCRIPT == 'wap'))&& (isset($_GET['sid']) || isset($_POST['sid'])) ?
@@ -150,14 +152,12 @@
if($_DSESSION = $db->fetch_array($query)) {
$sessionexists = 1;
if(!empty($_DSESSION['sessionuid'])) {
- $query = $db->query("SELECT $membertablefields
- FROM {$tablepre}members m WHERE uid='$_DSESSION[sessionuid]'");
- $_DSESSION = array_merge($_DSESSION, $db->fetch_array($query));
+ $_DSESSION = array_merge($_DSESSION, $db->fetch_first("SELECT $membertablefields
+ FROM {$tablepre}members m WHERE uid='$_DSESSION[sessionuid]'"));
}
} else {
- $query = $db->query("SELECT sid, groupid, groupid='6' AS ipbanned, pageviews AS spageviews, styleid, lastolupdate, seccode
- FROM {$tablepre}sessions WHERE sid='$sid' AND CONCAT_WS('.',ip1,ip2,ip3,ip4)='$onlineip'");
- if($_DSESSION = $db->fetch_array($query)) {
+ if($_DSESSION = $db->fetch_first("SELECT sid, groupid, groupid='6' AS ipbanned, pageviews AS spageviews, styleid, lastolupdate, seccode
+ FROM {$tablepre}sessions WHERE sid='$sid' AND CONCAT_WS('.',ip1,ip2,ip3,ip4)='$onlineip'")) {
clearcookies();
$sessionexists = 1;
}
@@ -166,9 +166,8 @@

if(!$sessionexists) {
if($discuz_uid) {
- $query = $db->query("SELECT $membertablefields
- FROM {$tablepre}members m WHERE m.uid='$discuz_uid' AND m.password='$discuz_pw' AND m.secques='$discuz_secques'");
- if(!($_DSESSION = $db->fetch_array($query))) {
+ if(!($_DSESSION = $db->fetch_first("SELECT $membertablefields, m.styleid
+ FROM {$tablepre}members m WHERE m.uid='$discuz_uid' AND m.password='$discuz_pw' AND m.secques='$discuz_secques'"))) {
clearcookies();
}
}
@@ -239,8 +238,7 @@

$_DSESSION['groupid'] = $groupid = empty($ipbanned) ? (empty($groupid) ? 7 : intval($groupid)) : 6;
if(!@include DISCUZ_ROOT.'./forumdata/cache/usergroup_'.$groupid.'.php') {
- $query = $db->query("SELECT type FROM {$tablepre}usergroups WHERE groupid='$groupid'");
- $grouptype = $db->result($query, 0);
+ $grouptype = $db->result_first("SELECT type FROM {$tablepre}usergroups WHERE groupid='$groupid'");
if(!empty($grouptype)) {
$cachelost .= ' usergroup_'.$groupid;
} else {
@@ -293,25 +291,22 @@

if(!empty($tid) || !empty($fid) || !empty($name)) {
if($fid) {
- $query = $db->query("SELECT f.fid, f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
+ $forum = $db->fetch_first("SELECT f.fid, f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
FROM {$tablepre}forums f
LEFT JOIN {$tablepre}forumfields ff ON ff.fid=f.fid $accessadd2 $modadd2
WHERE f.fid='$fid'");
- $forum = $db->fetch_array($query);
} elseif($name) {
$name = strtolower(trim($name));
- $query = $db->query("SELECT f.fid, f.board_name,f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
- FROM {$tablepre}forums f
- LEFT JOIN {$tablepre}forumfields ff ON ff.fid=f.fid $accessadd2 $modadd2
- WHERE f.board_name='{$name}'");
- $forum = $db->fetch_array($query);
+ $forum = $db->fetch_first("SELECT f.fid, f.board_name,f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
+ FROM {$tablepre}forums f
+ LEFT JOIN {$tablepre}forumfields ff ON ff.fid=f.fid $accessadd2 $modadd2
+ WHERE f.board_name='{$name}'");
} else {
- $query = $db->query("SELECT t.tid, t.closed,".(defined('SQL_ADD_THREAD') ? SQL_ADD_THREAD : '')." f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
+ $forum = $db->fetch_first("SELECT t.tid, t.closed,".(defined('SQL_ADD_THREAD') ? SQL_ADD_THREAD : '')." f.*, ff.* $accessadd1 $modadd1, f.fid AS fid
FROM {$tablepre}threads t
INNER JOIN {$tablepre}forums f ON f.fid=t.fid
LEFT JOIN {$tablepre}forumfields ff ON ff.fid=f.fid $accessadd2 $modadd2
WHERE t.tid='$tid'".($auditstatuson ? '' : " AND t.displayorder>='0'")." LIMIT 1");
- $forum = $db->fetch_array($query);
$tid = $forum['tid'];
}

Added: trunk/upload/include/db_mysql.class.php
==============================================================================
--- (empty file)
+++ trunk/upload/include/db_mysql.class.php Tue Jun 10 01:09:33 2008
@@ -0,0 +1,138 @@
+<?php
+
+/*
+ [Discuz!] (C)2001-2007 Comsenz Inc.
+ This is NOT a freeware, use is subject to license terms
+
+ $RCSfile: db_mysql.class.php,v $
+ $Revision: 1.27.2.3 $
+ $Date: 2007/03/21 15:52:38 $
+*/
+
+if(!defined('IN_DISCUZ')) {
+ exit('Access Denied');
+}
+
+class dbstuff {
+
+ var $version = '';
+ var $querynum = 0;
+ var $link;
+
+ function connect($dbhost, $dbuser, $dbpw, $dbname = '', $pconnect = 0, $halt = TRUE, $dbcharset2 = '') {
+
+ $func = empty($pconnect) ? 'mysql_connect' : 'mysql_pconnect';
+ if(!$this->link = @$func($dbhost, $dbuser, $dbpw, 1)) {
+ $halt && $this->halt('Can not connect to MySQL server');
+ } else {
+ if($this->version() > '4.1') {
+ global $charset, $dbcharset;
+ $dbcharset = $dbcharset2 ? $dbcharset2 : $dbcharset;
+ $dbcharset = !$dbcharset && in_array(strtolower($charset), array('gbk', 'big5', 'utf-8')) ? str_replace('-', '', $charset) : $dbcharset;
+ $serverset = $dbcharset ? 'character_set_connection='.$dbcharset.', character_set_results='.$dbcharset.', character_set_client=binary' : '';
+ $serverset .= $this->version() > '5.0.1' ? ((empty($serverset) ? '' : ',').'sql_mode=\'\'') : '';
+ $serverset && mysql_query("SET $serverset", $this->link);
+ }
+ $dbname && @mysql_select_db($dbname, $this->link);
+ }
+
+ }
+
+ function select_db($dbname) {
+ return mysql_select_db($dbname, $this->link);
+ }
+
+ function fetch_array($query, $result_type = MYSQL_ASSOC) {
+ return mysql_fetch_array($query, $result_type);
+ }
+
+ function fetch_first($sql) {
+ return $this->fetch_array($this->query($sql));
+ }
+
+ function result_first($sql) {
+ return $this->result($this->query($sql), 0);
+ }
+ function query($sql, $type = '') {
+ global $debug, $discuz_starttime, $sqldebug, $sqlspenttimes;
+
+ $func = $type == 'UNBUFFERED' && @function_exists('mysql_unbuffered_query') ?
+ 'mysql_unbuffered_query' : 'mysql_query';
+ if(!($query = $func($sql, $this->link))) {
+ if(in_array($this->errno(), array(2006, 2013)) && substr($type, 0, 5) != 'RETRY') {
+ $this->close();
+ require DISCUZ_ROOT.'./config.inc.php';
+ $this->connect($dbhost, $dbuser, $dbpw, $dbname, $pconnect, true, $dbcharset);
+ $this->query($sql, 'RETRY'.$type);
+ } elseif($type != 'SILENT' && substr($type, 5) != 'SILENT') {
+ $this->halt('MySQL Query Error', $sql);
+ }
+ }
+
+
+ $this->querynum++;
+ return $query;
+ }
+
+ function affected_rows() {
+ return mysql_affected_rows($this->link);
+ }
+
+ function error() {
+ return (($this->link) ? mysql_error($this->link) : mysql_error());
+ }
+
+ function errno() {
+ return intval(($this->link) ? mysql_errno($this->link) : mysql_errno());
+ }
+
+ function result($query, $row = 0) {
+ $query = @mysql_result($query, $row);
+ return $query;
+ }
+
+ function num_rows($query) {
+ $query = mysql_num_rows($query);
+ return $query;
+ }
+
+ function num_fields($query) {
+ return mysql_num_fields($query);
+ }
+
+ function free_result($query) {
+ return mysql_free_result($query);
+ }
+
+ function insert_id() {
+ return ($id = mysql_insert_id($this->link)) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
+ }
+
+ function fetch_row($query) {
+ $query = mysql_fetch_row($query);
+ return $query;
+ }
+
+ function fetch_fields($query) {
+ return mysql_fetch_field($query);
+ }
+
+ function version() {
+ if(empty($this->version)) {
+ $this->version = mysql_get_server_info($this->link);
+ }
+ return $this->version;
+ }
+
+ function close() {
+ return mysql_close($this->link);
+ }
+
+ function halt($message = '', $sql = '') {
+
+ define('CACHE_FORBIDDEN', TRUE);
+ require_once DISCUZ_ROOT.'./include/db_mysql_error.inc.php';
+ }
+}
+
+?>
\ No newline at end of file

Modified: trunk/upload/include/global.func.php
==============================================================================
--- trunk/upload/include/global.func.php (original)
+++ trunk/upload/include/global.func.php Tue Jun 10 01:09:33 2008
@@ -503,7 +503,8 @@

function rewrite_thread($tid, $page = 0, $prevpage = 0, $extra = '') {
global $bbsdir;
- return '<a href="'.$bbsdir.'/thread-'.$tid.'-'.($page ? $page : 1).'-'.($prevpage ? $prevpage : 1).'.html"'.stripslashes($extra).'>';
+ //return '<a href="'.$bbsdir.'/thread-'.$tid.'-'.($page ? $page : 1).'-'.($prevpage ? $prevpage : 1).'.html"'.stripslashes($extra).'>';
+ return '<a href="'.$bbsdir.'/topic/view/'.$tid.'.html"'.stripslashes($extra).'>';
}

function rewrite_forum($fid, $page = 0, $extra = '') {

Modified: trunk/upload/include/javascript/home_tabs.js
==============================================================================
--- trunk/upload/include/javascript/home_tabs.js (original)
+++ trunk/upload/include/javascript/home_tabs.js Tue Jun 10 01:09:33 2008
@@ -84,7 +84,7 @@
_t.innerHTML = _o;
_o = "";
for (var id in data) {
- _o = _o + '<div style="padding: 5px;"><img src="' + BBSDIR + '/' + data[id].avatar + '" align="absmiddle" alt="' + data[id].author + '" class="portrait" /> <a href="' + BBSDIR + '/uid/' + data[id].uid + '" style="color: ' + data[id].color + ';" class="var">' + data[id].author + '</a> <span class="tip_i">... <a href="' + BBSDIR + '/go/' + data[id].board_name + '">' + data[id].name + '</a> ... [ <a href="' + BBSDIR + '/thread-' + data[id].tid + '-1-1.html" style="color: ' + data[id].color + ';" class="var">' + data[id].subject + '</a> ] <small>... ' + data[id].replies + ' replies ... ' + data[id].lastpost + '</small></span></div>';
+ _o = _o + '<div style="padding: 5px;"><img src="' + BBSDIR + '/' + data[id].avatar + '" align="absmiddle" alt="' + data[id].author + '" class="portrait" /> <a href="' + BBSDIR + '/uid/' + data[id].uid + '" style="color: ' + data[id].color + ';" class="var">' + data[id].author + '</a> <span class="tip_i">... <a href="' + BBSDIR + '/go/' + data[id].board_name + '">' + data[id].name + '</a> ... [ <a href="' + BBSDIR + '/topic/view/' + data[id].tid + '.html" style="color: ' + data[id].color + ';" class="var">' + data[id].subject + '</a> ] <small>... ' + data[id].replies + ' replies ... ' + data[id].lastpost + '</small></span></div>';
}
_c = getObj("home_tab_content");
_c.innerHTML = _o;

Modified: trunk/upload/parasy/ParasyCore.php
==============================================================================
--- trunk/upload/parasy/ParasyCore.php (original)
+++ trunk/upload/parasy/ParasyCore.php Tue Jun 10 01:09:33 2008
@@ -546,13 +546,14 @@

/* S:Index Avatar Show || written by Exgbit */
function rand_avatars() {
- global $db, $_DCACHE, $timestamp, $tablepre, $discuz_uid, $member;
+ global $db, $_DCACHE, $timestamp, $tablepre, $discuz_uid, $member,$Geo,$charset;
$data = array();
- $query_avatar = $db->query("SELECT m.uid,m.username,mf.nickname,mf.avatar from {$tablepre}members m LEFT JOIN {$tablepre}memberfields mf ON m.uid=mf.uid WHERE mf.avatar !='' AND mf.hits >100 ORDER BY rand() LIMIT 20");
+ $query_avatar = $db->query("SELECT m.uid,m.username,m.usr_geo,mf.nickname,mf.avatar from {$tablepre}members m LEFT JOIN {$tablepre}memberfields mf ON m.uid=mf.uid WHERE mf.avatar !='' AND mf.hits >'".AVATAR_SHOW_HITS."' ORDER BY rand() LIMIT 20");
while($avatar = $db->fetch_array($query_avatar)) {
$data['avatar_show'][$avatar[uid]]['uid'] = $avatar['uid'];
$data['avatar_show'][$avatar[uid]]['name'] = $avatar['username'];
$data['avatar_show'][$avatar[uid]]['nickname'] = $avatar['nickname'];
+ $data['avatar_show'][$avatar[uid]]['geo'] = iconv('utf-8', $charset, $Geo['user']->map['name'][$avatar[usr_geo]]);
$data['avatar_show'][$avatar[uid]]['avatar'] = $avatar['avatar'];
}
$data['avatar_expiration'] = 900 + time();
@@ -591,14 +592,14 @@
}

$multipage = ($curpage - $offset > 1 && $pages > $page ? '<a href="'.$mpurl.'1'.$postfix.'" class="p"'.$onclick.'>|&lsaquo;</a>' : '').
- ($curpage > 1 && !$simple ? '<a href="'.$mpurl.''.($curpage - 1).''.$postfix.'" class="p">&lsaquo;&lsaquo;</a>' : '');
+ ($curpage > 1 && !$simple ? '<a href="'.$mpurl.($curpage - 1).$postfix.'" class="p">&lsaquo;&lsaquo;</a>' : '');
for($i = $from; $i <= $to; $i++) {
$multipage .= $i == $curpage ? '<strong class="p_cur">'.$i.'</strong>' :
- '<a href="'.$mpurl.''.$i.''.$postfix.'" class="p"'.$onclick.'>'.$i.'</a>';
+ '<a href="'.$mpurl.$i.$postfix.'" class="p"'.$onclick.'>'.$i.'</a>';
}

- $multipage .= ($curpage < $pages && !$simple ? '<a href="'.$mpurl.''.($curpage + 1).''.$postfix.'" class="p"'.$onclick.'>&rsaquo;&rsaquo;</a>' : '').
- ($to < $pages ? '<a href="'.$mpurl.''.$pages.''.$postfix.'" class="p"'.$onclick.'>&rsaquo;|</a>' : '').
+ $multipage .= ($curpage < $pages && !$simple ? '<a href="'.$mpurl.($curpage + 1).$postfix.'" class="p"'.$onclick.'>&rsaquo;&rsaquo;</a>' : '').
+ ($to < $pages ? '<a href="'.$mpurl.$pages.$postfix.'" class="p"'.$onclick.'>&rsaquo;|</a>' : '').
($curpage == $maxpages ? '<a class="p" href="misc.php?action=maxpages&pages='.$maxpages.'">&rsaquo;?</a>' : '').
(!$simple && $pages > $page ? '<a class="p_pages" style="padding: 0px"><input class="p_input" type="text" name="custompage" onKeyDown="if(event.keyCode==13) {window.location=\''.$mpurl.'\'+this.value + \''.$postfix.'\'; return false;}"></a>' : '');

@@ -646,6 +647,52 @@
return $multipage;
}

+
+function thread_multi($num, $perpage, $curpage, $mpurl, $maxpages = 0, $page = 10, $simple = 0, $onclick = '',$postfix ='') {
+ $multipage = '';
+ //$mpurl .= strpos($mpurl, '?') ? '&' : '?';
+ $onclick = $onclick ? ' onclick="'.$onclick.'(event)"' : '';
+ if($num > $perpage) {
+ $offset = 2;
+
+ $realpages = @ceil($num / $perpage);
+ $pages = $maxpages && $maxpages < $realpages ? $maxpages : $realpages;
+
+ if($page > $pages) {
+ $from = 1;
+ $to = $pages;
+ } else {
+ $from = $curpage - $offset;
+ $to = $from + $page - 1;
+ if($from < 1) {
+ $to = $curpage + 1 - $from;
+ $from = 1;
+ if($to - $from < $page) {
+ $to = $page;
+ }
+ } elseif($to > $pages) {
+ $from = $pages - $page + 1;
+ $to = $pages;
+ }
+ }
+
+ $multipage = ($curpage - $offset > 1 && $pages > $page ? '<a href="'.$mpurl.'1'.$postfix.'" class="p"'.$onclick.'>|&lsaquo;</a>' : '').
+ ($curpage > 1 && !$simple ? '<a href="'.$mpurl.($curpage - 1).$postfix.'" class="p">&lsaquo;&lsaquo;</a>' : '');
+ for($i = $from; $i <= $to; $i++) {
+ $multipage .= $i == $curpage ? '<strong class="p_cur">'.$i.'</strong>' :
+ '<a href="'.$mpurl.$i.$postfix.'" class="p"'.$onclick.'>'.$i.'</a>';
+ }
+
+ $multipage .= ($curpage < $pages && !$simple ? '<a href="'.$mpurl.($curpage + 1).$postfix.'" class="p"'.$onclick.'>&rsaquo;&rsaquo;</a>' : '').
+ ($to < $pages ? '<a href="'.$mpurl.$pages.$postfix.'" class="p"'.$onclick.'>&rsaquo;|</a>' : '').
+ ($curpage == $maxpages ? '<a class="p" href="misc.php?action=maxpages&pages='.$maxpages.'">&rsaquo;?</a>' : '').
+ (!$simple && $pages > $page ? '<a class="p_pages" style="padding: 0px"><input class="p_input" type="text" name="custompage" onKeyDown="if(event.keyCode==13) {window.location=\''.$mpurl.'\'+this.value+\''.$postfix.'\'; return false;}"></a>' : '');
+
+ $multipage = $multipage ? (!$simple ? '<strong class="p_info">'.$num.' ITEMS / 30 PER PAGE</strong><a class="p_edge"> '.$curpage.'/'.$realpages.' </a>' : '').$multipage : '';
+ }
+ return $multipage;
+}
+
function forum_pic($fid){
global $bbsdir;
$forum_pic_dir = './images/m_pic/'.$fid.'.jpg';
@@ -855,6 +902,13 @@
}
}
$d->close();
+ }
+}
+
+function css_hack() {
+ if(preg_match('/(Firefox\/3.0)/i', $_SERVER['HTTP_USER_AGENT'])) {
+ echo '<style type="text/css">body {background: #75B6B8 url("/bbs/images/way/bg_summer.jpg") no-repeat 50% 0;}div#wrap {text-align: left;background-color: #FBFBF6;}</style>';
+ echo "\n";
}
}
?>

Modified: trunk/upload/parasy/ParasySettings.inc.php
==============================================================================
--- trunk/upload/parasy/ParasySettings.inc.php (original)
+++ trunk/upload/parasy/ParasySettings.inc.php Tue Jun 10 01:09:33 2008
@@ -40,6 +40,7 @@
define('TOD_PROJECT_MAX', '20');
define('TOD_TASK_MAX', '100');

+define('AVATAR_SHOW_HITS', '100');
define('START_CERDIT', '1000');
define('PM_PRICE', '3');

Modified: trunk/upload/parasy/SimpleCommon.inc.php
==============================================================================
--- trunk/upload/parasy/SimpleCommon.inc.php (original)
+++ trunk/upload/parasy/SimpleCommon.inc.php Tue Jun 10 01:09:33 2008
@@ -38,7 +38,9 @@
$_key{0} != '_' && $$_key = daddslashes($_value);
}
}
-(!MAGIC_QUOTES_GPC) && $_FILES = daddslashes($_FILES);
+if (!MAGIC_QUOTES_GPC && $_FILES) {
+ $_FILES = daddslashes($_FILES);
+}

$charset = $dbcharset = $forumfounders = $metakeywords = $extrahead = '';
$plugins = $hooks = $admincp = array();
@@ -53,8 +55,9 @@
$_DCOOKIE[(substr($key, $prelength))] = MAGIC_QUOTES_GPC ? $val : daddslashes($val);
}
}
+unset($prelength, $_request, $_key, $_value, $_request, $protected);

-unset($prelength, $_request, $_key, $_value);
+$inajax = !empty($inajax);
$timestamp = time();

if($attackevasive) {
@@ -66,7 +69,7 @@

$PHP_SELF = $_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
$SCRIPT_FILENAME = str_replace('\\\\', '/', (isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] : $_SERVER['SCRIPT_FILENAME']));
-$boardurl = 'http://'.$_SERVER['HTTP_HOST'].preg_replace("/\/+(api|archiver|wap)?\/*$/i", '', substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'))).'/';
+$boardurl = htmlspecialchars('http://'.$_SERVER['HTTP_HOST'].preg_replace("/\/+(api|archiver|wap)?\/*$/i", '', substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'))).'/');

if(getenv('HTTP_CLIENT_IP') && strcasecmp(getenv('HTTP_CLIENT_IP'), 'unknown')) {
$onlineip = getenv('HTTP_CLIENT_IP');
@@ -108,9 +111,11 @@
$cachelost .= (@include DISCUZ_ROOT.'./forumdata/cache/cache_'.CURSCRIPT.'.php') ? '' : ' '.CURSCRIPT;
}

-$db = new dbstuff;
-$db->connect($dbhost, $dbuser, $dbpw, $dbname, $pconnect);
-$dbhost = $dbuser = $dbpw = $dbname = $pconnect = NULL;
+if(defined('CURSCRIPT') && in_array(CURSCRIPT, array('now_api'))) {
+ $db = new dbstuff;
+ $db->connect($dbhost, $dbuser, $dbpw, $dbname, $pconnect, true, $dbcharset);
+ $dbuser = $dbpw = $dbname = $pconnect = NULL;
+}

$sid = daddslashes(($transsidstatus || (defined('CURSCRIPT') && CURSCRIPT == 'wap'))&& (isset($_GET['sid']) || isset($_POST['sid'])) ?
(isset($_GET['sid']) ? $_GET['sid'] : $_POST['sid']) :

Modified: trunk/upload/parasy_now_api.php
==============================================================================
--- trunk/upload/parasy_now_api.php (original)
+++ trunk/upload/parasy_now_api.php Tue Jun 10 01:09:33 2008
@@ -1,4 +1,5 @@
<?php
+define('CURSCRIPT', 'now_api');
require_once './parasy/SimpleCommon.inc.php';

if ($action == "api"){
@@ -29,6 +30,7 @@
}

if ($action == "stats_xml"){
+
switch ($type) {
case 'data':
$statscachelife = $statscachelife *30;
@@ -47,7 +49,7 @@
$message_list = array();
$icons_query = $db->query("SELECT icons,COUNT(icons) FROM cdb_plugin_now WHERE authorid = '".$member['uid']."' AND icons !=0 GROUP BY icons");
while ($message = $db->fetch_array($icons_query)) {
- $message['iconshow'] = nwxmlICONS($message['icons']);
+ $message['iconshow'] = nwICONS($message['icons'],'xml');
$message['counts'] = $message['COUNT(icons)'];
$message_list[] = $message;
}

Modified: trunk/upload/parasy_operation.php
==============================================================================
--- trunk/upload/parasy_operation.php (original)
+++ trunk/upload/parasy_operation.php Tue Jun 10 01:09:33 2008
@@ -1,24 +1,24 @@
<?php
/* Project Parasynthesis
* Author: Fujiwara Sai
-* Usage: Operation
+* Usage: Prasy Function Operation
*/

define('NOROBOT', TRUE);
define('CURSCRIPT', 'operation');
require_once './include/common.inc.php';

-if(empty($discuz_uid)){
+if(empty($discuz_uid)) {
dheader("Location: {$boardurl}");
}

-if(empty($type)){
+if(empty($type)) {
dheader("Location: {$boardurl}");
}

-if ($type = "svp"){
- if ($operation = "new"){
- if (isset($_POST['url'])){
+if ($type = "svp") {
+ if ($operation = "new") {
+ if (isset($_POST['url'])) {
$url = trim($_POST['url']);
if (strlen($url) == 0) {
dheader("Location: {$boardurl}uid/".$discuz_uid);
@@ -28,30 +28,30 @@
}
$url = mysql_real_escape_string(strip_quotes($url));
$query = $db->query("SELECT svp_id FROM {$tablepre}savepoint WHERE svp_uid = '$discuz_uid' AND svp_url = '{$url}'");
- if (mysql_num_rows($query) == 0) {
- mysql_free_result($query);
+ if ($db->num_rows($query) == 0) {
+ $db->free_result($query);
$query = $db->query("SELECT svp_id FROM {$tablepre}savepoint WHERE svp_uid = '$discuz_uid'");
- if (mysql_num_rows($query) < 25) {
- $query = $db->query("INSERT INTO {$tablepre}savepoint (svp_uid, svp_url, svp_created, svp_lastupdated) VALUES('{$discuz_uid}', '{$url}', '" . time() . "', '" . time() ."')");
+ if ($db->num_rows($query) < 25) {
+ $db->query("INSERT INTO {$tablepre}savepoint (svp_uid, svp_url, svp_created, svp_lastupdated) VALUES('{$discuz_uid}', '{$url}', '" . time() . "', '" . time() ."')");
svp_update($discuz_uid);
dheader("Location: {$boardurl}uid/".$discuz_uid);
} else {
dheader("Location: {$boardurl}uid/".$discuz_uid);
}
} else {
- dheader("Location: {$boardurl}uid/".$discuz_uid);
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
}
}

- if ($operation = "del"){
+ if ($operation = "del") {
if (isset($_GET['savepoint_id'])) {
$savepoint_id = intval($_GET['savepoint_id']);
- $query = $db->query("SELECT svp_id, svp_uid FROM {$tablepre}savepoint WHERE svp_id = {$savepoint_id}");
- if (mysql_num_rows($query) == 1) {
+ $query = $db->query("SELECT svp_id, svp_uid FROM {$tablepre}savepoint WHERE svp_id = '{$savepoint_id}'");
+ if ($db->num_rows($query) == 1) {
$svp = $db->fetch_array($query);
if ($discuz_uid == $svp['svp_uid']) {
- $query = $db->query("DELETE FROM {$tablepre}savepoint WHERE svp_id = {$savepoint_id} LIMIT 1");
+ $db->query("DELETE FROM {$tablepre}savepoint WHERE svp_id = '{$savepoint_id}' LIMIT 1");
svp_update($discuz_uid,1);
dheader("Location: {$boardurl}uid/".$discuz_uid);
} else {
@@ -65,8 +65,8 @@
}

if ($type = "chl") {
- if ($operation = "new"){
- if (isset($_POST['chl_url'])){
+ if ($operation = "new") {
+ if (isset($_POST['chl_url'])) {
$chl_url = trim($_POST['chl_url']);
if (!$chl_title) {
$chl_title = 'Feed'.rand(1,999);
@@ -79,11 +79,11 @@
}
$chl_url = mysql_real_escape_string(strip_quotes($chl_url));
$query = $db->query("SELECT chl_id FROM {$tablepre}channel WHERE chl_uid = '$discuz_uid' AND chl_url = '{$chl_url}'");
- if (mysql_num_rows($query) == 0) {
+ if ($db->num_rows($query) == 0) {
mysql_free_result($query);
$query = $db->query("SELECT chl_id FROM {$tablepre}channel WHERE chl_uid = '$discuz_uid'");
- if (mysql_num_rows($query) < 15) {
- $query = $db->query("INSERT INTO {$tablepre}channel (chl_uid, chl_url, chl_title, chl_dateline) VALUES('{$discuz_uid}', '{$chl_url}', '{$chl_title}', '" . time() ."')");
+ if ($db->num_rows($query) < 15) {
+ $db->query("INSERT INTO {$tablepre}channel (chl_uid, chl_url, chl_title, chl_dateline) VALUES('{$discuz_uid}', '{$chl_url}', '{$chl_title}', '" . time() ."')");
dheader("Location: {$boardurl}dashboard");
} else {
dheader("Location: {$boardurl}dashboard");
@@ -94,14 +94,14 @@
}
}

- if ($operation = "del"){
+ if ($operation = "del") {
if (isset($_GET['chl_id'])) {
$chl_id = intval($_GET['chl_id']);
$query = $db->query("SELECT chl_id, chl_uid FROM {$tablepre}channel WHERE chl_id = {$chl_id}");
- if (mysql_num_rows($query) == 1) {
+ if ($db->num_rows($query) == 1) {
$chl = $db->fetch_array($query);
if ($discuz_uid == $chl['chl_uid']) {
- $query = $db->query("DELETE FROM {$tablepre}channel WHERE chl_id = {$chl_id} LIMIT 1");
+ $db->query("DELETE FROM {$tablepre}channel WHERE chl_id = {$chl_id} LIMIT 1");
dheader("Location: {$boardurl}dashboard");
} else {
dheader("Location: {$boardurl}dashboard");

Added: trunk/upload/redirect.php
==============================================================================
--- (empty file)
+++ trunk/upload/redirect.php Tue Jun 10 01:09:33 2008
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ [Discuz!] (C)2001-2007 Comsenz Inc.
+ This is NOT a freeware, use is subject to license terms
+
+ $RCSfile: redirect.php,v $
+ $Revision: 1.11.2.1 $
+ $Date: 2007/03/21 15:52:05 $
+*/
+
+define('CURSCRIPT', 'viewthread');
+
+require_once './include/common.inc.php';
+
+if($goto == 'findpost') {
+ $pid = intval($pid);
+ $query = $db->query("SELECT tid, dateline FROM {$tablepre}posts WHERE pid='$pid'");
+ if($post = $db->fetch_array($query)) {
+ $query = $db->query("SELECT count(*) FROM {$tablepre}posts WHERE tid='$post[tid]' AND dateline<='$post[dateline]'");
+ $page = ceil($db->result($query, 0) / $ppp);
+ dheader("Location: viewthread.php?tid=$post[tid]&page=$page#pid$pid");
+ } else {
+ $ptid = !empty($ptid) ? intval($ptid) : 0;
+ showmessage('post_check', NULL, 'HALTED');
+ }
+}
+
+$tid = $forum['closed'] < 2 ? $tid : $forum['closed'];
+
+if(isset($fid) && empty($forum)) {
+ showmessage('forum_nonexistence', NULL, 'HALTED');
+}
+
+@include DISCUZ_ROOT.'./forumdata/cache/cache_viewthread.php';
+
+if($goto == 'lastpost') {
+
+ if($tid) {
+ $query = $db->query("SELECT tid, replies FROM {$tablepre}threads WHERE tid='$tid' AND displayorder>='0'");
+ } else {
+ $query = $db->query("SELECT tid, replies FROM {$tablepre}threads WHERE fid='$fid' AND displayorder>='0' ORDER BY lastpost DESC LIMIT 1");
+ }
+ if(!$thread = $db->fetch_array($query)) {
+ showmessage('thread_nonexistence');
+ }
+ $page = ceil(($thread['replies'] + 1) / $ppp);
+ $tid = $thread['tid'];
+
+ require_once DISCUZ_ROOT.'./viewthread.php';
+ exit();
+
+} elseif($goto == 'newpost') {
+
+ $page = max(ceil($db->result_first("SELECT COUNT(*) FROM {$tablepre}posts WHERE tid='$tid' AND dateline<='$lastvisit'") / $ppp), 1);
+
+ require_once DISCUZ_ROOT.'./viewthread.php';
+ exit();
+
+} elseif($goto == 'nextnewset') {
+
+ if($fid && $tid) {
+ $this_lastpost = $db->result_first("SELECT lastpost FROM {$tablepre}threads WHERE tid='$tid' AND displayorder>='0'");
+ if($next = $db->fetch_first("SELECT tid FROM {$tablepre}threads WHERE fid='$fid' AND displayorder>='0' AND lastpost>'$this_lastpost' ORDER BY lastpost ASC LIMIT 1")) {
+ $tid = $next['tid'];
+ require_once DISCUZ_ROOT.'./viewthread.php';
+ exit();
+ } else {
+ showmessage('redirect_nextnewset_nonexistence');
+ }
+ } else {
+ showmessage('undefined_action', NULL, 'HALTED');
+ }
+
+} elseif($goto == 'nextoldset') {
+
+ if($fid && $tid) {
+ $this_lastpost = $db->result_first("SELECT lastpost FROM {$tablepre}threads WHERE tid='$tid' AND displayorder>='0'");
+ if($last = $db->fetch_first("SELECT tid FROM {$tablepre}threads WHERE fid='$fid' AND displayorder>='0' AND lastpost<'$this_lastpost' ORDER BY lastpost DESC LIMIT 1")) {
+ $tid = $last['tid'];
+ require_once DISCUZ_ROOT.'./viewthread.php';
+ exit();
+ } else {
+ showmessage('redirect_nextoldset_nonexistence');
+ }
+ } else {
+ showmessage('undefined_action', NULL, 'HALTED');
+ }
+
+} else {
+ showmessage('undefined_action', NULL, 'HALTED');
+}
+
+?>
\ No newline at end of file

Modified: trunk/upload/templates/babel/dashboard.htm
==============================================================================
--- trunk/upload/templates/babel/dashboard.htm (original)
+++ trunk/upload/templates/babel/dashboard.htm Tue Jun 10 01:09:33 2008
@@ -19,14 +19,15 @@
</head>

<body>
+<div align="center">
+<div id="parasy">
<div id="header">
<div id="top_right">
- <div class="hi">Hi,<a href="$bbsdir/uui/$discuz_uid" class="white">$discuz_userss</a>!</div> <a href="$bbsdir/memcp.nnm" target="_self" class="white">��</a> | <a href="$bbsdir/admincp.php" target="_blank" class="white">{lang admincp}</a> |
- <a href="$bbsdir/new_features.html" class="white">�¹��!</a> | <a href="$bbsdir/logout-{FORMHASH}.nnm" class="white" target="_self">�ǳ�</a> | <a href="#;" class="white"><small>$GLOBALS[extcredits.$id]</small>$credit[unit] $credit[title]</a> 
+ <div class="hi">Hi,<a href="$bbsdir/uui/$discuz_uid" class="white">$discuz_userss</a>!</div> <a href="$bbsdir/memcp.nnm" target="_self" class="white">��</a> | <a href="$bbsdir/admincp.php" target="_blank" class="white">{lang admincp}</a> | <a href="$bbsdir/logout-{FORMHASH}.nnm" class="white" target="_self">�ǳ�</a> | <a href="#;" class="white"><small>$GLOBALS[extcredits.$id]</small>$credit[unit] $credit[title]</a>

- <a href="$bbsdir/login.nnm" class="white">{lang login}</a> | <a href="$bbsdir/passwd.nnm" class="white">�һ��</a> | <a href="$bbsdir/new_features.html" class="white">�¹��!</a> | <a href="$bbsdir/signup.nnm" class="white">ע��</a> 
+ <a href="$bbsdir/login.nnm" class="white">{lang login}</a> | <a href="$bbsdir/passwd.nnm" class="white">�һ��</a> | <a href="$bbsdir/signup.nnm" class="white">ע��</a> 
</div>
- <a href="#;" title="NoName Dashboard"><img src="{IMGDIR}/db_logo.gif" border="0" alt="NoName Dashboard" /></a>
+ <a href="#;" title="NoName Dashboard"><img src="{IMGDIR}/logo_summer_2.gif" border="0" alt="NoName Dashboard" /></a>
</div>

<div id="left">
@@ -71,18 +72,19 @@

<div id="right">
<div id="right_panel"><h2>��</h2>
- <ul class="menu">
- 
- <li><img src="{IMGDIR}/pico_message.gif" align="absmiddle" /> <a href="$bbsdir/pm.nnm" class="menu" target="_blank">�ҵ��Ϣ</a></li>
- <li><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a href="$bbsdir/mytopic-$discuz_uid.html" class="menu">�ҵ��</a></li>
- 
- <li><img src="{IMGDIR}/house.png" align="absmiddle" /> <a href="$bbsdir/uid/$discuz_uid" class="menu">�ҵ��ҳ</a></li>
- <li><img src="{IMGDIR}/pico_zen.gif" align="absmiddle"> <a href="http://blog.orzotl.com/?action_site_type_panel" class="menu">�ҵĲ�־</a></li>
- <li><img src="{IMGDIR}/rainbow.png" align="absmiddle" /> <a href="$bbsdir/now/$discuz_userss_encode" class="menu">Nowhere</a></li>
- <li><img src="{IMGDIR}/dashboard.png" align="absmiddle" /> <a href="$bbsdir/dashboard" class="menu">Dashboard</a> <span class="tip_i"><small>alpha</small></span></li>
- <hr class="board">
- <li><img src="{IMGDIR}/key_go.png" align="absmiddle" /> <a href="$bbsdir/logout-{FORMHASH}.nnm" class="menu">�ǳ�</a></li>
- </ul>
+ <ul class="menu">
+ 
+ <li><img src="{IMGDIR}/pico_message.gif" align="absmiddle" /> <a href="$bbsdir/pm.nnm" class="menu" target="_blank">�ҵ��Ϣ</a></li>
+ <li><img src="{IMGDIR}/house.png" align="absmiddle" /> <a href="$bbsdir/uid/$discuz_uid" class="menu">�ҵ��ҳ</a></li>
+ <li><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a href="$bbsdir/my/threads" class="menu">�ҵ��</a></li>
+ <li><img src="{IMGDIR}/drink.png" align="absmiddle"> <a href="http://blog.orzotl.com/?action_site_type_panel" class="menu">�ҵĲ�־</a></li>
+ <li><img src="{IMGDIR}/rainbow.png" align="absmiddle" /> <a href="$bbsdir/now/$discuz_userss_encode" class="menu">Nowhere</a></li>
+ <li><img src="{IMGDIR}/report_edit.png" align="absmiddle" /> <a href="$bbsdir/tod" class="menu">Tod��y</a> <small class="fade">($my_tod_task)</small> <span class="tip_i"><small>alpha</small></span></li>
+ <li><img src="{IMGDIR}/dashboard.png" align="absmiddle" /> <a href="$bbsdir/dashboard" class="menu">Dashboard</a> <span class="tip_i"><small>alpha</small></span></li>
+ <li><img src="{IMGDIR}/coins_delete.png" align="absmiddle" /> <a href="$bbsdir/expense/view.nnm" class="menu">��Ѽ�¼</a></li>
+ <li><img src="{IMGDIR}/pico_web.gif" align="absmiddle" /> <a href="$bbsdir/geo/$geo_user" class="menu">$portal</a> <span class="tip_i"><small>portal</small></span></li>
+ <li><hr class="board"><img src="{IMGDIR}/key_go.png" align="absmiddle" /> <a href="$bbsdir/logout-{FORMHASH}.nnm" class="menu">�ǳ�</a></li>
+ </ul>
</div>
<div id="right_panel"><h2>�ҵ��ռ��</h2>
<ul class="news">
@@ -142,7 +144,7 @@
<div id="tools"><ul id="maintab"><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a href="#" onclick="return GB_showFullScreenSet(topic, 1)">Play Topics</a> | <img src="{IMGDIR}/rainbow.png" align="absmiddle" /> <a href="#;" onclick="return GB_showFullScreenSet(nowhere, 1)">Play Nowhere</a> | <li><img src="{IMGDIR}/arrow_refresh.png" align="absmiddle" /> <a href="$bbsdir/json/dashboard/everyone" rel="ajaxcontentarea">Refresh</a></li></ul></div>

<div id="ajaxcontentarea">
- {template dashboard_timeline}
+ {subtemplate dashboard_timeline}
</div>
<script type="text/javascript">
startajaxtabs("maintab")
@@ -159,6 +161,7 @@

{eval updatesession();}
</div>
+</div></div>
</body>
</html>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>

Modified: trunk/upload/templates/babel/dashboard_topic.htm
==============================================================================
--- trunk/upload/templates/babel/dashboard_topic.htm (original)
+++ trunk/upload/templates/babel/dashboard_topic.htm Tue Jun 10 01:09:33 2008
@@ -2,12 +2,17 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh-CN">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=$charset" />
-<title>$navtitle NoNameMag</title>
+<title>$navtitle | NoNameMag</title>

<link rel="icon" href="/favicon.ico" type="image/x-icon" />

<link rel="stylesheet" type="text/css" href="$bbsdir/templates/css/dashboard.css" />
<link rel="stylesheet" type="text/css" id="css" href="$bbsdir/forumdata/cache/style_{STYLEID}.css">
+<style>
+body {
+ background: #FBFBF6 url("/bbs/images/way/simple_bg.jpg") repeat-x;
+}
+</style>
<script type="text/javascript" src="$jsdir/common.js"></script>
<script type="text/javascript" src="$jsdir/menu.js"></script>
<script type="text/javascript" src="$jsdir/ajax.js"></script>

Modified: trunk/upload/templates/babel/i_avatar.htm
==============================================================================
--- trunk/upload/templates/babel/i_avatar.htm (original)
+++ trunk/upload/templates/babel/i_avatar.htm Tue Jun 10 01:09:33 2008
@@ -1,16 +1,10 @@
-
-<script type="text/javascript" src="{CDN_JS}/reflection.js"></script>
-
-
-<script type="text/javascript" src="$bbsdir/scripts/$js_reflection"></script>
-
-<div class="avatartable" align="left">
+<div class="maintable" align="left">
<img src="{IMGDIR}/group.png" align="absmiddle"> ��Աͷ��չʾ ...
<table class="fav" border="0" cellpadding="0" cellspacing="0" width="100%" align="center"><tbody><tr><td>



-<a href="$bbsdir/uid/$avatar[uid]" class="friend"><img src="$bbsdir/$avatar[avatar]" class="reflect" width="75" height="75"><div class="tip">$avatar[name]</div></a>
+<a href="$bbsdir/uid/$avatar[uid]" class="friend"><img src="$bbsdir/$avatar[avatar]" class="portrait" width="75" height="75"><br />$avatar[name]<div class="tip">$avatar[geo]</div></a>


</td></tr></tbody></table>

Modified: trunk/upload/templates/babel/i_fav.htm
==============================================================================
--- trunk/upload/templates/babel/i_fav.htm (original)
+++ trunk/upload/templates/babel/i_fav.htm Tue Jun 10 01:09:33 2008
@@ -9,11 +9,11 @@



-<tr><td align="left"> <img src="$bbsdir/$fav[avatar]" alt="$fav[author]" align="absmiddle" height="16" width="16" class="portrait" /> <a href="$bbsdir/uid/$fav[uid]" style="color: $name_color;" class="var">$fav[username]</a> �ղ��
+<tr><td align="left"> <img src="$bbsdir/$fav[avatar]" alt="$fav[author]" align="absmiddle" height="16" width="16" class="portrait" /> <a href="$bbsdir/uid/$fav[uid]" style="color: $name_color;" class="var">$fav[username]</a> <span class="tip_i"><small style="font-size:10px;">favs</small>

-�� <span class="tip_i">[ <a href="viewthread.php?tid=$fav[tid]" style="color: $name_color;" class="var">$fav[subject]</a>
+[<img src="{IMGDIR}/forum.gif" alt="��" align="absmiddle" /> <a href="viewthread.php?tid=$fav[tid]" style="color: $name_color;" class="var">$fav[subject]</a>

-�� <span class="tip_i">[ <a href="$bbsdir/go/$fav[board_name]" style="color: $name_color;" class="var">$fav[name]</a>
+[<img src="{IMGDIR}/table_multiple.png" alt="��" align="absmiddle" /> <a href="$bbsdir/go/$fav[board_name]" style="color: $name_color;" class="var">$fav[name]</a>

] ... $favt[dateline]</span></td></tr>

Modified: trunk/upload/templates/babel/viewpro_classic.htm
==============================================================================
--- trunk/upload/templates/babel/viewpro_classic.htm (original)
+++ trunk/upload/templates/babel/viewpro_classic.htm Tue Jun 10 01:09:33 2008
@@ -94,9 +94,11 @@



+
+
<tr>
<td colspan="2" align="left" class="section_$svp[bg]">
- <span class="svp"><img src="$bbsdir/images/favicons/bbs/fico_$o[type].gif" align="absmiddle" />  <a href="http://$svp[svp_url]" target="_blank" rel="external nofollow" style="color: $name_color" class="var">http://$svp[svp_url]</a>  </span><span class="tip_i">...<a href="$bbsdir/del/savepoint/$svp[svp_id]" class="g">X</a></span>
+ <span class="svp"><img src="$bbsdir/images/favicons/bbs/fico_$o[type].gif" align="absmiddle" />  <a href="http://$svp[svp_url]" title="$svp[svp_url]" target="_blank" rel="external nofollow" style="color: $name_color" class="var">http://$tinyurl</a>  </span><span class="tip_i">...<a href="$bbsdir/del/savepoint/$svp[svp_id]" class="g">X</a></span>
</td>
</tr>

@@ -104,7 +106,7 @@
<form action="$bbsdir/recv/savepoint.nnm" method="post">
<tr><td colspan="2" align="left" class="$name_color">��Ϊ�Լ��һ��µ��Ͼݵ�  <span class="tip_i">http:// <input type="text" onmouseover="this.focus();" name="url" class="sll" />  <input type="image" align="absmiddle" src="{IMGDIR}/sbtn_add.gif" /></span>
<div class="notify" style="margin-top: 5px;">
-��Ҫ��ǰ�� http:// Э��ƣ�ֱ��ַ�Ϳ��ˣ�� www.saicn.com ��ĵ�ַ
+��Ҫ��ǰ�� http:// Э��ƣ�ֱ��ַ�Ϳ��ˣ�� $_SERVER[HTTP_HOST] ��ĵ�ַ
</div></td></tr></form>

<tr>

Modified: trunk/upload/templates/babel/viewthread.htm
==============================================================================
--- trunk/upload/templates/babel/viewthread.htm (original)
+++ trunk/upload/templates/babel/viewthread.htm Tue Jun 10 01:09:33 2008
@@ -188,7 +188,7 @@
 <a href="$bbsdir/edit-$fid-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/comment_edit.png" align="absmiddle" title="�༭" /></a> <a href="$bbsdir/quote-$fid-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/comments_add.png" align="absmiddle" title="��" /></a> <a href="$bbsdir/rate-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/coins_add.png" align="absmiddle" title="��" /></a> <a href="$bbsdir/removerate-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/coins_delete.png" align="absmiddle" title="{lang removerate}" /></a>
<input type="checkbox" name="delete[]" value="$post[pid]"></small></div>

-<img src="$post[nmavatar]" width="32" height="32" align="absmiddle" class="re_port" /><img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /> <strong><a href="$bbsdir/uid/$post[authorid]" style="color: $topic_color;" class="var">$post[author]</a></strong>
+<img src="$bbsdir/$post[nmavatar]" width="32" height="32" align="absmiddle" class="re_port" /><img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /> <strong><a href="$bbsdir/uid/$post[authorid]" style="color: $topic_color;" class="var">$post[author]</a></strong>

<img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" />{lang guest} <small>$post[useip]</small>{lang unregistered}<strong><a href="$bbsdir/viewpro.php?uid=$post[authorid]" style="color: $topic_color;" class="var">{lang anonymous}��ʿ</a></strong><strong><span style="color: $topic_color;">{lang anonymous}��ʿ</span></strong><a href="$bbsdir/uid/$post[authorid]">$post[author]</a>{lang member_deleted}

Modified: trunk/upload/templates/css/css_babel.css
==============================================================================
--- trunk/upload/templates/css/css_babel.css (original)
+++ trunk/upload/templates/css/css_babel.css Tue Jun 10 01:09:33 2008
@@ -2,7 +2,7 @@
margin: 0px;
padding: 0px;
font-family: Verdana, "Lucida Grande", "Lucida Sans", sans, Hei;
-background: #04070C url("/bbs/images/way/bg_space.jpg") no-repeat fixed 50% 0;
+background: #75B6B8 url("/bbs/images/way/bg_summer_3.jpg") fixed no-repeat 50% 0;
}

div#parasy {
@@ -67,7 +67,7 @@

div#wrap {
text-align: left;
-background-color: #FBFBF6;
+/*background-color: #FBFBF6;*/
}

div.login_modern {
@@ -357,7 +357,7 @@
}

div.menu_inner {
-border: 1px solid #E0E0E0;
+border: 2px solid #E0E0E0;
background-color: #FFF;
margin: 10px;
padding: 5px;
@@ -370,7 +370,7 @@
margin: 10px 10px 10px 10px;
font-size: 12px;
padding: 5px;
-border: 1px solid #E0E0E0;
+border: 2px solid #E0E0E0;
background-color: #FFF;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
@@ -378,7 +378,7 @@

div.maintable {
padding: 5px;
-border: 1px solid #E0E0E0;
+border: 2px solid #E0E0E0;
background-color: #FFF;
margin-bottom: 10px;
font-size: 12px;
@@ -388,12 +388,10 @@

div.avatartable {
padding: 5px;
-border: 1px solid #E0E0E0;
+border: 2px solid #E0E0E0;
background-color: #FFF;
margin-bottom: 10px;
font-size: 12px;
--moz-border-radius: 7px;
--webkit-border-radius: 7px;
background: url(/bbs/images/way/avatar_background.jpg) no-repeat;
color:#fff;
}
@@ -1381,22 +1379,30 @@
}

a.friend, a.friend:link, a.friend:visited {
-margin-left:10px;
-padding: 5px 10px 5px 10px;
+padding: 5px 2px 5px 2px;
+width: 100px;
height: 100px;
text-align: center;
+display: block;
float: left;
text-decoration: none;
+border: 1px solid #FFF;
}

a.friend:hover {
-margin-left:10px;
-background-color: #333;
-color: #fff;
-padding: 5px 10px 5px 10px;
+background-color: #FFF;
+color: #000;
+padding: 5px 2px 5px 2px;
+width: 100px;
+height: 100px;
text-align: center;
+display: block;
float: left;
text-decoration: none;
+border-top: 1px solid #FFF;
+border-left: 1px solid #FFF;
+border-right: 1px solid #FFF;
+border-bottom: 1px solid #FFF;
}

a.friend:hover img.portrait {
@@ -1404,10 +1410,11 @@
}

a.friend:active {
-margin-left:10px;
background-color: #F0F0F0;
color: #333;
-padding: 5px 10px 5px 10px;
+padding: 5px 2px 5px 2px;
+width: 100px;
+height: 100px;
text-align: center;
display: block;
float: left;
@@ -1486,18 +1493,37 @@
}

a.friend:hover div.tip, a.friend:active div.tip {
- display: block;
- position: relative;
- top: -130px;
- left: 0px;
- padding: 2px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- background-color: #FA9000;
- font-size: 12px;
- color: #FFF;
- border-right: 1px solid #666;
- border-bottom: 1px solid #666;
+display: block;
+position: relative;
+top: -120px;
+left: 0px;
+padding: 2px;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+background-color: #FA9000;
+font-size: 12px;
+color: #FFF;
+border-right: 1px solid #666;
+border-bottom: 1px solid #666;
+}
+
+a.artist:link div.tip, a.artist:visited div.tip {
+ display: none;
+}
+
+a.artist:hover div.tip, a.artist:active div.tip {
+display: block;
+position: relative;
+top: -90px;
+left: 0px;
+padding: 2px;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+background-color: #FA9000;
+font-size: 12px;
+color: #FFF;
+border-right: 1px solid #666;
+border-bottom: 1px solid #666;
}

#home_tab_top {

Modified: trunk/upload/templates/css/dashboard.css
==============================================================================
--- trunk/upload/templates/css/dashboard.css (original)
+++ trunk/upload/templates/css/dashboard.css Tue Jun 10 01:09:33 2008
@@ -1,14 +1,21 @@
-html, body {
+body {
padding: 0px;
margin: 0px;
-background: #FBFBF6 url("/bbs/images/way/simple_bg.jpg") repeat-x;
-font-family: Lucida Grande, Verdana, Tahoma, hei;
+background: #75B6B8 url("/bbs/images/way/bg_summer_3.jpg") fixed no-repeat 50% 0;
+/*background: #FBFBF6 url("/bbs/images/way/simple_bg.jpg") repeat-x;*/
+font-family: "Lucida Grande", Verdana, Tahoma, hei;
}
a:link, a:active, a:visited {
color: #556;
text-decoration: none;
}

+div#parasy {
+text-align: left;
+max-width: 960px;
+width:expression( documentElement.clientWidth > 960 ? (documentElement.clientWidth == 0 ? (body.clientWidth >960 ? "960" : "auto") : "960px") : "auto" );
+}
+
a:hover {
color: #001;
text-decoration: underline;
@@ -25,44 +32,46 @@
div#header{
height:80px;
}
+
div#top_right {
-background:transparent url("/bbs/images/way/top_right.png") no-repeat;
-color:#FFFFFF;
-float:right;
-font-size:12px;
-height:20px;
-line-height:15px;
+float: right;
+z-index: 5;
+top: 0px;
+right: 0px;
+font-size: 12px;
+text-align: right;
+line-height: 15px;
+width: 502px;
+height: 20px;
margin:5px 5px 0 0;
-padding-right:5px;
-padding-top:5px;
-position:absolute;
-right:0px;
-text-align:right;
-top:0px;
-width:502px;
-z-index:5;
+padding-top: 5px;
+padding-right: 5px;
+color: #FFF;
+background:url("/bbs/images/way/top_right.png") no-repeat;
}

* html div#top_right {
-background:#000000 none repeat scroll 0%;
-border-bottom:1px solid #CCC;
-border-right:1px solid #CCC;
-color:#FFFFFF;
-float:right;
-font-size:12px;
-height:20px;
-line-height:15px;
+float: right;
+z-index: 5;
+top: 0px;
+right: 0px;
+font-size: 12px;
+text-align: right;
+line-height: 15px;
+width: 502px;
+height: 20px;
margin:5px 5px 0 0;
-opacity:0.5;
-padding-right:5px;
-padding-top:5px;
-position:absolute;
-right:0px;
-text-align:right;
-top:0px;
-width:502px;
-z-index:5;
+padding-top: 5px;
+padding-right: 5px;
+color: #FFF;
+background:#000;
+border-right: 1px solid #CCC;
+border-bottom: 1px solid #CCC;
+-moz-opacity: .5;
+opacity: .5;
+filter: alpha(opacity=50);
}
+
div#main {
margin: 0px 200px 0px 200px;
}

Modified: trunk/upload/viewpro.php
==============================================================================
--- trunk/upload/viewpro.php (original)
+++ trunk/upload/viewpro.php Tue Jun 10 01:09:33 2008
@@ -9,7 +9,6 @@
$Date: 2007/03/22 22:48:51 $
*/

-define('NOROBOT', TRUE);
define('CURSCRIPT', 'viewpro');
require_once './include/common.inc.php';

@@ -33,7 +32,7 @@
$oltimeadd1 = $oltimeadd2 = '';
}

-$query = $db->query("SELECT m.*, mf.*, u.grouptitle, u.type, u.creditshigher, u.creditslower, u.readaccess,
+$member = $db->fetch_first("SELECT m.*, mf.*, u.grouptitle, u.type, u.creditshigher, u.creditslower, u.readaccess,
u.color AS groupcolor, u.stars AS groupstars, u.allownickname, u.allowuseblog, r.ranktitle,
r.color AS rankcolor, r.stars AS rankstars $oltimeadd1
FROM {$tablepre}members m
@@ -43,7 +42,7 @@
$oltimeadd2
WHERE ".($uid ? "m.uid='$uid'" : "m.username='$username'")."ORDER BY r.postshigher DESC LIMIT 1");

-if(!$member = $db->fetch_array($query)) {
+if(!$member) {
showmessage('member_nonexistence');
}

@@ -53,20 +52,21 @@
if (substr($_SERVER['SCRIPT_URL'], 0, 10) == '/bbs/user-') {
session_start();
$_SESSION['profile_msg'] = 'Ϊ�˷��䣬��ҳ��ӵ�ַ�Ѹ�Ϊ <input type="text" class="sll" onclick="this.select()" value="http://'.$_SERVER[HTTP_HOST].$bbsdir.'/uid/'.$uid.'" readonly="readonly" />';
- dheader("Location: {$boardurl}u/".$uid);
+ header("HTTP/1.1 301 Moved Permanently");
+ dheader("Location: {$boardurl}uid/".$uid);
}

if (substr($_SERVER['SCRIPT_URL'], 0, 7) == '/bbs/u-') {
session_start();
$_SESSION['profile_msg'] = 'Ϊ�˷��䣬��ҳ��ӵ�ַ�Ѹ�Ϊ <input type="text" class="sll" onclick="this.select()" value="http://'.$_SERVER[HTTP_HOST].$bbsdir.'/uid/'.$uid.'" readonly="readonly" />';
+ header("HTTP/1.1 301 Moved Permanently");
dheader("Location: {$boardurl}uid/".$uid);
}

if($member['groupid'] != ($member['groupidnew'] = getgroupid($member['uid'], $member, $member))) {
- $query = $db->query("SELECT groupid, grouptitle, type, creditshigher, creditslower, color AS groupcolor,
- stars AS groupstars, allownickname, allowuseblog
- FROM {$tablepre}usergroups WHERE groupid='$member[groupidnew]'");
- $member = array_merge($member, $db->fetch_array($query));
+ $member = array_merge($member, $db->fetch_first("SELECT groupid, grouptitle, type, creditshigher, creditslower, color AS groupcolor,
+ stars AS groupstars, allownickname
+ FROM {$tablepre}usergroups WHERE groupid='$member[groupidnew]'"));
}

$viewspace = $spacestatus && (!$supe['status'] || !$member['xspacestatus']) && !in_array($member['groupid'], array(4, 5, 6));
@@ -146,7 +146,7 @@

add_hits($member[uid]);

-//S:new thread
+/* Parasy || S:User New Thread */
$query = $db->query("SELECT m.*, t.subject, t.fid, t.displayorder, t.closed, t.lastposter, t.lastpost FROM {$tablepre}mythreads m, {$tablepre}threads t
WHERE m.uid = '{$member[uid]}' $threadadd AND m.tid=t.tid ORDER BY m.dateline DESC LIMIT 10");
while($thread = $db->fetch_array($query)) {
@@ -159,15 +159,18 @@
$threadlist[] = $thread;
}
}
-//E:new thread
-//S:Nowhere
+/* Parasy || E:User New Thread */
+
+/* Parasy || S:User Latest Nowhere */
$query = $db->query("SELECT dateline,content FROM {$tablepre}plugin_now WHERE author='{$member['username']}' ORDER BY dateline DESC LIMIT 1");
$now = $db->fetch_array($query);
if ($now) {
$now['dateline'] = make_descriptive_time($now[dateline]);
$now['content'] = dhtmlspecialchars($now['content']);
}
-//E:Nowhere
+/* Parasy || E:User Latest Nowhere */
+
+/* Parasy || S:User Profile Caches */
@include(DISCUZ_ROOT.'./forumdata/cache_usr/svp/user_svp_'.$member['uid'].'.php');
if(@!include(DISCUZ_ROOT.'forumdata/cache_usr/svp/user_svp_'.$member['uid'].'.php')){
$svp = svp_update($member[uid]);
@@ -177,6 +180,7 @@
$buddy = buddy_update($member[uid]);
}
@include(DISCUZ_ROOT.'./forumdata/cache_usr/g/user_geo_'.$member['uid'].'.php');
+/* Parasy || E:User Profile Caches */

if($member['groupexpiry'] && isset($member['groupterms']['main']['time'])) {
$member['maingroupexpiry'] = gmdate($dateformat, $member['groupterms']['main']['time'] + $timeoffset * 3600);

Modified: trunk/upload/viewthread.php
==============================================================================
--- trunk/upload/viewthread.php (original)
+++ trunk/upload/viewthread.php Tue Jun 10 01:09:33 2008
@@ -9,9 +9,11 @@
$Date: 2007/05/14 13:32:08 $
*/

-define('CURSCRIPT', 'viewthread');
-define('SQL_ADD_THREAD', ' t.dateline, t.special, t.lastpost AS lastthreadpost,');
+if(!defined('CURSCRIPT')) {
+ define('CURSCRIPT', 'viewthread');
+}

+define('SQL_ADD_THREAD', ' t.dateline, t.special, t.lastpost AS lastthreadpost, ');
require_once './include/common.inc.php';
require_once DISCUZ_ROOT.'./include/forum.func.php';
supe_dbconnect();
@@ -110,9 +112,8 @@
$navigation = '» <a href="'.($iscircle ? $supe['siteurl'].'?action_mygroup_gid_'.$thread['sgid'].'_op_list_type_bbs_fid_'.$fid : 'forumdisplay.php?fid='.$fid.($extra ? '&'.preg_replace("/^(&)*/", '', $extra) : '')).'">'.$forum['name'].'</a> » '.$thread['subject'];
$navtitle = $thread['subject'].' - '.strip_tags($forum['name']);
if($forum['type'] == 'sub') {
- $query = $db->query("SELECT fid, name FROM {$tablepre}forums WHERE fid='$forum[fup]'");
- $fup = $db->fetch_array($query);
- $navigation = '» <a href="'.($iscircle ? $supe['siteurl'].'?action_mygroup_gid_'.$thread['sgid'].'_op_list_type_bbs_fid_'.$fup[fid] : 'forumdisplay.php?fid='.$fup[fid]).'">'.$fup[name].'</a> '.$navigation;
+ $fup = $db->fetch_first("SELECT fid, name FROM {$tablepre}forums WHERE fid='$forum[fup]'");
+ $navigation = '» <a href="forumdisplay.php?fid='.$fup['fid'].'">'.$fup['name'].'</a> '.$navigation;
$navtitle = $navtitle.' - '.strip_tags($fup['name']);
}
$navtitle .= ' - ';
@@ -225,9 +226,11 @@
$pageadd = "ORDER BY dateline LIMIT $start_limit, $ppp";
}

- $multipage = multi($thread['replies'] + 1, $ppp, $page, "viewthread.php?tid=$tid&extra=$extra".(isset($highlight) ? "&highlight=".rawurlencode($highlight) : ''));
+ //$multipage = multi($thread['replies'] + 1, $ppp, $page, $bbsdir."/topic/view/$tid/");
+ $multipage = thread_multi($thread['replies'] + 1, $ppp, $page, $bbsdir."/topic/view/$tid/",'0','10','0','','.html');
+

- $touch_multipage = now_multi($thread['replies'] + 1, $ppp, $page, "view-$tid-",'0','10','1','','.html');
+ $touch_multipage = now_multi($thread['replies'] + 1, $ppp, $page, "view-$tid-",'0','5','1','','.html');

if($thread['special'] > 0) {
include_once DISCUZ_ROOT.'./include/special.inc.php';
@@ -337,8 +340,6 @@
} elseif($_DCACHE['usergroups'][$post['groupid']]['allowavatar'] && $post['avatar']) {
$post['nmavatar']= avRESIZE($post['avatar'],'m');
$post['smavatar']= avRESIZE($post['avatar'],'s');
- //$item['avatar'] = avRESIZE($item['avatar'],'m');
-

$post['avatar'] = '<div style="width:75"><img src="'.$bbsdir.'/'.$post['avatar'].'" width="75" height="75" class="portrait" style="margin-bottom: 5px;" alt="" /></div>';
} else {

Reply all

Reply to author

Forward

0 new messages