[parasy commit] r36 - in trunk: sql upload upload/images/way upload/include upload/parasy upload/plugins/parasy u...

2 views

Skip to first unread message

codesite...@google.com

unread,

Dec 29, 2007, 8:46:12 AM12/29/07

to project...@googlegroups.com

Author: Saiccc
Date: Sat Dec 29 05:44:57 2007
New Revision: 36

Added:
trunk/upload/images/way/go-up.png (contents, props changed)
trunk/upload/images/way/preferences-system.png (contents, props changed)
trunk/upload/templates/babel/my.htm
trunk/upload/templates/babel/my_favorites.htm
trunk/upload/templates/babel/my_index.htm
trunk/upload/templates/babel/my_posts.htm
trunk/upload/templates/babel/my_rewards.htm
trunk/upload/templates/babel/my_subscriptions.htm
trunk/upload/templates/babel/my_threads.htm
trunk/upload/templates/babel/my_tradestats.htm
trunk/upload/templates/babel/my_tradethreads.htm
Modified:
trunk/sql/parasy.mysql.sql
trunk/upload/.htaccess
trunk/upload/include/cache.func.php
trunk/upload/include/common.inc.php
trunk/upload/include/global.func.php
trunk/upload/logging.php
trunk/upload/memcp.php
trunk/upload/my.php
trunk/upload/parasy/ParasyCore.php
trunk/upload/parasy/ParasyInit.php
trunk/upload/parasy/ParasySettings.inc.php
trunk/upload/parasy_operation.php
trunk/upload/plugins/parasy/now.inc.php
trunk/upload/plugins/parasy/tod.inc.php
trunk/upload/templates/babel/forumdisplay.htm
trunk/upload/templates/babel/header.htm
trunk/upload/templates/babel/memcp_navbar.htm
trunk/upload/templates/babel/memcp_profile.htm
trunk/upload/templates/babel/now.htm
trunk/upload/templates/babel/now_wap.htm
trunk/upload/templates/babel/post_newreply.htm
trunk/upload/templates/babel/post_newthread.htm
trunk/upload/viewthread.php

Log:
My & Memcp New UI
Side Bar Switcher
Cache System Update

Modified: trunk/sql/parasy.mysql.sql
==============================================================================
--- trunk/sql/parasy.mysql.sql (original)
+++ trunk/sql/parasy.mysql.sql Sat Dec 29 05:44:57 2007
@@ -15,6 +15,7 @@
ALTER TABLE `cdb_members` ADD `now_img` mediumint(10) NOT NULL default '0';
ALTER TABLE `cdb_members` ADD `idx_cloud` tinyint(1) NOT NULL default '0';
ALTER TABLE `cdb_members` ADD `usr_geo` varchar(100) NOT NULL default 'earth';
+ALTER TABLE `cdb_members` ADD `side_buddy` TINYINT( 1 ) NOT NULL DEFAULT '0';

--
-- Table structure for table `cdb_savepoint`
@@ -187,4 +188,22 @@
KEY `INDEX_UID` (`tta_uid`),
KEY `INDEX_PID` (`tta_pid`),
KEY `INDEX_PROGRESS` (`tta_progress`)
-) ENGINE=MyISAM DEFAULT CHARSET=gbk;
\ No newline at end of file
+) ENGINE=MyISAM DEFAULT CHARSET=gbk;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `cdb_channel`
+--
+CREATE TABLE `cdb_channel` (
+ `chl_id` int(10) unsigned NOT NULL auto_increment,
+ `chl_uid` int(10) NOT NULL,
+ `chl_fid` int(10) unsigned NOT NULL default '0',
+ `chl_title` varchar(200) NOT NULL default '',
+ `chl_url` varchar(200) NOT NULL default '',
+ `chl_dateline` int(10) unsigned NOT NULL default '0',
+ PRIMARY KEY (`chl_id`),
+ KEY `INDEX_fID` (`chl_fid`),
+ KEY `INDEX_TITLE` (`chl_title`),
+ KEY `INDEX_URL` (`chl_url`)
+) ENGINE=MyISAM DEFAULT CHARSET=gbk;
\ No newline at end of file

Modified: trunk/upload/.htaccess
==============================================================================
--- trunk/upload/.htaccess (original)
+++ trunk/upload/.htaccess Sat Dec 29 05:44:57 2007
@@ -29,6 +29,12 @@
RewriteRule ^revert/going/(.+)$
parasy_geo.php?action=revert_going&geo=$1 [L]
RewriteRule ^revert/been/(.+)$
parasy_geo.php?action=revert_been&geo=$1 [L]

+RewriteRule ^my-favorites-(.+).html$ my.php?item=favorites&type=$1 [L]
+RewriteRule ^my-(.+)-fid-([0-9]+)\.html$ my.php?item=$1&srchfid=$2 [L]
+RewriteRule ^my-(.+)\.html$ my.php?item=$1 [L]
+
+
+
RewriteRule ^newthread-([0-9]+)-([0-9]+)\.html$
post.php?action=newthread&fid=$1&extra=page%3D$2 [L]
RewriteRule ^reply-([0-9]+)-([0-9]+)-([0-9]+)\.html$
post.php?action=reply&fid=$1&tid=$2&extra=page%3D$3 [L]
RewriteRule ^redirect-([0-9]+)\.html$
redirect.php?tid=$1&goto=lastpost#lastpost [L]
@@ -130,7 +136,7 @@
RewriteRule ^json/dashboard/everyone$
parasy_json_tab.php?m=json_timeline [L]

RewriteRule ^dashboard$ parasy_dashboard.php [L]
-RewriteRule ^topic-dashboard-([0-9]+)\.html$
viewthread.php?tid=$1&dashboard=1 [L]
+RewriteRule ^topic-dashboard-([0-9]+)\.html$
viewthread.php?app=dashboard&tid=$1 [L]

RewriteRule ^recv/savepoint.nnm$
parasy_operation.php?type=svp&operation=new [L]
RewriteRule ^recv/dashboard-chl.nnm$
parasy_operation.php?type=chl&operation=new [L]
@@ -150,4 +156,8 @@
RewriteRule ^m/shuffle$ parasy.php?action=mobile_home&shuffle=1 [L]
RewriteRule ^m/([0-9]+)$ parasy.php?action=mobile_home&page=$1 [L]
RewriteRule ^t/([0-9]+)/([0-9]+)/([0-9]+)$
parasy_m_view.php?tid=$1&p_page=$2&page=$3 [L]
-RewriteRule ^mobile-post-([0-9]+)-([0-9]+)-([0-9]+)\.html$ post.php?action=reply&fid=$1&tid=$2&p_page=$3&replysubmit=yes&mobile=1[L]
\ No newline at end of file
+RewriteRule ^mobile-post-([0-9]+)-([0-9]+)-([0-9]+)\.html$ post.php?action=reply&fid=$1&tid=$2&p_page=$3&replysubmit=yes&mobile=1[L]
+
+RewriteRule ^i$ parasy_touch.php?action=home [L]
+RewriteRule ^i/$ parasy_touch.php?action=home [L]
+RewriteRule ^i/view-([0-9]+)-([0-9]+).html$
viewthread.php?app=touch&view_thread&tid=$1&page=$2 [L]
\ No newline at end of file

Added: trunk/upload/images/way/go-up.png
==============================================================================
Binary file. No diff available.

Added: trunk/upload/images/way/preferences-system.png
==============================================================================
Binary file. No diff available.

Modified: trunk/upload/include/cache.func.php
==============================================================================
--- trunk/upload/include/cache.func.php (original)
+++ trunk/upload/include/cache.func.php Sat Dec 29 05:44:57 2007
@@ -461,7 +461,7 @@
//$topthread['uid'] = $topthread['uid'];
$topthread['author'] = $topthread['author'] ? $topthread['author'] : '�ο�';
$topthread['subjectc'] = cutstr($topthread['subject'], 50);
- $topthread['avatar'] = avRESIZE($topthread['avatar'],'s');
+ $topthread['avatar'] = $topthread['avatar'];
$topthread['name'] = AddSlashes(strip_tags(trim($topthread['name'])));
$topthread['csscolor'] = rand_color();
$data[] = $topthread;

Modified: trunk/upload/include/common.inc.php
==============================================================================
--- trunk/upload/include/common.inc.php (original)
+++ trunk/upload/include/common.inc.php Sat Dec 29 05:44:57 2007
@@ -132,7 +132,7 @@
list($discuz_pw, $discuz_secques, $discuz_uid) =
empty($_DCOOKIE['auth']) ? array('', '', 0) : daddslashes(explode("\t",
authcode($_DCOOKIE['auth'], 'DECODE')), 1);

$newpm = $newpmexists = $sessionexists = $seccode = $bloguid = 0;
-$membertablefields = 'm.uid AS discuz_uid, m.username AS
discuz_user,m.usr_geo AS discuz_user_geo, m.password AS discuz_pw,
m.secques AS discuz_secques,m.now_img AS discuz_now_img,m.idx_cloud AS show_cloud,
+$membertablefields = 'm.uid AS discuz_uid, m.username AS
discuz_user,m.usr_geo AS discuz_user_geo, m.password AS discuz_pw,
m.secques AS discuz_secques,m.now_img AS discuz_now_img,m.idx_cloud AS
show_cloud,m.side_buddy AS show_side_buddy,
m.adminid, m.groupid, m.groupexpiry, m.extgroupids, m.email,
m.timeoffset, m.tpp, m.ppp, m.posts, m.digestposts,
m.oltime, m.pageviews, m.credits, m.extcredits1, m.extcredits2,
m.extcredits3, m.extcredits4, m.extcredits5,
m.extcredits6, m.extcredits7, m.extcredits8, m.timeformat,
m.dateformat, m.pmsound, m.sigstatus, m.invisible,
@@ -204,6 +204,7 @@
$groupid = empty($groupid) || $groupid != 6 ? 7 : 6;

} else {
+ $show_side_buddy = $show_side_buddy;
$show_cloud = $show_cloud;
$discuz_userss = $discuz_user;
$now_img_select = $discuz_now_img;
@@ -351,8 +352,10 @@
if($headercharset) {
@dheader('Content-Type: text/html; charset='.$charset);
}
- if(empty($_DCOOKIE['sid']) || $sid != $_DCOOKIE['sid']) {
- dsetcookie('sid', $sid, 604800);
+ if (CURSCRIPT != 'touch') {
+ if(empty($_DCOOKIE['sid']) || $sid != $_DCOOKIE['sid']) {
+ dsetcookie('sid', $sid, 604800);
+ }
}
}

@@ -388,30 +391,6 @@
}

$rssauth = $rssstatus && $discuz_uid ?
rawurlencode(authcode("$discuz_uid\t".($fid ?
$fid : '')."\t".substr(md5($discuz_pw.$discuz_secques), 0,
8), 'ENCODE', md5($_DCACHE['settings']['authkey']))) : '0';
-
-/* Parasy || Geo Initialization */
-if(PARASY_FEATURE_GEO && ($discuz_uid || $discuz_user)) {
- $Geo = new Geo($geo_user, $Geo->map);
- $Geo->geo->name->cn = iconv('utf-8', 'gbk', $Geo->geo->name->cn);
- $portal = $Geo->geo->name->cn;
-}
-
-/* Parasy || Cache Files */
-@include DISCUZ_ROOT.'./forumdata/cache/cache_lastmembers.php';
-@include DISCUZ_ROOT.'./forumdata/cache/cache_parasy_stats.php';
-
-/* Parasy || User Files */
-@include(DISCUZ_ROOT.'./forumdata/cache_usr/f/user_fav_'.$discuz_uid.'.php');
-if(@!include('forumdata/cache_usr/f/user_fav_'.$discuz_uid.'.php')){
- $fav = fav_update($discuz_uid);
-}
-
-if(CURSCRIPT !='viewpro' && $member['uid'] != $discuz_uid) {
- @include(DISCUZ_ROOT.'./forumdata/cache_usr/b/user_buddy_'.$discuz_uid.'.php');
- if(@!include('forumdata/cache_usr/b/user_buddy_'.$discuz_uid.'.php')){
- $buddy = buddy_update($discuz_uid);
- }
-}

@include DISCUZ_ROOT.'./parasy/ParasyInit.php';

Modified: trunk/upload/include/global.func.php
==============================================================================
--- trunk/upload/include/global.func.php (original)
+++ trunk/upload/include/global.func.php Sat Dec 29 05:44:57 2007
@@ -211,7 +211,7 @@
} else {
$referer = dhtmlspecialchars($referer);
}
-
+ //if(!preg_match("/(\.php|[a-z]+(\-\d+)+\.html)/", $referer) ||
strpos($referer, 'logging.php')) {
if(!preg_match("/(\.php|[a-z]+(\-\d+)+\.html)/", $referer) ||
strpos($referer, 'logging.php')) {
$referer = $default;
}
@@ -593,7 +593,7 @@
}
}

-function showmessage($message, $url_forward = '', $extra = '') {
+function showmessage($message, $url_forward = '', $extra
= '',$others='0') {
extract($GLOBALS, EXTR_SKIP);
global $extrahead, $discuz_action, $debuginfo, $seccode, $fid, $tid,
$supe_fromsupesite, $supe_jumpurl, $supe, $charset, $show_message, $_DCACHE;
define('CACHE_FORBIDDEN', TRUE);
@@ -645,12 +645,16 @@
}
include template('nopermission');
} else {
- include template($supe_messagetpl.'showmessage');
+ if ($others == 0 ){
+ include template($supe_messagetpl.'showmessage');
+ } else {
+ include template('showmessage_other');
+ }
}
dexit();
}

-function wapshowmessage($message, $url_forward = '', $extra = '') {
+function wapshowmessage($message, $url_forward = '', $extra = '',$type
='') {
extract($GLOBALS, EXTR_SKIP);
global $extrahead, $discuz_action, $debuginfo, $seccode, $fid, $tid,
$supe_fromsupesite, $supe_jumpurl, $supe, $charset, $show_message, $_DCACHE;
define('CACHE_FORBIDDEN', TRUE);
@@ -701,6 +705,8 @@
$seccode = random(6, 1) + $seccode{0} * 1000000;
}
include template('nopermission');
+ } elseif ($type = 'i_touch') {
+ include template('touch_message');
} else {
include template($supe_messagetpl.'showmessage_wap');
}

Modified: trunk/upload/logging.php
==============================================================================
--- trunk/upload/logging.php (original)
+++ trunk/upload/logging.php Sat Dec 29 05:44:57 2007
@@ -159,6 +159,8 @@
if(preg_match('/(mozilla|opera|m3gate|winwap|openwave)/i',
$_SERVER['HTTP_USER_AGENT'])) {
if ($from=='im') {
wapshowmessage('login_succeed', $bbsdir.'/im');
+ } elseif ($app=='touch') {
+ wapshowmessage('login_succeed', $referer == $bbsdir.'/i' ?
$bbsdir.'/i' : dreferer(),'','i_touch');
} else {
showmessage('login_succeed', dreferer());
}

Modified: trunk/upload/memcp.php
==============================================================================
--- trunk/upload/memcp.php (original)
+++ trunk/upload/memcp.php Sat Dec 29 05:44:57 2007
@@ -118,6 +118,7 @@
$pscheck = array(intval($member['pmsound']) => 'checked');

$cloudcheck = array($member['idx_cloud'] => 'checked="checked"');
+ $buddycheck = array($member['side_buddy'] => 'checked="checked"');

$styleselect = '';
$query = $db->query("SELECT styleid, name FROM {$tablepre}styles
WHERE available='1'");
@@ -363,10 +364,11 @@
$showemailnew = empty($showemailnew) ? 0 : 1;
$gendernew = empty($gendernew) ? 0 : intval($gendernew);
$cloudnew = empty($cloudnew) ? 0 : 1;
-
+ $buddynew = empty($buddynew) ? 0 : 1;
+
$db->query("UPDATE {$tablepre}members SET secques='$secquesnew',
gender='$gendernew', email='$emailnew', styleid='$styleidnew', bday='$bdaynew',
showemail='$showemailnew', timeoffset='$timeoffsetnew',
tpp='$tppnew', ppp='$pppnew', editormode='$editormodenew',
customshow='$customshownew', newsletter='$newsletternew', invisible='$invisiblenew',
- timeformat='$timeformatnew', dateformat='$dateformatnew',
pmsound='$pmsoundnew', styleid='$styleidnew',
sigstatus='$sigstatusnew',idx_cloud='$cloudnew' $newpasswdadd $authstradd1
+ timeformat='$timeformatnew', dateformat='$dateformatnew',
pmsound='$pmsoundnew', styleid='$styleidnew',
sigstatus='$sigstatusnew',idx_cloud='$cloudnew',side_buddy='$buddynew'
$newpasswdadd $authstradd1
WHERE uid='$discuz_uid'");

$query = $db->query("SELECT uid FROM {$tablepre}memberfields WHERE uid='$discuz_uid'");
@@ -870,7 +872,7 @@
showmessage('buddy_add_nonexistence');
}
}
- buddy_update($discuz_uid);
+ buddy_update($discuz_uid,1);
showmessage('buddy_update_succeed', $bbsdir.'/buddylist.nnm');

}

Modified: trunk/upload/my.php
==============================================================================
--- trunk/upload/my.php (original)
+++ trunk/upload/my.php Sat Dec 29 05:44:57 2007
@@ -20,7 +20,7 @@

$page = max(1, intval($page));
$start_limit = ($page - 1) * $tpp;
-
+$app_hide_sidebar = array('buddy','fav');
$threadlist = $postlist = array();

$tids = $comma = $threadadd = $postadd = $forumname = $extrafid =
$extra = '';
@@ -29,7 +29,7 @@
$threadadd = "AND t.fid='$srchfid'";
$postadd = "AND p.fid='$srchfid'";
$forumname = $_DCACHE['forums'][$srchfid]['name'];
- $extrafid = '&srchfid='.$srchfid;
+ $extrafid = '-fid-'.$srchfid;
}

$item = isset($item) ? trim($item) : '';
@@ -186,6 +186,9 @@

if($ids = implodeids($delete)) {
$db->query("DELETE FROM {$tablepre}favorites WHERE
uid='$discuz_uid' AND $ftid IN ($ids)", 'UNBUFFERED');
+ fav_update($discuz_uid);
+ require DISCUZ_ROOT.'./include/cache.func.php';
+ updatecache('fav');
}
showmessage('favorite_update_succeed', dreferer());
}

Modified: trunk/upload/parasy/ParasyCore.php
==============================================================================
--- trunk/upload/parasy/ParasyCore.php (original)
+++ trunk/upload/parasy/ParasyCore.php Sat Dec 29 05:44:57 2007
@@ -322,6 +322,8 @@
$source = 'im';
} else if ($source=='3') {
$source = 'Wii';
+ } else if ($source=='4') {
+ $source = 'iPhone';
} else {
$source = 'web';
}
@@ -408,7 +410,7 @@
}
}
/* Page Functions */
-function now_multi($num, $perpage, $curpage, $mpurl, $maxpages = 0,
$page = 10, $simple = 0, $onclick = '') {
+function now_multi($num, $perpage, $curpage, $mpurl, $maxpages = 0,
$page = 10, $simple = 0, $onclick = '',$postfix ='') {
$multipage = '';
//$mpurl .= strpos($mpurl, '?') ? '&' : '?';
$onclick = $onclick ? ' onclick="'.$onclick.'(event)"' : '';
@@ -436,17 +438,17 @@
}
}

- $multipage = ($curpage - $offset > 1 && $pages > $page ? '<a
href="'.$mpurl.'1" class="p"'.$onclick.'>|&lsaquo;</a>' : '').
- ($curpage > 1 && !$simple ? '<a href="'.$mpurl.''.($curpage - 1).'" class="p">&lsaquo;&lsaquo;</a>' : '');
+ $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.'" class="p"'.$onclick.'>'.$i.'</a>';
+ '<a href="'.$mpurl.''.$i.''.$postfix.'" class="p"'.$onclick.'>'.$i.'</a>';
}

- $multipage .= ($curpage < $pages && !$simple ? '<a
href="'.$mpurl.''.($curpage + 1).'" class="p"'.$onclick.'>&rsaquo;&rsaquo;</a>' : '').
- ($to < $pages ? '<a href="'.$mpurl.''.$pages.'"
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; return false;}"></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 / '.$perpage.' PER PAGE</strong><a class="p_edge"> '.$curpage.'/'.$realpages.' </a>' : '').$multipage : '';
}
@@ -510,16 +512,20 @@
}

/* User Functions */
-function svp_update($uid) {
+function svp_update($uid,$del = 0) {
global $db, $_DCACHE, $timestamp, $tablepre, $discuz_uid, $member;
$data = array();
- $query = $db->query("SELECT svp_id, svp_url, svp_rank FROM
{$tablepre}savepoint WHERE svp_uid = '{$uid}' ORDER BY svp_url");
- while($svp = $db->fetch_array($query)) {
- $data['svp'][$svp['svp_id']]['svp_id'] = $svp['svp_id'];
- $data['svp'][$svp['svp_id']]['svp_url'] = htmlspecialchars($svp['svp_url']);
- $data['svp'][$svp['svp_id']]['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
+ $query = $db->query("SELECT COUNT(*) FROM {$tablepre}savepoint WHERE
svp_uid = '{$uid}'");
+ $count = $db->result($query, 0);
+ if ($count > 0 || $del == 1) {
+ $query = $db->query("SELECT svp_id, svp_url, svp_rank FROM
{$tablepre}savepoint WHERE svp_uid = '{$uid}' ORDER BY svp_url");
+ while($svp = $db->fetch_array($query)) {
+ $data['svp'][$svp['svp_id']]['svp_id'] = $svp['svp_id'];
+ $data['svp'][$svp['svp_id']]['svp_url'] = htmlspecialchars($svp['svp_url']);
+ $data['svp'][$svp['svp_id']]['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
+ }
+ nmwritetocache('user_svp_'.$uid, '', nmgetcachevars($data),'','cache_usr/svp');
}
- nmwritetocache('user_svp_'.$uid, '', nmgetcachevars($data),'','cache_usr/svp');
return $data['svp'];
}

@@ -535,16 +541,20 @@
return $data['fav'];
}

-function buddy_update($uid) {
+function buddy_update($uid,$del = 0) {
global $db, $_DCACHE, $timestamp, $tablepre, $discuz_uid, $member;
$data = array();
- $query = $db->query("SELECT b.*, m.username, mf.avatar FROM
{$tablepre}buddys b LEFT JOIN {$tablepre}members m ON m.uid=b.buddyid
LEFT JOIN {$tablepre}memberfields mf ON mf.uid=m.uid WHERE
b.uid='{$uid}' ORDER BY dateline ASC");
- while($buddy = $db->fetch_array($query)) {
- $data['buddy'][$buddy['buddyid']]['buddyid'] = $buddy['buddyid'];
- $data['buddy'][$buddy['buddyid']]['username'] = $buddy['username'];
- $data['buddy'][$buddy['buddyid']]['friendavatar'] = avRESIZE($buddy['avatar'],'',1);
+ $query = $db->query("SELECT COUNT(*) FROM {$tablepre}buddys WHERE uid = '{$uid}'");
+ $count = $db->result($query, 0);
+ if ($count > 0 || $del == 1) {
+ $query = $db->query("SELECT b.*, m.username, mf.avatar FROM
{$tablepre}buddys b LEFT JOIN {$tablepre}members m ON m.uid=b.buddyid
LEFT JOIN {$tablepre}memberfields mf ON mf.uid=m.uid WHERE
b.uid='{$uid}' ORDER BY dateline ASC");
+ while($buddy = $db->fetch_array($query)) {
+ $data['buddy'][$buddy['buddyid']]['buddyid'] = $buddy['buddyid'];
+ $data['buddy'][$buddy['buddyid']]['username'] = $buddy['username'];
+ $data['buddy'][$buddy['buddyid']]['friendavatar'] = avRESIZE($buddy['avatar'],'',1);
+ }
+ nmwritetocache('user_buddy_'.$uid, '', nmgetcachevars($data),'','cache_usr/b');
}
- nmwritetocache('user_buddy_'.$uid, '', nmgetcachevars($data),'','cache_usr/b');
return $data['buddy'];
}

Modified: trunk/upload/parasy/ParasyInit.php
==============================================================================
--- trunk/upload/parasy/ParasyInit.php (original)
+++ trunk/upload/parasy/ParasyInit.php Sat Dec 29 05:44:57 2007
@@ -63,9 +63,27 @@

if ($discuz_uid){
$my_percent = @round($posts * 100 / $posts_total, 3);
- if (PARASY_FEATURE_TOD){
- $query = $db->query("SELECT COUNT(*) FROM {$tablepre}plugin_tod_task
WHERE tta_uid = {$discuz_uid} AND tta_progress=0");
- $my_tod_task = $db->result($query, 0);
+}
+
+/* Parasy || Geo Initialization */
+if(PARASY_FEATURE_GEO && ($discuz_uid || $discuz_user)) {
+ $Geo = new Geo($geo_user, $Geo->map);
+ $Geo->geo->name->cn = iconv('utf-8', 'gbk', $Geo->geo->name->cn);
+ $portal = $Geo->geo->name->cn;
+}
+
+/* Parasy || Cache Files */
+@include DISCUZ_ROOT.'./forumdata/cache/cache_lastmembers.php';
+@include DISCUZ_ROOT.'./forumdata/cache/cache_parasy_stats.php';
+
+/* Parasy || User Files */
+@include(DISCUZ_ROOT.'./forumdata/cache_usr/f/user_fav_'.$discuz_uid.'.php');
+
+if(CURSCRIPT !='viewpro' && $member['uid'] != $discuz_uid &&
$show_side_buddy== 1) {
+ @include(DISCUZ_ROOT.'./forumdata/cache_usr/b/user_buddy_'.$discuz_uid.'.php');
+ if(@!include('forumdata/cache_usr/b/user_buddy_'.$discuz_uid.'.php')){
+ $buddy = buddy_update($discuz_uid);
}
}
+
?>

Modified: trunk/upload/parasy/ParasySettings.inc.php
==============================================================================
--- trunk/upload/parasy/ParasySettings.inc.php (original)
+++ trunk/upload/parasy/ParasySettings.inc.php Sat Dec 29 05:44:57 2007
@@ -8,6 +8,7 @@
$bbsdir = '/bbs';
$jsdir = '/bbs/include/javascript';
define('MOBILE_NAME', 'NoName');
+define('TOUCHIMG', '/bbs/images/touch');

/* FEATURES | use 'true' or 'false' */
define('PARASY_FEATURE_DASHBOARD', true); //Dashboard

Modified: trunk/upload/parasy_operation.php
==============================================================================
--- trunk/upload/parasy_operation.php (original)
+++ trunk/upload/parasy_operation.php Sat Dec 29 05:44:57 2007
@@ -52,7 +52,7 @@
$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");
- svp_update($discuz_uid);
+ svp_update($discuz_uid,1);
dheader("Location: {$boardurl}u-".$discuz_uid.".html");
} else {
dheader("Location: {$boardurl}u-".$discuz_uid.".html");

Modified: trunk/upload/plugins/parasy/now.inc.php
==============================================================================
--- trunk/upload/plugins/parasy/now.inc.php (original)
+++ trunk/upload/plugins/parasy/now.inc.php Sat Dec 29 05:44:57 2007
@@ -11,6 +11,7 @@
$ver = "V0.5.7 Build 071201";
$perpage= NOW_PER_PAGE;
$m_perpage= M_PER_PAGE;
+$app_hide_sidebar = array('buddy','fav');

if ($action == "index") {
if ($discuz_uid) {
@@ -35,7 +36,7 @@
$start_limit = ($page - 1) * $m_perpage;
$multipage = now_wap_multi($nowcount, $m_perpage,
$page, "{$boardurl}now/page/", $threadmaxpages);
}
- if (empty($page)) {
+ if ($page == '1') {
require_once DISCUZ_ROOT.'./forumdata/cache/cache_nowhere.php';
$message_list = $_DCACHE['nowhere'];
} else {
@@ -47,7 +48,7 @@
}

while ($message = $db->fetch_array($query)) {
- $message['dateline'] = make_descriptive_time($message[dateline]);
+ $message['dateline'] = make_descriptive_time($message[dateline]);
$message['content'] = dhtmlspecialchars($message['content']);
$message['background'] = nwFROM($message['background']);
$message['iconshow'] = nwICONS($message['icons']);
@@ -432,7 +433,11 @@
if (!$fontcolor){
$fontcolor = "#000";
}
- $content_sql = mysql_real_escape_string(stripslashes($content));
+ if ($app_charset == 'utf-8') {
+ $content_sql =
mysql_real_escape_string(stripslashes(iconv('utf-8', 'gbk', $content)));
+ } else {
+ $content_sql = mysql_real_escape_string(stripslashes($content));
+ }
$db->query("INSERT INTO {$tablepre}plugin_now (dateline, author,
authorid, content, background, icons) VALUES ('".$timestamp."', '$discuz_user', '$discuz_uid', '".$content_sql."', '$background', '$iconsnew')");
require_once DISCUZ_ROOT.'./include/cache.func.php';
updatecache('nowhere');

Modified: trunk/upload/plugins/parasy/tod.inc.php
==============================================================================
--- trunk/upload/plugins/parasy/tod.inc.php (original)
+++ trunk/upload/plugins/parasy/tod.inc.php Sat Dec 29 05:44:57 2007
@@ -14,6 +14,8 @@
$action = 'home';
}

+$app_hide_sidebar = array('buddy');
+
switch ($action) {
default:
case 'home':

Modified: trunk/upload/templates/babel/forumdisplay.htm
==============================================================================
--- trunk/upload/templates/babel/forumdisplay.htm (original)
+++ trunk/upload/templates/babel/forumdisplay.htm Sat Dec 29 05:44:57 2007
@@ -26,7 +26,7 @@
<img src="$forum_pic" align="right" class="portrait" />
<img src="{IMGDIR}/ico_board.gif" align="absmiddle" class="home" />$forum[name]
<a href="$bbsdir/my.php?item=favorites&fid=$fid"
id="ajax_favorite" onclick="ajaxmenu(event, this.id)" style="font-size:
12px; margin-left: 10px;"><img src="{IMGDIR}/lightning_add.png"
align="absmiddle" /> {lang forum_favorite}</a> 
-<a href="$bbsdir/my.php?item=threads&srchfid=$fid"
style="font-size: 12px;"><img src="{IMGDIR}/pico_online.gif"
align="absmiddle" /> {lang show_mytopics}</a></span>
+<a href="$bbsdir/my-threads-fid-$fid.html" style="font-size:
12px;"><img src="{IMGDIR}/pico_online.gif" align="absmiddle" /> {lang show_mytopics}</a></span>
<br />��й�� $threadcount �� ��
$moderatedby ��{lang forum_modedby}��滹û�а��

<hr size="1" class="board" />

Modified: trunk/upload/templates/babel/header.htm
==============================================================================
--- trunk/upload/templates/babel/header.htm (original)
+++ trunk/upload/templates/babel/header.htm Sat Dec 29 05:44:57 2007
@@ -20,6 +20,9 @@
<script type="text/javascript">var IMGDIR = '{IMGDIR}';var SMDIR
= '{SMDIR}';var BBSDIR = '$bbsdir';</script>
</head>
<body onkeydown="if(event.keyCode==27) return false;">
+
+
+
<div align="center">
<div id="parasy">

@@ -62,9 +65,9 @@
<li><a href="http://blog.orzotl.com/?action_site_type_panel"
class="nav">��<img src="{IMGDIR}/pico_zen.gif"
align="absmiddle"> �ҵĲ�־</a></li>
<li><a
href="$bbsdir/now/$discuz_userss_encode" class="nav">��<img
src="{IMGDIR}/rainbow.png" align="absmiddle" /> Nowhere</a></li>
<li><a href="$bbsdir/tod"
class="nav">��<img src="{IMGDIR}/report_edit.png" align="absmiddle" /> Tod��y</a></li>
- <li><a href="$bbsdir/my.php?item=threads" class="nav">��<img
src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> �ҵ��</a></li>
- <li><a href="$bbsdir/my.php?item=posts" class="nav">��<img
src="{IMGDIR}/comments_add.png" align="absmiddle" /> �ҵĻظ�</a></li>
- <li><a href="$bbsdir/my.php?item=favorites&type=thread"
class="nav">��<img src="{IMGDIR}/star.png" align="absmiddle" /> �ҵ��ղؼ�</a></li>
+ <li><a href="$bbsdir/my-threads.html" class="nav">��<img
src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> �ҵ��</a></li>
+ <li><a href="$bbsdir/my-posts.html" class="nav">��<img
src="{IMGDIR}/comments_add.png" align="absmiddle" /> �ҵĻظ�</a></li>
+ <li><a href="$bbsdir/my-favorites-thread.html" class="nav">��<img
src="{IMGDIR}/star.png" align="absmiddle" /> �ҵ��ղؼ�</a></li>
<li><a href="$bbsdir/expense/view.nnm"
class="nav">��<img src="{IMGDIR}/coins_delete.png" align="absmiddle" /> ��Ѽ�¼</a></li>
<li><a href="$bbsdir/session/stats.nnm" class="nav">��<img
src="{IMGDIR}/page_copy.png" align="absmiddle" /> ��η�� $_SESSION['hits'] ��ҳ��</a></li>
<li><div class="sep"> </div></li>
@@ -89,7 +92,7 @@

<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/u-$discuz_uid.html" class="menu">�ҵ��ҳ</a></li>
- <li><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a
href="$bbsdir/my.php?item=threads" class="menu">�ҵ��</a></li>
+ <li><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a
href="$bbsdir/my-threads.html" 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>
@@ -99,9 +102,9 @@
<li><hr class="board"><img src="{IMGDIR}/key_go.png"
align="absmiddle" /> <a href="$bbsdir/logout-{FORMHASH}.nnm" class="menu">�ǳ�</a></li>
</ul>
</div>
-{template memcp_side}

-<div class="menu_fav" align="left"><img src="{IMGDIR}/star.png"
align="absmiddle" /> <a href="$bbsdir/favorite.nnm" class="menu">�ҵ��ղؼ�</a>
+
+<div class="menu_fav" align="left"><img src="{IMGDIR}/star.png"
align="absmiddle" /> <a href="$bbsdir/my-favorites-thread.html" class="menu">�ҵ��ղؼ�</a>

<hr class="board">
<ul class="news">
@@ -112,14 +115,18 @@

</div>

-
-<div class="menu_fav" align="left"><img src="{IMGDIR}/heart.png"
align="absmiddle" /> <a href="$bbsdir/buddylist.nnm" class="menu">�ҵĺ��</a>
-<hr class="board">
-
-
-<a href="$bbsdir/u-$buddy[buddyid].html" class="var"
title="$buddy[username]"><img src="$bbsdir/$buddy[friendavatar]"
alt="$buddy[username]" class="mp" /></a>
-
-</div>
+
+
+
+ 
+ <div class="menu_fav" align="left"><img src="{IMGDIR}/heart.png"
align="absmiddle" /> <a href="$bbsdir/buddylist.nnm" class="menu">�ҵĺ��</a>
+ <hr class="board">
+ 
+ 
+ <a href="$bbsdir/u-$buddy[buddyid].html" class="var"
title="$buddy[username]"><img src="$bbsdir/$buddy[friendavatar]"
alt="$buddy[username]" class="mp" /></a>
+ 
+ </div>
+ 

<div class="menu_inner" align="left">
<ul class="menu">

Modified: trunk/upload/templates/babel/memcp_navbar.htm
==============================================================================
--- trunk/upload/templates/babel/memcp_navbar.htm (original)
+++ trunk/upload/templates/babel/memcp_navbar.htm Sat Dec 29 05:44:57 2007
@@ -12,4 +12,10 @@


</div></div>
-<div class="maintable" align="left">
\ No newline at end of file
+<div class="maintable" align="left">
+<ul class="tabs">
+<li
class="current">��ҳ</li><li class="normal"><a href="memcp.nnm">��ҳ</a></li>
+<li class="current">{lang
memcp_profile}</li><li class="normal"><a
href="modify.nnm">{lang memcp_profile}</a></li>
+<li class="current">{lang
memcp_buddylist}</li><li class="normal"><a
href="buddylist.nnm">{lang memcp_buddylist}</a></li>
+<li
class="current">{lang memcp_usergroups}</li><li
class="normal"><a href="usergroups.nnm">{lang memcp_usergroups}</a></li>
+</ul>

Modified: trunk/upload/templates/babel/memcp_profile.htm
==============================================================================
--- trunk/upload/templates/babel/memcp_profile.htm (original)
+++ trunk/upload/templates/babel/memcp_profile.htm Sat Dec 29 05:44:57 2007
@@ -33,7 +33,7 @@
</script>
<form name="reg" method="post" action="$bbsdir/modify.nnm" $enctype
onSubmit="return validate(this)">
<input type="hidden" name="formhash" value="{FORMHASH}">
-<span class="text_large"><img src="{IMGDIR}/ico_smile.gif"
align="absmiddle" class="home" />�ϴ�ͷ��</span>
+<span class="text_large"><img src="{IMGDIR}/go-up.png"
align="absmiddle" class="home" />�ϴ�ͷ��</span>
<table cellpadding="0" cellspacing="0" border="0" class="form">
<tr>
<td width="200" align="right">��ڵ��</td>
@@ -100,7 +100,7 @@

<div class="maintable" align="left">
<span class="text_large"><a name="settings">
-<img src="{IMGDIR}/ico_conf.gif" align="absmiddle" class="home"
border="0" /></a>��Ա��Ϣ�޸�</span>
+<img src="{IMGDIR}/preferences-system.png" align="absmiddle"
class="home" border="0" /></a>��Ա��Ϣ�޸�</span>
<table cellpadding="0" cellspacing="0" border="0" class="form">
<tr>

@@ -242,17 +242,24 @@
<span class="text_large"><a name="settings">
<img src="{IMGDIR}/ico_conf.gif" align="absmiddle" class="home"
border="0" /></a>{lang board_options}</span>
<table cellpadding="0" cellspacing="0" border="0" class="form">
-<tr>
+

Added: trunk/upload/templates/babel/my.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,51 @@
+{template header}
+<div class="subtable nav" style="width: {TABLEWIDTH}"><img
src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" />
+<a href="$bbsdir/$indexname">$bbname</a> » <a href="$bbsdir/my-$item$extra.html">{lang my}...{lang
my_threads}{lang my_replys}{lang
my_favorite_threads}{lang my_favorite_forums}{lang my_subscription_threads}{lang
my_trades}{lang my_rewards}{lang my_activities}{lang post_my_advisit}</a> » $forumname
+</div></div>
+<div class="maintable">
+<ul class="tabs">
+<li class="current">�ҵ��</li>
+<li class="normal"><a href="$bbsdir/my-threads$extrafid.html">�ҵ��</a></li>
+
+<li class="current">�ҵĻظ�</li>
+<li class="normal"><a href="$bbsdir/my-posts$extrafid.html">�ҵĻظ�</a></li>
+
+<li class="current">�ղص��</li>
+<li class="normal"><a href="$bbsdir/my-favorites-thread.html">�ղص��</a></li>
+
+
+<li class="current">�ղص��̳</li>
+<li class="normal"><a href="$bbsdir/my-favorites-forum.html">�ղص��̳</a></li>
+
+
+<li class="current">��ĵ��</li>
+<li class="normal"><a href="$bbsdir/my-subscriptions$extrafid.html">��ĵ��</a></li>
+
+
+</ul>
+
+
+ {template my_index}
+
+ {template my_threads}
+
+ {template my_posts}
+
+ {template my_favorites}
+
+ {template my_subscriptions}
+
+ {template my_tradestats}
+
+ {template my_trades}
+
+ {template my_tradethreads}
+
+ {template my_rewards}
+
+ {template my_activities}
+
+ {template my_promotion}
+
+
+{template footer}
\ No newline at end of file

Added: trunk/upload/templates/babel/my_favorites.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_favorites.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,61 @@
+
+ <form method="post" action="my.php?item=favorites&type=forum">
+ <input type="hidden" name="formhash" value="{FORMHASH}">
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+ <tr class="header"><td colspan="5">{lang my_favorite_forums}</td></tr>
+ <tr class="category">
+ <td align="center" width="48"><input class="checkbox" type="checkbox"
name="chkall" onclick="checkall(this.form)">{lang delete_check}</td>
+ <td width="45%">{lang forum}</td>
+ <td align="center">{lang forum_threads}</td>
+ <td align="center">{lang forum_posts}</td>
+ <td align="center">{lang forum_todayposts}</td>
+ </tr>
+
+ 
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td align="center"><input class="checkbox" type="checkbox"
name="delete[]" value="$fav[fid]"></td>
+ <td><a href="$bbsdir/forumdisplay.php?fid=$fav[fid]">$fav[name]</a></td>
+ <td align="center">$fav[threads]</td>
+ <td align="center">$fav[posts]</td>
+ <td align="center">$fav[todayposts]</td>
+ </tr>
+ 
+ 
+ <tr><td class="altbg1 bottom" colspan="5">{lang memcp_nofavs}</td></tr>
+ 
+ </table>
+
+ <form method="post" action="my.php?item=favorites&type=thread">
+ <input type="hidden" name="formhash" value="{FORMHASH}">
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+ <tr class="header"><td colspan="5">{lang my_favorite_threads}</td></tr>
+ <tr class="category">
+ <td align="center" width="48"><input class="checkbox" type="checkbox"
name="chkall" onclick="checkall(this.form)">{lang delete_check}</td>
+ <td width="45%">{lang subject}</td>
+ <td align="center">{lang forum}</td>
+ <td align="center">{lang replies}</td>
+ <td>{lang lastpost}</td>
+ </tr>
+
+ 
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td align="center"><input class="checkbox" type="checkbox"
name="delete[]" value="$fav[tid]"></td>
+ <td class="subject"><a href="$bbsdir/viewthread.php?tid=$fav[tid]">$fav[subject]</a></td>
+ <td align="center"><a href="$bbsdir/forumdisplay.php?fid=$fav[fid]">$fav[name]</a></td>
+ <td align="center">$fav[replies]</td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$fav[tid]&goto=lastpost#lastpost">$fav[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$fav[lastposterenc]">$fav[lastposter]</a>{lang anonymous}</font></td>
+ </tr>
+ 
+ 
+ <tr><td class="altbg1 bottom" colspan="5">{lang memcp_nofavs}</td></tr>
+ 
+
+ </table>
+
+
+<table cellspacing="0" cellpadding="0" width="100%" style="margin-top: {TABLESPACE}px"><tr><td>$multipage</td></tr>
+<tr><td><br><div class="option" style="width: 100%"><div
class="submitbutton"><input class="button" type="submit"
name="favsubmit" value="{lang submit}"></div></div></td></tr>
+</table><br>
+</form>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_index.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_index.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,43 @@
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr><td class="header" colspan="4">{lang my_threads_last_five}</td></tr>
+<tr class="category">
+<td width="35%" align="left">{lang subject}</td>
+<td width="30%" align="center">{lang forum}</td>
+<td width="25%">{lang lastpost}</td>
+<td width="10%" align="center">{lang status}</td>
+</tr>
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject"><a
href="$bbsdir/viewthread.php?tid=$thread[tid]" target="_blank">$thread[subject]</a>$thread[subject]</td>
+ <td align="center"><a
href="$bbsdir/forumdisplay.php?fid=$thread[fid]" target="_blank">$thread[forumname]</a></td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$thread[tid]&goto=lastpost#lastpost">$thread[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$thread[lastposterenc]"
target="_blank">$thread[lastposter]</a>{lang anonymous}</font></td>
+ <td align="center">{lang
forum_recyclebin}{lang
my_threads_aduit}{lang
close}{lang common}</td>
+ </tr>
+ 
+
+ <tr><td colspan="4" class="altbg2 bottom">{lang forum_nothreads}</td></tr>
+
+</table><br>
+
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr><td class="header" colspan="4">{lang my_replys_last_five}</td></tr>
+<tr class="category">
+<td width="35%" align="left">{lang in_thread}</td>
+<td width="30%" align="center">{lang forum}</td>
+<td width="25%">{lang lastpost}</td>
+<td width="10%" align="center">{lang status}</td>
+</tr>
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject"><a
href="$bbsdir/redirect.php?goto=findpost&pid=$post[pid]&ptid=$post[tid]"
target="_blank">$post[subject]{lang
title_none}</a>$post[subject]{lang title_none}</td>
+ <td align="center"><a href="$bbsdir/forumdisplay.php?fid=$post[fid]" target="_blank">$post[forumname]</a></td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$post[tid]&goto=lastpost#lastpost">$post[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$post[lastposterenc]"
target="_blank">$post[lastposter]</a>{lang anonymous}</font></td>
+ <td align="center">{lang
delete_wait}{lang
delete_wait}{lang common}</td>
+ </tr>
+ 
+
+ <tr><td colspan="4" class="altbg2 bottom">{lang forum_nothreads}</td></tr>
+
+</table><br>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_posts.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_posts.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,22 @@
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr><td class="header" colspan="4">{lang my_replys}</td></tr>
+<tr class="category">
+<td width="35%" align="left">{lang in_thread}</td>
+<td width="30%" align="center">{lang forum}</td>
+<td width="25%">{lang lastpost}</td>
+<td width="10%" align="center">{lang status}</td>
+</tr>
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject"><a href="$bbsdir/redirect.php?goto=findpost&pid=$post[pid]&ptid=$post[tid]">$post[tsubject]</a></td>
+ <td align="center"><a href="$bbsdir/forumdisplay.php?fid=$post[fid]">$post[forumname]</a></td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$post[tid]&goto=lastpost#lastpost">$post[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$post[lastposterenc]">$post[lastposter]</a>{lang anonymous}</font></td>
+ <td align="center">{lang
forum_recyclebin}{lang
my_threads_aduit}{lang my_threads_common}</td>
+ </tr>
+ 
+
+ <tr><td colspan="4" class="altbg1 bottom">{lang forum_nothreads}</td></tr>
+
+</table>
+<div class="subtable" style="margin-top: {TABLESPACE}px">$multipage</div>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_rewards.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_rewards.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,86 @@
+
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+ <tr class="bottom">
+ 
+ <td align=center class="altbg1">{lang
my_reward_all_question}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=$extrafid">{lang my_reward_all_question}</a></td>
+ <td align=center class="altbg1">{lang
my_reward_question_solved}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=solved$extrafid">{lang my_reward_question_solved}</a></td>
+ <td align=center class="altbg1">{lang
my_reward_question_unsolved}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=unsolved$extrafid">{lang my_reward_question_unsolved}</a></td>
+ 
+ <td align=center class="altbg1">{lang
my_reward_all_answer}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=$extrafid">{lang my_reward_all_answer}</a></td>
+ <td align=center class="altbg1">{lang
my_reward_answer_adopted}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=adopted$extrafid">{lang my_reward_answer_adopted}</a></td>
+ <td align=center class="altbg1">{lang
my_reward_answer_unadopted}class="altbg2"><a
href="my.php?item=$item&type=$type&filter=unadopted$extrafid">{lang my_reward_answer_unadopted}</a></td>
+ 
+ </tr>
+ </table>
+
+<br>
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr class="header">
+
+ <td colspan="7">{lang my_reward_questions}
+
+ <td colspan="6">{lang my_reward_answers}
+
+ <td colspan="2">{lang my_reward_stat}
+
+</td>
+</tr>
+
+<tr class="category">
+<td align="left" width="30%">{lang my_reward_name}</td>
+<td align="center" width="10%">{lang my_reward_forum}</td>
+<td align="center" width="10%">{lang
my_reward_answerer}{lang my_reward_questioner}</td>
+<td align="center" width="10%">{lang my_reward_allprice}</td>
+
+ <td align="center" width="10%">{lang my_reward_real_payment}</td>
+
+<td align="center" width="10%">{lang my_reward_status}</td>
+<td align="center" width="20%">{lang my_reward_dateline}</td>
+</tr>
+
+
+ <tr><td align="left" class="altbg1" width="40%">{lang
my_reward_question_number}:</td><td align="left"
class="altbg2">$questions[total] {lang my_reward_unit}</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_question_solved_number}:</td><td align="left"
class="altbg2">$questions[solved] {lang my_reward_unit}</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_question_solved_per}:</td><td align="left" class="altbg2">$questions[percent]%</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_question_price}({$extcredits[$creditstrans][title]}):</td><td
align="left" class="altbg2">$questions['totalprice'] $extcredits[$creditstrans][unit]</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_answer_number}:</td><td align="left"
class="altbg2">$answers[total] {lang my_reward_unit}</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_answer_adopted_number}:</td><td align="left"
class="altbg2">$answers[adopted] {lang my_reward_unit}</td></tr>
+ <tr><td align="left" class="altbg1">{lang
my_reward_answer_adopted_per}:</td><td align="left" class="altbg2">$answers[percent]%</td></tr>
+ <tr class="bottom"><td align="left" class="altbg1">{lang
my_reward_anser_price}({$extcredits[$creditstrans][title]}):</td><td
align="left" class="altbg2">$answers['totalprice'] $extcredits[$creditstrans][unit]</td></tr>
+
+ 
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject" align="left"><a href="viewthread.php?tid=$rewardlog[tid]">$rewardlog[subject]</a></td>
+ <td align="center"><a href="forumdisplay.php?fid=$rewardlog[fid]">$rewardlog[name]</a></td>
+ <td align="center"><a href="space.php?uid=$rewardlog[uid]">$rewardlog[username]</a> </td>
+ <td align="center">{$extcredits[$creditstrans][title]}
$rewardlog[price] $extcredits[$creditstrans][unit]</td>
+ <td align="center">{$extcredits[$creditstrans][title]}
$rewardlog['netamount'] $extcredits[$creditstrans][unit]</td>
+ <td align="center">{lang
my_reward_solved}{lang my_reward_unsolved}</td>
+ <td align="center">$rewardlog[dateline]</td>
+ </tr>
+ 
+ 
+ <tr><td colspan="7" class="altbg1 bottom">{lang my_reward_nonexistence}</td></tr>
+ 
+
+ 
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject" align="left"><a href="viewthread.php?tid=$rewardlog[tid]">$rewardlog[subject]</a></td>
+ <td align="center"><a
href="forumdisplay.php?fid=$rewardlog[fid]">$rewardlog[name]</a></td>
+ <td align="center"><a href="space.php?uid=$rewardlog[uid]">$rewardlog[username]</a> </td>
+ <td align="center">{$extcredits[$creditstrans][title]}
$rewardlog[price] $extcredits[$creditstrans][unit]</td>
+ <td align="center">{lang
my_reward_adopted}{lang my_reward_unadopted}</td>
+ <td align="center">$rewardlog[dateline]</td>
+ </tr>
+ 
+ 
+ <tr><td colspan="7" class="altbg1 bottom">{lang my_reward_nonexistence}</td></tr>
+ 
+
+ <td class="altbg1" colspan="762">{lang my_reward_nofind}</td></tr>
+
+</table>
+
+<div class="subtable" style="margin-top: {TABLESPACE}px">$multipage</div>

Added: trunk/upload/templates/babel/my_subscriptions.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_subscriptions.htm Sat Dec 29
05:44:57 2007
@@ -0,0 +1,33 @@
+<form method="post" action="my.php?item=subscriptions">
+<input type="hidden" name="formhash" value="{FORMHASH}">
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr class="header"><td colspan="5">{lang my_subscription_threads}</td></tr>
+<tr class="category">
+<td align="center" width="48"><input class="checkbox" type="checkbox"
name="chkall" class="header" onclick="checkall(this.form)">{lang delete_check}</td>
+<td width="45%" align="left">{lang subject}</td>
+<td align="center">{lang forum}</td>
+<td align="center">{lang replies}</td>
+<td>{lang lastpost}</td>
+</tr>
+
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td align="center"><input class="checkbox" type="checkbox"
name="delete[]" value="$subs[tid]"></td>
+ <td class="subject"><a href="$bbsdir/viewthread.php?tid=$subs[tid]">$subs[subject]</a></td>
+ <td align="center"><a href="$bbsdir/forumdisplay.php?fid=$subs[fid]">$subs[name]</a></td>
+ <td align="center">$subs[replies]</td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$subs[tid]&goto=lastpost#lastpost">$subs[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$subs[lastposterenc]">$subs[lastposter]</a>{lang anonymous}</font></td>
+ </tr>
+ 
+
+ <tr><td class="altbg1 bottom" colspan="5">{lang memcp_nosubs}</td></tr>
+
+
+</table>
+
+<table cellspacing="0" cellpadding="0" width="100%" style="margin-top: {TABLESPACE}px"><tr><td>$multipage</td></tr>
+<tr><td><br><div class="option" style="width: 100%"><div
class="submitbutton"><input class="button" type="submit"
name="subsubmit" value="{lang submit}"></div></div></td></tr>
+</table><br>
+
+</form>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_threads.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_threads.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,23 @@
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr><td class="header" colspan="4">{lang my_threads}</td></tr>
+<tr class="category">
+<td width="35%" align="left">{lang subject}</td>
+<td width="30%" align="center">{lang forum}</td>
+<td width="25%">{lang lastpost}</td>
+<td width="10%" align="center">{lang status}</td>
+</tr>
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject"><a href="$bbsdir/viewthread.php?tid=$thread[tid]">$thread[subject]</a>$thread[subject]</td>
+ <td align="center"><a href="$bbsdir/forumdisplay.php?fid=$thread[fid]">$thread[forumname]</a></td>
+ <td><font class="smalltxt"><a
href="$bbsdir/redirect.php?tid=$thread[tid]&goto=lastpost#lastpost">$thread[lastpost]</a>
by <a
href="$bbsdir/space.php?username=$thread[lastposterenc]">$thread[lastposter]</a>{lang anonymous}</font></td>
+ <td align="center">{lang
forum_recyclebin}{lang
my_threads_aduit}{lang
my_threads_close}{lang my_threads_common}</td>
+ </tr>
+ 
+
+ <tr><td colspan="4" class="altbg1 bottom">{lang forum_nothreads}</td></tr>
+
+</table>
+
+<div class="subtable" style="margin-top: {TABLESPACE}px">$multipage</div>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_tradestats.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_tradestats.htm Sat Dec 29 05:44:57 2007
@@ -0,0 +1,31 @@
+<div class="spaceborder">
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="99%">
+<tr class="header"><td colspan="2"><a
href="my.php?item=buytrades&filter=trading">{lang my_trade_view_buy}</a></td></tr>
+
+ <tr class="altbg1">
+ <td>{lang my_trade_success_count}: $buystats[totalitems]</td>
+ <td>{lang my_trade_success_amount}: $buystats[tradesum] {lang payment_unit}</td>
+ </tr>
+
+ <tr class="altbg1"><td colspan="2">{lang my_trade_noexist_buy}</td></tr>
+
+
+ <tr><td colspan="2" class="altbg2"><a
href="my.php?item=buytrades&filter=attention">{lang my_trade_need_attend_buy}</a></td></tr>
+
+</table></div>
+<br>
+<div class="spaceborder">
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr class="header"><td colspan="2"><a
href="my.php?item=selltrades&filter=trading">{lang my_trade_view_sell}</a></td></tr>
+
+ <tr class="altbg1">
+ <td>{lang my_trade_success_count}: $sellstats[totalitems]</td>
+ <td>{lang my_trade_success_amount}: $sellstats[tradesum] {lang payment_unit}</td>
+ </tr>
+
+ <tr class="altbg1"><td colspan="2">{lang my_trade_noexist_sell}</td></tr>
+
+
+ <tr><td colspan="2" class="altbg2"><a
href="my.php?item=selltrades&filter=attention">{lang my_trade_need_attend_sell}</a></td></tr>
+
+</table></div>
\ No newline at end of file

Added: trunk/upload/templates/babel/my_tradethreads.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/my_tradethreads.htm Sat Dec 29
05:44:57 2007
@@ -0,0 +1,27 @@
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}" width="100%">
+<tr><td class="header" colspan="6">{lang my_trade_view_thread}</td></tr>
+<tr class="category">
+<td width="35%">{lang subject}</td>
+<td width="10%" align="center">{lang my_trade_show}</td>
+<td width="10%" align="center">{lang my_trade_sale_quantity}</td>
+<td width="10%" align="center">{lang my_trade_stock_quantity}</td>
+<td width="10%" align="center">{lang my_trade_amount_all}</td>
+<td width="25%">{lang my_trade_last}</td>
+</tr>
+
+ 
+ <tr class="row" onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td class="subject"><a
href="viewthread.php?tid=$thread[tid]"
target="_blank">$thread[subject]</a>$thread[subject]
({lang
delete_wait})({lang audit_wait})</td>
+ <td align="center"><a href="my.php?item=selltrades&tid=$thread[tid]"
target="_blank">{lang enter}</a></td>
+ <td align="center">$thread[totalitems]</td>
+ <td align="center">$thread[amount]</td>
+ <td align="center">$thread[tradesum]</td>
+ <td><a
href="redirect.php?tid=$thread[tid]&goto=lastpost#lastpost">$thread[lastupdate]</a>
by <a href="space.php?username=$thread[lastbuyer]" target="_blank">$thread[lastbuyer]</a> </td>
+ </tr>
+ 
+
+ <tr><td colspan="6" class="altbg1 bottom">{lang forum_nothreads}</td></tr>
+
+</table>
+
+<div class="subtable" style="margin-top: {TABLESPACE}px">$multipage</div>

Modified: trunk/upload/templates/babel/now.htm
==============================================================================
--- trunk/upload/templates/babel/now.htm (original)
+++ trunk/upload/templates/babel/now.htm Sat Dec 29 05:44:57 2007
@@ -139,10 +139,13 @@



+




+
+
<div style="min-width:
500px;background-image:url($message[iconshow]);" class="entry_$thisbg">
<a href="$bbsdir/now-$message[vid].html" target="_blank">
<img src="$bbsdir/$message[avatar]" align="absmiddle"
alt="$message[author]" width="32" height="32" class="portrait"
border="0" /></a>

Modified: trunk/upload/templates/babel/now_wap.htm
==============================================================================
--- trunk/upload/templates/babel/now_wap.htm (original)
+++ trunk/upload/templates/babel/now_wap.htm Sat Dec 29 05:44:57 2007
@@ -59,6 +59,9 @@



+
+
+
<div class="content"><a href="$bbsdir/now/$messagen[author]"
style="color:#577DE7"><strong>$message[author]</strong></a>
$message[iconshow] $message[content]</div>
<div class="author"><small>$message[dateline]  from
$message[background] | <a href="$bbsdir/del/now/$message[vid]">del</a></small></div>

Modified: trunk/upload/templates/babel/post_newreply.htm
==============================================================================
--- trunk/upload/templates/babel/post_newreply.htm (original)
+++ trunk/upload/templates/babel/post_newreply.htm Sat Dec 29 05:44:57 2007
@@ -1,7 +1,7 @@
{template header}

<div class="subtable nav" style="width: {TABLEWIDTH}">
-<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$indexname">$bbname</a> $navigation »
{lang post_newreply}
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$bbsdir/$indexname">$bbname</a> $navigation
» {lang post_newreply}
</div></div>

Modified: trunk/upload/templates/babel/post_newthread.htm
==============================================================================
--- trunk/upload/templates/babel/post_newthread.htm (original)
+++ trunk/upload/templates/babel/post_newthread.htm Sat Dec 29 05:44:57 2007
@@ -1,7 +1,7 @@
{template header}

<div class="subtable nav" style="width: {TABLEWIDTH}">
-<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$indexname">$bbname</a> $navigation »
{lang post_newthread}
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$bbsdir/$indexname">$bbname</a> $navigation
» {lang post_newthread}
</div>
</div>

Modified: trunk/upload/viewthread.php
==============================================================================
--- trunk/upload/viewthread.php (original)
+++ trunk/upload/viewthread.php Sat Dec 29 05:44:57 2007
@@ -226,7 +226,9 @@
}

$multipage = multi($thread['replies'] + 1, $ppp, $page, "viewthread.php?tid=$tid&extra=$extra".(isset($highlight) ? "&highlight=".rawurlencode($highlight) : ''));
-
+
+ $touch_multipage = now_multi($thread['replies'] + 1, $ppp, $page, "view-$tid-",'0','10','1','','.html');
+
if($thread['special'] > 0) {
include_once DISCUZ_ROOT.'./include/special.inc.php';
}
@@ -325,15 +327,10 @@
if($_DCACHE['usergroups'][$post['groupid']]['groupavatar']) {
$post['avatar'] = '<img
src="'.$_DCACHE['usergroups'][$post['groupid']]['groupavatar'].'"
border="0" alt="" />';
} elseif($_DCACHE['usergroups'][$post['groupid']]['allowavatar']
&& $post['avatar']) {
- $post['nmavatar']=$post['avatar'];
-
- if (preg_match("/^(customavatars\/.+?)$/i",$post['nmavatar'])) {
- $post['nmavatar']=str_replace("customavatars/",$bbsdir."/customavatars/m/",$post['nmavatar']);
- }elseif
(preg_match("/^(images\/avatars\/.+?)$/i",$post['nmavatar'])) {
- $post['nmavatar']=str_replace("images/avatars/",$bbsdir."/images/avatars/m/",$post['nmavatar']);
- }else{
- $post['nmavatar']="/bbs/images/common/nohead_m.gif";
- }
+ $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 {
@@ -483,11 +480,15 @@
}
}

- if ($dashboard == '1'){
+/* Parasy || S: ThreadTPL */
+ if ($app == 'dashboard') {
include template('dashboard_topic');
+ } elseif ($app == 'touch') {
+ include template('touch_view');
} else {
include template($iscircle && empty($frombbs) ? 'supesite_viewthread' : 'viewthread');
}
+/* Parasy || E: ThreadTPL */

} elseif($action == 'printable' && $tid) {

Reply all

Reply to author

Forward

0 new messages