Modified:
trunk/upload/.htaccess
trunk/upload/include/global.func.php
trunk/upload/include/javascript/home_tabs.js
trunk/upload/index.php
trunk/upload/installer.php
trunk/upload/parasy/ParasyCore.php
trunk/upload/parasy/ParasySettings.inc.php
trunk/upload/parasy_geo.php
trunk/upload/parasy_operation.php
trunk/upload/plugins/parasy/now.inc.php
trunk/upload/templates/babel/dashboard.htm
trunk/upload/templates/babel/dashboard_timeline.htm
trunk/upload/templates/babel/dashboard_topic.htm
trunk/upload/templates/babel/discuz.htm
trunk/upload/templates/babel/feed_nowhere.htm
trunk/upload/templates/babel/geo_home.htm
trunk/upload/templates/babel/header.htm
trunk/upload/templates/babel/i_avatar.htm
trunk/upload/templates/babel/i_fav.htm
trunk/upload/templates/babel/memcp_profile.htm
trunk/upload/templates/babel/mobile_view.htm
trunk/upload/templates/babel/new_features.htm
trunk/upload/templates/babel/now.htm
trunk/upload/templates/babel/now_im.htm
trunk/upload/templates/babel/now_stats.htm
trunk/upload/templates/babel/now_view.htm
trunk/upload/templates/babel/now_wap.htm
trunk/upload/templates/babel/pmprompt.htm
trunk/upload/templates/babel/section.htm
trunk/upload/templates/babel/tod.htm
trunk/upload/templates/babel/topic.htm
trunk/upload/templates/babel/viewpro_classic.htm
trunk/upload/templates/babel/viewthread.htm
trunk/upload/viewpro.php
Log:
New user home page url
CDN supported
Installer Updated
nwICONS() merged
Modified: trunk/upload/.htaccess
==============================================================================
--- trunk/upload/.htaccess (original)
+++ trunk/upload/.htaccess Sun Mar 23 02:41:55 2008
@@ -21,12 +21,12 @@
RewriteRule ^u-([0-9]+)\.html$ viewpro.php?uid=$1 [L]
RewriteRule ^user-(.+)\.html$ viewpro.php?username=$1 [L]
-RewriteRule ^u/(.*)$ viewpro.php?uid=$1 [L]
+RewriteRule ^u/(.*)$ viewpro.php?username=$1 [L]
+RewriteRule ^uid/([0-9]+)$ viewpro.php?uid=$1 [L]
RewriteRule ^thread/([0-9]+)/([0-9]+)/([0-9]+)$ viewthread.php?tid=$1&extra=page\%3D$3&page=$2 [L]
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 ^u/(username|uid)/(.*)$ viewpro.php?$1=$2 [L]
RewriteRule ^go/([a-zA-Z0-9\-]+)$ forumdisplay.php?name=$1 [L]
RewriteRule ^go/([a-zA-Z0-9\-]+)/$ forumdisplay.php?name=$1 [L]
Modified: trunk/upload/include/global.func.php
==============================================================================
--- trunk/upload/include/global.func.php (original)
+++ trunk/upload/include/global.func.php Sun Mar 23 02:41:55 2008
@@ -490,13 +490,13 @@
function rewrite_profile($uid, $username, $extra = '') {
global $bbsdir;
//return '<a href="profile-'.($uid ? 'uid-'.$uid : 'username-'.$username).'.html"'.stripslashes($extra).'>';
- return '<a href="'.$bbsdir.'/'.($uid ? 'u-'.$uid : 'user-'.$username).'.html"'.stripslashes($extra).'>';
+ return '<a href="'.$bbsdir.'/'.($uid ? 'uid/'.$uid : 'u/'.$username).'"'.stripslashes($extra).'>';
}
function rewrite_space($uid, $username, $extra = '') {
global $bbsdir;
//return '<a href="space-'.($uid ? 'uid-'.$uid : 'username-'.$username).'.html"'.stripslashes($extra).'>';
- return '<a href="'.$bbsdir.'/'.($uid ? 'u-'.$uid : 'user-'.$username).'.html"'.stripslashes($extra).'>';
+ return '<a href="'.$bbsdir.'/'.($uid ? 'uid/'.$uid : 'u/'.$username).'"'.stripslashes($extra).'>';
}
function periodscheck($periods, $showmessage = 1) {
Modified: trunk/upload/include/javascript/home_tabs.js
==============================================================================
--- trunk/upload/include/javascript/home_tabs.js (original)
+++ trunk/upload/include/javascript/home_tabs.js Sun Mar 23 02:41:55 2008
@@ -62,7 +62,7 @@
}
var getHomeTabLatest = function() {
- url = BBSDIR +"/json/home/tab/latest";
+ url = "/bbs/json/home/tab/latest";
loadXML(url, cbGetHomeTabLatest);
}
@@ -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 + '/user-' + data[id].author_en + '.html" 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 + '/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>';
}
_c = getObj("home_tab_content");
_c.innerHTML = _o;
@@ -133,7 +133,7 @@
}
var getNowLatest = function() {
- url = BBSDIR +"/json/now/latest";
+ url = "/bbs/json/now/latest";
loadXML(url, cbGetNowLatest);
}
Modified: trunk/upload/index.php
==============================================================================
--- trunk/upload/index.php (original)
+++ trunk/upload/index.php Sun Mar 23 02:41:55 2008
@@ -82,7 +82,7 @@
$query = $db->query("SELECT svp_id FROM {$tablepre}savepoint WHERE svp_uid = {$discuz_uid}");
$svp_count = mysql_num_rows($query);
if ($svp_count == 0 ){
- $svp_o = '<span class="tip_i">��û������Լ������Ͼݵ㣿���� [ <a href="'.$bbsdir.'/u-'.$discuz_uid.'.html#svp">���һ��</a> ] �ɣ��ø����֪�������վ��</span>';
+ $svp_o = '<span class="tip_i">��û������Լ������Ͼݵ㣿���� [ <a href="'.$bbsdir.'/uid/'.$discuz_uid.'#svp">���һ��</a> ] �ɣ��ø����֪�������վ��</span>';
} else {
$query = $db->query("SELECT svp.*,m.username FROM {$tablepre}savepoint svp
LEFT JOIN {$tablepre}buddys b ON b.buddyid=svp.svp_uid
@@ -93,7 +93,7 @@
$svp_o ='';
} else {
$svp = $db->fetch_array($query);
- $svp_o = '<span class="tip">��������������� [ <small><a href="'.$bbsdir.'/user-' . urlencode($svp['username']) . '.html">' . $svp['username']. '</a></small> ] �� [ <small><a href="http://' . $svp['svp_url'] . '" target="_blank" re="nofollow external">http://' . cutstr($svp['svp_url'], 40) . '</a></small> ] ����Ȥ�ɣ�</span>';
+ $svp_o = '<span class="tip">��������������� [ <small><a href="'.$bbsdir.'/uid/' . urlencode($svp['svp_uid']) . '">' . $svp['username']. '</a></small> ] �� [ <small><a href="http://' . $svp['svp_url'] . '" target="_blank" re="nofollow external">http://' . cutstr($svp['svp_url'], 40) . '</a></small> ] ����Ȥ�ɣ�</span>';
}
}
}
Modified: trunk/upload/installer.php
==============================================================================
--- trunk/upload/installer.php (original)
+++ trunk/upload/installer.php Sun Mar 23 02:41:55 2008
@@ -441,14 +441,17 @@
runquery($sql);
runquery($extrasql);
- alter_query('forums','board_name','ALTER TABLE `cdb_forums` ADD `board_name` char(50) NOT NULL;');
- alter_query('forums','idx_push',"ALTER TABLE `cdb_forums` ADD `idx_push` tinyint(1) NOT NULL default '0';");
- alter_query('favorites','dateline',"ALTER TABLE `cdb_favorites` ADD `dateline` int(10) NOT NULL;");
+ alter_query('forums','board_name','ALTER TABLE `'.$tablepre.'forums` ADD `board_name` char(50) NOT NULL;');
+ alter_query('forums','idx_push',"ALTER TABLE `".$tablepre."forums` ADD `idx_push` tinyint(1) NOT NULL default '0';");
+ alter_query('favorites','dateline',"ALTER TABLE `".$tablepre."favorites` ADD `dateline` int(10) NOT NULL;");
- alter_query('members','now_img',"ALTER TABLE `cdb_members` ADD `now_img` mediumint(10) NOT NULL default '0';");
- alter_query('members','idx_cloud',"ALTER TABLE `cdb_members` ADD `idx_cloud` tinyint(1) NOT NULL default '0';");
- alter_query('members','usr_geo',"ALTER TABLE `cdb_members` ADD `usr_geo` varchar(100) NOT NULL default 'earth';");
- alter_query('members','side_buddy',"ALTER TABLE `cdb_members` ADD `side_buddy` TINYINT( 1 ) NOT NULL DEFAULT '0';");
+ alter_query('members','now_img',"ALTER TABLE `".$tablepre."members` ADD `now_img` mediumint(10) NOT NULL default '0';");
+ alter_query('members','idx_cloud',"ALTER TABLE `".$tablepre."members` ADD `idx_cloud` tinyint(1) NOT NULL default '0';");
+ alter_query('members','usr_geo',"ALTER TABLE `".$tablepre."members` ADD `usr_geo` varchar(100) NOT NULL default 'earth';");
+ alter_query('members','side_buddy',"ALTER TABLE `".$tablepre."members` ADD `side_buddy` TINYINT( 1 ) NOT NULL DEFAULT '0';");
+ alter_query('memberfields','hits',"ALTER TABLE `".$tablepre."memberfields` ADD `hits` INT( 10 ) NOT NULL DEFAULT '0';");
+
+
$yearmonth = date('Ym_', time());
@@ -511,7 +514,7 @@
showjsmessage('���� Parasy ������ ...styleid_'.$parasy_style_id.'...�ɹ�');
$db->query("UPDATE `{$tablepre}settings` SET `value` = '".$parasy_style_id."' WHERE variable = 'styleid' LIMIT 1 ");
showjsmessage('����Ĭ�Ϸ��Ϊ ...styleid_'.$parasy_style_id.'...�ɹ�');
- $db->query("INSERT INTO `cdb_stylevars` (`styleid`, `variable`, `substitute`) VALUES (".$parasy_style_id.", 'available', ''),(".$parasy_style_id.", 'bgcolor', '#F8F8FF'),(".$parasy_style_id.", 'altbg1', '#FFFFFF'),(".$parasy_style_id.", 'altbg2', '#FFFFFF'),(".$parasy_style_id.", 'link', '#404040'),(".$parasy_style_id.", 'bordercolor', '#E0E0E0'),(".$parasy_style_id.", 'innerbordercolor', '#FFFFFF'),(".$parasy_style_id.", 'headercolor', '#F7F7F7'),(".$parasy_style_id.", 'headertext', '#404040'),(".$parasy_style_id.", 'catcolor', '#FFFFEE'),(".$parasy_style_id.", 'tabletext', '#404040'),(".$parasy_style_id.", 'text', '#404040'),(".$parasy_style_id.", 'borderwidth', '1'),(".$parasy_style_id.", 'innerborderwidth', '1'),(".$parasy_style_id.", 'tablewidth', '98%'),(".$parasy_style_id.", 'tablespace', '2'),(".$parasy_style_id.", 'fontsize', '12px'),(".$parasy_style_id.", 'msgfontsize', '12px'),(".$parasy_style_id.", 'msgbigsize', '13px'),(".$parasy_style_id.", 'msgsmallsize', '11px'),(".$parasy_style_id.", 'font', 'Verdana, "Lucida Grande", "Lucida Sans", sans, Hei'),(".$parasy_style_id.", 'smfontsize', '11px'),(".$parasy_style_id.", 'smfont', '���ź�'),(".$parasy_style_id.", 'nobold', '0'),(".$parasy_style_id.", 'boardimg', 'logo.gif'),(".$parasy_style_id.", 'imgdir', '".$bbsdir."/images/way'),(".$parasy_style_id.", 'maintablewidth', '98%'),(".$parasy_style_id.", 'smdir', '".$_SERVER['HTTP_HOST'].$bbsdir."/images/smilies'),(".$parasy_style_id.", 'cattext', '#404040'),
+ $db->query("INSERT INTO `".$tablepre."stylevars` (`styleid`, `variable`, `substitute`) VALUES (".$parasy_style_id.", 'available', ''),(".$parasy_style_id.", 'bgcolor', '#F8F8FF'),(".$parasy_style_id.", 'altbg1', '#FFFFFF'),(".$parasy_style_id.", 'altbg2', '#FFFFFF'),(".$parasy_style_id.", 'link', '#404040'),(".$parasy_style_id.", 'bordercolor', '#E0E0E0'),(".$parasy_style_id.", 'innerbordercolor', '#FFFFFF'),(".$parasy_style_id.", 'headercolor', '#F7F7F7'),(".$parasy_style_id.", 'headertext', '#404040'),(".$parasy_style_id.", 'catcolor', '#FFFFEE'),(".$parasy_style_id.", 'tabletext', '#404040'),(".$parasy_style_id.", 'text', '#404040'),(".$parasy_style_id.", 'borderwidth', '1'),(".$parasy_style_id.", 'innerborderwidth', '1'),(".$parasy_style_id.", 'tablewidth', '98%'),(".$parasy_style_id.", 'tablespace', '2'),(".$parasy_style_id.", 'fontsize', '12px'),(".$parasy_style_id.", 'msgfontsize', '12px'),(".$parasy_style_id.", 'msgbigsize', '13px'),(".$parasy_style_id.", 'msgsmallsize', '11px'),(".$parasy_style_id.", 'font', 'Verdana, "Lucida Grande", "Lucida Sans", sans, Hei'),(".$parasy_style_id.", 'smfontsize', '11px'),(".$parasy_style_id.", 'smfont', '���ź�'),(".$parasy_style_id.", 'nobold', '0'),(".$parasy_style_id.", 'boardimg', 'logo.gif'),(".$parasy_style_id.", 'imgdir', '".$bbsdir."/images/way'),(".$parasy_style_id.", 'maintablewidth', '98%'),(".$parasy_style_id.", 'smdir', '".$_SERVER['HTTP_HOST'].$bbsdir."/images/smilies'),(".$parasy_style_id.", 'cattext', '#404040'),
(".$parasy_style_id.", 'menubg', '#FFF'),(".$parasy_style_id.", 'bgborder', '#FFFFFF'),(".$parasy_style_id.", 'catborder', '#FFFFFF'),(".$parasy_style_id.", 'inputborder', '#E0E0E0'),(".$parasy_style_id.", 'lighttext', '#404040'),(".$parasy_style_id.", 'mainborder', ''),(".$parasy_style_id.", 'headermenu', '#FDFFF2'),(".$parasy_style_id.", 'postnoticebg', '#F3F8D7'),
(".$parasy_style_id.", 'msgheader', '#F3F8D7'),(".$parasy_style_id.", 'msgheadertext', '#000000'),(".$parasy_style_id.", 'msgtext', '#FDFFF2'),(".$parasy_style_id.", 'headermenutext', '#F3F8D7'),(".$parasy_style_id.", 'navtext', ''),(".$parasy_style_id.", 'menuhltext', '#FFF'),(".$parasy_style_id.", 'menuhlbg', '#667'),(".$parasy_style_id.", 'menutext', '#000'),(".$parasy_style_id.", 'calendarexpire', '#999999'),(".$parasy_style_id.", 'calendartext', '#000000'),(".$parasy_style_id.", 'calendarchecked', '#FF0000'),(".$parasy_style_id.", 'calendartoday', '#00BB00'),(".$parasy_style_id.", 'framebg', ''),(".$parasy_style_id.", 'framebgcolor', ''),(".$parasy_style_id.", 'frameswitch', '');");
}
@@ -572,6 +575,8 @@
$db->query("UPDATE `{$tablepre}settings` SET `value` = '0' WHERE variable = 'spacestatus' LIMIT 1");
showjsmessage('���� Parasy �û�������ҳ ...�ɹ�');
+ $db->query("UPDATE `{$tablepre}settings` SET `value` = '3' WHERE variable = 'rewritestatus' LIMIT 1");
+ showjsmessage('���� Parasy URL��̬�� ...�ɹ�');
echo '<script type="text/javascript">document.getElementById("laststep").disabled = false; </script>'."\r\n";
echo '<script type="text/javascript">document.getElementById("laststep").value = \'��һ��\'; </script>'."\r\n";
Modified: trunk/upload/parasy/ParasyCore.php
==============================================================================
--- trunk/upload/parasy/ParasyCore.php (original)
+++ trunk/upload/parasy/ParasyCore.php Sun Mar 23 02:41:55 2008
@@ -330,23 +330,28 @@
return $source;
}
-function nwICONS($source = 0){
+function nwICONS($source = 0, $type='pic'){
global $bbsdir;
- $icons = array(0 => '', 1 => 'straitjacket', 2 => 'book', 3 => 'song', 4 => 'tv', 5 => 'computing', 6 => 'eat', 7 => 'home', 8 => 'hurry', 9 => 'morning', 10 => 'sleep', 11 => 'football', 12 => 'happy', 13 => 'love', 14 => 'pils', 15 => 'shop', 16 => 'game', 17 => 'makeup', 18 => 'icecream',19 => 'coffee',20 => 'beer',21 => 'toiletpaper',22 => 'bus',23 => 'car',24 => 'bomb',25 => 'taxi',26 => 'train',27 => 'strom',28 => 'toilet', 29 => 'ballon', 30 => 'bike', 31 => 'wallclock',99 => 'computing');
- return $bbsdir.'/images/now/icons/web-'.$icons[$source].'.gif';
-}
-
-function nwtextICONS($source = 0){
- $icons = array(0 => '', 1 => '[THINKING]', 2 => '[READING]', 3 => '[LISTENING]', 4 => '[WATCHING]', 5 => '[COMPUTING]', 6 => '[EATING]', 7 => '[HOME]', 8 => '[HURRY]', 9 => '[MORNING]', 10 => '[SLEEP]', 11 => '[WALKING]', 12 => '[HAPPY]', 13 => '[LOVE]', 14 => '[Pils]', 15 => '[SHOPPING]', 16 => '[GAME]', 17 => '[MAKEUP]', 18 => '[ICECREAM]',19 => '[COFFEE]',20 => '[BEER]',21 => '[FLIGHT]',22 => '[BUS]',23 => '[CAR]',24 => '[BOMB]',25 => '[TAXI]',26 => '[TRAIN]',27 => '[STROM]',28 => '[TOILET]', 29 => '[BALLON]', 30 => '[BIKE]', 31 => '[ToDo]',99 => '[NEW FEATURE]');
- return '<span style="color:#0BAFEF">'.$icons[$source].'</span>';
-}
-
-function nwxmlICONS($source = 0){
- $icons = array(0 => '', 1 => 'THINKING', 2 => 'READING', 3 => 'LISTENING', 4 => 'WATCHING', 5 => 'COMPUTING', 6 => 'EATING', 7 => 'HOME', 8 => 'HURRY', 9 => 'MORNING', 10 => 'SLEEP', 11 => 'WALKING', 12 => 'HAPPY', 13 => 'LOVE', 14 => 'Pils', 15 => 'SHOPPING', 16 => 'GAME', 17 => 'MAKEUP', 18 => 'ICECREAM',19 => 'COFFEE',20 => 'BEER',21 => 'FLIGHT',22 => 'BUS',23 => 'CAR',24 => 'BOMB',25 => 'TAXI',26 => 'TRAIN',27 => 'STROM',28 => 'TOILET', 29 => 'BALLON', 30 => 'BIKE', 31 => 'ToDo',99 => 'NEW FEATURE');
- return $icons[$source];
+ $icons = array(
+ 'PIC' => array(0 => '', 1 => 'straitjacket', 2 => 'book', 3 => 'song', 4 => 'tv', 5 => 'computing', 6 => 'eat', 7 => 'home', 8 => 'hurry', 9 => 'morning', 10 => 'sleep', 11 => 'football', 12 => 'happy', 13 => 'love', 14 => 'pils', 15 => 'shop', 16 => 'game', 17 => 'makeup', 18 => 'icecream',19 => 'coffee',20 => 'beer',21 => 'toiletpaper',22 => 'bus',23 => 'car',24 => 'bomb',25 => 'taxi',26 => 'train',27 => 'strom',28 => 'toilet', 29 => 'ballon', 30 => 'bike', 31 => 'wallclock',99 => 'computing'),
+ 'TEXT' => array(0 => '', 1 => 'THINKING', 2 => 'READING', 3 => 'LISTENING', 4 => 'WATCHING', 5 => 'COMPUTING', 6 => 'EATING', 7 => 'HOME', 8 => 'HURRY', 9 => 'MORNING', 10 => 'SLEEP', 11 => 'WALKING', 12 => 'HAPPY', 13 => 'LOVE', 14 => 'Pils', 15 => 'SHOPPING', 16 => 'GAME', 17 => 'MAKEUP', 18 => 'ICECREAM',19 => 'COFFEE',20 => 'BEER',21 => 'FLIGHT',22 => 'BUS',23 => 'CAR',24 => 'BOMB',25 => 'TAXI',26 => 'TRAIN',27 => 'STROM',28 => 'TOILET', 29 => 'BALLON', 30 => 'BIKE', 31 => 'ToDo',99 => 'NEW FEATURE'),
+
+ );
+ if ($source != 0) {
+ if ($type == 'pic') {
+ return $bbsdir.'/images/now/icons/web-'.$icons['PIC'][$source].'.gif';
+ } elseif ($type=='text') {
+ return '<span style="color:#0BAFEF">['.$icons['TEXT'][$source].']</span>';
+ } elseif ($type =='xml') {
+ return $icons['TEXT'][$source];
+ } else {
+ return $bbsdir.'/images/now/icons/web-'.$icons['PIC'][$source].'.gif';
+ }
+ } else {
+ return false;
+ }
}
-
function navforum($groupselectable = FALSE, $tableformat = 0) {
global $_DCACHE, $discuz_uid, $groupid, $fid, $gid, $indexname,$bbsdir;
@@ -514,7 +519,7 @@
function rand_avatars() {
global $db, $_DCACHE, $timestamp, $tablepre, $discuz_uid, $member;
$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 !='' ORDER BY rand() LIMIT 20");
+ $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");
while($avatar = $db->fetch_array($query_avatar)) {
$data['avatar_show'][$avatar[uid]]['uid'] = $avatar['uid'];
$data['avatar_show'][$avatar[uid]]['name'] = $avatar['username'];
@@ -615,12 +620,11 @@
function forum_pic($fid){
global $bbsdir;
$forum_pic_dir = './images/m_pic/'.$fid.'.jpg';
- /*if ($_SERVER[HTTP_HOST]=='127.0.0.1'){
+ if ($_SERVER[HTTP_HOST]=='127.0.0.1' || $_SERVER[HTTP_HOST]=='localhost' || !CDN_FORUM_PIC){
$cdn_dir= $bbsdir.'/images/m_pic/';
} else {
- $cdn_dir='http://www.proofer.cn/sai/images/';
- }*/
- $cdn_dir= $bbsdir.'/images/m_pic/';
+ $cdn_dir= CDN_FORUM_PIC.'/';
+ }
if (file_exists($forum_pic_dir)) {
$forum_pic = $cdn_dir.''.$fid.'.jpg';
} else {
Modified: trunk/upload/parasy/ParasySettings.inc.php
==============================================================================
--- trunk/upload/parasy/ParasySettings.inc.php (original)
+++ trunk/upload/parasy/ParasySettings.inc.php Sun Mar 23 02:41:55 2008
@@ -43,4 +43,7 @@
define('START_CERDIT', '1000');
define('PM_PRICE', '3');
+define('CDN_CSS', false);
+define('CDN_JS', '');
+define('CDN_FORUM_PIC', '');
?>
Modified: trunk/upload/parasy_geo.php
==============================================================================
--- trunk/upload/parasy_geo.php (original)
+++ trunk/upload/parasy_geo.php Sun Mar 23 02:41:55 2008
@@ -113,7 +113,7 @@
foreach ($geo_topic as $thread) {
$name_color = rand_color();
$thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
- echo('<div class="geo_home_entry_'.$thread['bg'].'"><img src="'.$bbsdir.'/'.$thread['avatar'].'" class="portrait" align="absmiddle" border="0" /> <a href="viewthread.php?tid='.$thread['tid'].'">'.$thread['subject'].'</a> <span class="tip_i">...</span> <a href="'.$bbsdir.'/u-'.$thread['authorid'].'.html" style="color:'.$name_color.'" class="var">'.$thread['author'].'</a></div>');
+ echo('<div class="geo_home_entry_'.$thread['bg'].'"><img src="'.$bbsdir.'/'.$thread['avatar'].'" class="portrait" align="absmiddle" border="0" /> <a href="viewthread.php?tid='.$thread['tid'].'">'.$thread['subject'].'</a> <span class="tip_i">...</span> <a href="'.$bbsdir.'/uid/'.$thread['authorid'].'" style="color:'.$name_color.'" class="var">'.$thread['author'].'</a></div>');
}
} else {
echo '<img src="'.IMGDIR.'/exclamation.png" alt="stats" align="absmiddle" /> '.$Geo->geo->name->cn.'�Ļ�Ա��û�з����ظ�������';
@@ -159,7 +159,7 @@
foreach ($geo_now as $thread) {
$name_color = rand_color();
$thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
- echo('<div class="geo_home_entry_'.$thread['bg'].'"><img src="'.$bbsdir.'/'.$thread['avatar'].'" class="portrait" align="absmiddle" border="0" /> <a href="'.$bbsdir.'/now-'.$thread['vid'].'.html">'.$thread['content'].'</a> <span class="tip_i">...</span> <a href="'.$bbsdir.'/u-'.$thread['authorid'].'.html" style="color:'.$name_color.'" class="var">'.$thread['author'].'</a></div>');
+ echo('<div class="geo_home_entry_'.$thread['bg'].'"><img src="'.$bbsdir.'/'.$thread['avatar'].'" class="portrait" align="absmiddle" border="0" /> <a href="'.$bbsdir.'/now-'.$thread['vid'].'.html">'.$thread['content'].'</a> <span class="tip_i">...</span> <a href="'.$bbsdir.'/uid/'.$thread['authorid'].'" style="color:'.$name_color.'" class="var">'.$thread['author'].'</a></div>');
}
} else {
echo '<img src="'.IMGDIR.'/exclamation.png" alt="stats" align="absmiddle" /> '.$Geo->geo->name->cn.'�Ļ�Ա��û�и��¹�Nowhere';
Modified: trunk/upload/parasy_operation.php
==============================================================================
--- trunk/upload/parasy_operation.php (original)
+++ trunk/upload/parasy_operation.php Sun Mar 23 02:41:55 2008
@@ -21,7 +21,7 @@
if (isset($_POST['url'])){
$url = trim($_POST['url']);
if (strlen($url) == 0) {
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
if (substr(strtolower($url), 0, 7) == 'http://') {
$url = substr($url, 7, strlen($url) - 7);
@@ -34,12 +34,12 @@
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() ."')");
svp_update($discuz_uid);
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
} else {
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
} else {
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
}
}
@@ -53,12 +53,12 @@
if ($discuz_uid == $svp['svp_uid']) {
$query = $db->query("DELETE FROM {$tablepre}savepoint WHERE svp_id = {$savepoint_id} LIMIT 1");
svp_update($discuz_uid,1);
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
} else {
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
} else {
- dheader("Location: {$boardurl}u-".$discuz_uid.".html");
+ dheader("Location: {$boardurl}uid/".$discuz_uid);
}
}
}
Modified: trunk/upload/plugins/parasy/now.inc.php
==============================================================================
--- trunk/upload/plugins/parasy/now.inc.php (original)
+++ trunk/upload/plugins/parasy/now.inc.php Sun Mar 23 02:41:55 2008
@@ -533,7 +533,7 @@
if($item['icons']=='0'){
$now_icon ='';
} else {
- $now_icon ='['.nwxmlICONS($item['icons']).']';
+ $now_icon ='['.nwICONS($item['icons'],'xml').']';
}
}
header("Content-type: image/png");
Modified: trunk/upload/templates/babel/dashboard.htm
==============================================================================
--- trunk/upload/templates/babel/dashboard.htm (original)
+++ trunk/upload/templates/babel/dashboard.htm Sun Mar 23 02:41:55 2008
@@ -21,7 +21,7 @@
<body>
<div id="header">
<div id="top_right">
- <!--{if $discuz_uid}--><div class="hi">Hi,<a href="$bbsdir/u-$discuz_uid.html" class="white">$discuz_userss</a>!</div> <a href="$bbsdir/memcp.nnm" target="_self" class="white">�������</a> <!--{if $discuz_uid && in_array($adminid, array(1, 2, 3))}-->| <a href="$bbsdir/admincp.php" target="_blank" class="white">{lang admincp}</a> <!--{/if}-->|
+ <!--{if $discuz_uid}--><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> <!--{if $discuz_uid && in_array($adminid, array(1, 2, 3))}-->| <a href="$bbsdir/admincp.php" target="_blank" class="white">{lang admincp}</a> <!--{/if}-->|
<a href="$bbsdir/new_features.html" class="white">�¹���!</a> | <a href="$bbsdir/logout-{FORMHASH}.nnm" class="white" target="_self">�dz�</a><!--{loop $extcredits $id $credit}--> | <a href="#;" class="white"><small>$GLOBALS[extcredits.$id]</small>$credit[unit] $credit[title]</a><!--{/loop}--> <!--<a href="#;" class="white" title="����������ռ�ٷֱ�"><small>$percentmine %</small></a>-->
<!--{else}-->
<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><!--{/if}-->
@@ -76,7 +76,7 @@
<li><img src="{IMGDIR}/pico_message.gif" align="absmiddle" /> <a href="$bbsdir/pm.nnm" class="menu" target="_blank">�ҵ���Ϣ</a></li><!--{/if}-->
<li><img src="{IMGDIR}/pico_topics.gif" align="absmiddle" /> <a href="$bbsdir/mytopic-$discuz_uid.html" class="menu">�ҵ�����</a></li>
<!--{eval $discuz_userss_encode = rawurlencode($discuz_userss);}-->
- <li><img src="{IMGDIR}/house.png" align="absmiddle" /> <a href="$bbsdir/u-$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>
<!--{if $allowuseblog}--><li><img src="{IMGDIR}/pico_zen.gif" align="absmiddle"> <a href="http://blog.orzotl.com/?action_site_type_panel" class="menu">�ҵIJ�־</a></li><!--{/if}-->
<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>
Modified: trunk/upload/templates/babel/dashboard_timeline.htm
==============================================================================
--- trunk/upload/templates/babel/dashboard_timeline.htm (original)
+++ trunk/upload/templates/babel/dashboard_timeline.htm Sun Mar 23 02:41:55 2008
@@ -3,12 +3,12 @@
<!--{eval $stuff[time] = make_descriptive_time($stuff[time]);}-->
<div class="stuff">
<!--{if $stuff[type] == 'now'}-->
-<div class="head"><img src="$stuff[avatar]" class="portrait_r" alt="$stuff[author]" /><a href="$bbsdir/u-$stuff[uid].html" style="color: $color;" class="var"><strong>$stuff[author]</strong></a><span class="tip_i"> ...$stuff[time]˵:<span></div>
+<div class="head"><img src="$stuff[avatar]" class="portrait_r" alt="$stuff[author]" /><a href="$bbsdir/uid/$stuff[uid]" style="color: $color;" class="var"><strong>$stuff[author]</strong></a><span class="tip_i"> ...$stuff[time]˵:<span></div>
<div class="msg">$stuff[icons] <a href="$bbsdir/now-$stuff[id].html" title="Nowhere" rel="gb_page_center[800, 500]" class="var">$stuff[title]</a></div>
<!--{/if}-->
<!--{if $stuff[type] == 'topic'}-->
<!--{eval $board_color = rand_color();}-->
-<div class="head"><img src="$stuff[avatar]" class="portrait_r" alt="$stuff[author]" /><a href="$bbsdir/u-$stuff[uid].html" style="color: $color;" class="var"><strong>$stuff[author]</strong></a><span class="tip_i"> ...$stuff[time]�� <a href="$bbsdir/go/$stuff[board_name]" style="color: $board_color;" class="var"><strong>$stuff[name]</strong></a> ������������:<span></div>
+<div class="head"><img src="$stuff[avatar]" class="portrait_r" alt="$stuff[author]" /><a href="$bbsdir/uid/$stuff[uid]" style="color: $color;" class="var"><strong>$stuff[author]</strong></a><span class="tip_i"> ...$stuff[time]�� <a href="$bbsdir/go/$stuff[board_name]" style="color: $board_color;" class="var"><strong>$stuff[name]</strong></a> ������������:<span></div>
<div class="msg"><a href="$bbsdir/topic-dashboard-$stuff[id].html" onclick="return GB_showPage('$stuff[clean_title]', this.href)" style="font-size:$stuff[size]" class="var">$stuff[title]</a></div>
<!--{/if}-->
</div>
Modified: trunk/upload/templates/babel/dashboard_topic.htm
==============================================================================
--- trunk/upload/templates/babel/dashboard_topic.htm (original)
+++ trunk/upload/templates/babel/dashboard_topic.htm Sun Mar 23 02:41:55 2008
@@ -160,11 +160,11 @@
<!--{eval $topic_color = rand_color();}-->
<div class="$post[v2bg]">
<span style="color: $topic_color;">
- <!--{if $post['avatar']}--><img src="$post[nmavatar]" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /> <!--{else}--><img src="$bbsdir/images/avatars/noavatar.gif" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /><!--{/if}--> $post[number] ¥ <a href="$bbsdir/u-$post[authorid].html">$post[author]</a>
+ <!--{if $post['avatar']}--><img src="$post[nmavatar]" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /> <!--{else}--><img src="$bbsdir/images/avatars/noavatar.gif" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /><!--{/if}--> $post[number] ¥ <a href="$bbsdir/uid/$post[authorid]">$post[author]</a>
<!--{else}-->
<!--{eval $topic_color = rand_color();}-->
<div class="$post[v2bg]"><span style="color: $topic_color;">
-<img src="$bbsdir/images/avatars/noavatar.gif" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /> $post[number] ¥ <!--{if !$post['authorid']}-->{lang guest} <small>$post[useip]</small>{lang unregistered}<!--{elseif $post['authorid'] && $post['username'] && $post['anonymous']}--><!--{if $forum['ismoderator']}--><a href="$bbsdir/viewpro.php?uid=$post[authorid]" target="_blank">{lang anonymous}��ʿ</a><!--{else}-->{lang anonymous}��ʿ<!--{/if}--> {lang member_anonymous}<!--{else}--><a href="$bbsdir/u-$post[authorid].html">$post[author]</a>{lang member_deleted}<!--{/if}--> <!--{/if}-->@ $post[dateline]<!--{if $post['subject']}--> ˵��$post[subject]<!--{/if}--></span>$post[newpostanchor] $post[lastpostanchor]
+<img src="$bbsdir/images/avatars/noavatar.gif" width="32" height="32" align="absmiddle" style="border-left: 2px solid $topic_color; padding: 0px 5px 0px 5px;" /> $post[number] ¥ <!--{if !$post['authorid']}-->{lang guest} <small>$post[useip]</small>{lang unregistered}<!--{elseif $post['authorid'] && $post['username'] && $post['anonymous']}--><!--{if $forum['ismoderator']}--><a href="$bbsdir/viewpro.php?uid=$post[authorid]" target="_blank">{lang anonymous}��ʿ</a><!--{else}-->{lang anonymous}��ʿ<!--{/if}--> {lang member_anonymous}<!--{else}--><a href="$bbsdir/uid/$post[authorid]">$post[author]</a>{lang member_deleted}<!--{/if}--> <!--{/if}-->@ $post[dateline]<!--{if $post['subject']}--> ˵��$post[subject]<!--{/if}--></span>$post[newpostanchor] $post[lastpostanchor]
<!--{if $discuz_uid}--><small>[
<!--{if $forum['ismoderator'] || $post['authorid'] == $discuz_uid}--><a href="$bbsdir/edit-$fid-$tid-$post[pid]-$page.html">�༭</a> |<!--{/if}-->
<!--{if $allowpostreply}--><a href="$bbsdir/quote-$fid-$tid-$post[pid]-$page.html">����</a><!--{/if}-->
Modified: trunk/upload/templates/babel/discuz.htm
==============================================================================
--- trunk/upload/templates/babel/discuz.htm (original)
+++ trunk/upload/templates/babel/discuz.htm Sun Mar 23 02:41:55 2008
@@ -16,7 +16,7 @@
<!--{eval $color = rand_color();}-->
<!--{eval $i_commend ++;}-->
<!--{if $i_commend < 2}-->
-<h1 class="ititle"><img src="$bbsdir/$topic[avatar_s]" align="absmiddle" class="portrait" /> <a href="$bbsdir/thread-$topic[tid]-1-1.html" style="color: #363;" class="var">$topic[subject]...</a></h1><span class="tip_i"> <hr size="1" color="#EEE" style="color: #EEE; background-color: #EEE; height: 1px; border: 0;" />... <a href="$bbsdir/redirect-$topic[tid].html#lastpost" class="t">$topic[replies] ƪ�ظ�</a> | <a href="$bbsdir/thread-$topic[tid]-1-1.html" class="t">��Ҫ��������</a> | ��������� <a href="$bbsdir/go/$topic[board_name]" class="t">$topic[name]</a> | <a href="$bbsdir/u-$topic[uid].html" class="t">$topic[author]</a> �ĸ�������</span></span>
+<h1 class="ititle"><img src="$bbsdir/$topic[avatar_s]" align="absmiddle" class="portrait" /> <a href="$bbsdir/thread-$topic[tid]-1-1.html" style="color: #363;" class="var">$topic[subject]...</a></h1><span class="tip_i"> <hr size="1" color="#EEE" style="color: #EEE; background-color: #EEE; height: 1px; border: 0;" />... <a href="$bbsdir/redirect-$topic[tid].html#lastpost" class="t">$topic[replies] ƪ�ظ�</a> | <a href="$bbsdir/thread-$topic[tid]-1-1.html" class="t">��Ҫ��������</a> | ��������� <a href="$bbsdir/go/$topic[board_name]" class="t">$topic[name]</a> | <a href="$bbsdir/uid/$topic[uid]" class="t">$topic[author]</a> �ĸ�������</span></span>
<!--{/if}-->
<!--{/loop}-->
</div>
@@ -113,7 +113,7 @@
<div class="maintable" align="left">
<img src="{IMGDIR}/pico_zen.gif" align="absmiddle" /> �������������־������
<table width="98%" cellpadding="0" cellspacing="0" border="0" class="fav">
- $_DCACHE[supe_updateitems]'
+ $_DCACHE[supe_updateitems]
</table>
</div>
<!--{/if}-->
@@ -160,7 +160,7 @@
<!--{if $key % 7 == 0}--></td></tr><tr><td width="15%" nowrap><!--{else}--></td><td width="15%" nowrap><!--{/if}-->
<img src="$bbsdir/images/common/$online[icon]" alt="" />
<!--{if $online['uid']}-->
- <a href="$bbsdir/space.php?uid=$online[uid]"
+ <a href="$bbsdir/uid/$online[uid]"
<!--{else}-->
<a href="$bbsdir/###"
<!--{/if}-->title="{lang time}: $online[lastactivity]{LF}
Modified: trunk/upload/templates/babel/feed_nowhere.htm
==============================================================================
--- trunk/upload/templates/babel/feed_nowhere.htm (original)
+++ trunk/upload/templates/babel/feed_nowhere.htm Sun Mar 23 02:41:55 2008
@@ -1,34 +1,34 @@
<rss version="2.0">
<channel>
<title>$title - Nowhere</title>
- <link>http://www.saicn.com/bbs/now</link>
+ <link>http://$_SERVER[HTTP_HOST]$bbsdir/now</link>
<description>Latest 15 items of Nowhere</description>
- <copyright>Copyright(C) ::NoName Magazine ������־</copyright>
+ <copyright>Copyright(C) $bbname</copyright>
<category>Technology</category>
<language>zh_cn</language>
<ttl>60</ttl>
<image>
- <url>http://www.saicn.com/bbs/images/way/rainbow.png</url>
- <title>������־::Nowhere</title>
- <link>http://www.saicn.com/bbs/now</link>
+ <url>http://$_SERVER[HTTP_HOST]$bbsdir/images/way/rainbow.png</url>
+ <title>Nowhere - $bbname</title>
+ <link>http://$_SERVER[HTTP_HOST]$bbsdir/now</link>
</image>
<!--{loop $_DCACHE['nowhere'] $message}-->
<!--{eval $message['gmttime'] = gmdate('r', $message[dateline]);}-->
-<!--{eval $message['dateline'] = make_descriptive_time($message[dateline]);}-->
+<!--{eval $message['dateline'] = gmdate('Y-m-d h:m:s',$message[dateline]);}-->
<!--{eval $message['avatar'] = avRESIZE($message['avatar'],'s');}-->
-<!--{eval $message['background'] = nwtextICONS($message['background']);}-->
+<!--{eval $message['background'] = nwICONS($message['background'],'xml');}-->
<!--{eval $i++;}-->
<!--{if $i <= 15}-->
<item>
<title>$message[author]: $message[content]</title>
- <link>http://www.saicn.com/bbs/now-$message[vid].html</link>
+ <link>http://$_SERVER[HTTP_HOST]$bbsdir/now-$message[vid].html</link>
<category>$message['background']</category>
<description>
- <img src="http://www.saicn.com/bbs/$message['avatar']" align="left" style="background-color: #FFF; padding: 2px; margin: 0px 5px 5px 0px; border: 1px solid #CCC;" />&nbsp;$message[author]:&nbsp;$message[content] - $message[dateline]
+ <img src="http://$_SERVER[HTTP_HOST]$bbsdir/$message['avatar']" align="left" style="background-color: #FFF; padding: 2px; margin: 0px 5px 5px 0px; border: 1px solid #CCC;" />&nbsp;$message[author]:&nbsp;$message[content] - $message[dateline]
</description>
<pubDate>$message[gmttime]</pubDate>
- <guid>http://www.saicn.com/bbs/now-$message[vid].html</guid>
+ <guid>http://$_SERVER[HTTP_HOST]$bbsdir/now-$message[vid].html</guid>
</item>
<!--{/loop}-->
<!--{/if}-->
Modified: trunk/upload/templates/babel/geo_home.htm
==============================================================================
--- trunk/upload/templates/babel/geo_home.htm (original)
+++ trunk/upload/templates/babel/geo_home.htm Sun Mar 23 02:41:55 2008
@@ -15,7 +15,7 @@
<!--{loop $geo_topic $thread}-->
<!--{eval $name_color = rand_color();}-->
<!--{eval $thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';}-->
-<div class="geo_home_entry_$thread[bg]"><img src="$bbsdir/$thread[avatar]" class="portrait" align="absmiddle" border="0" /> <a href="viewthread.php?tid=$thread[tid]">$thread[subject]</a> <span class="tip_i">...</span> <a href="$bbsdir/u-$thread[authorid].html" style="color:$name_color" class="var">$thread[author]</a></div>
+<div class="geo_home_entry_$thread[bg]"><img src="$bbsdir/$thread[avatar]" class="portrait" align="absmiddle" border="0" /> <a href="viewthread.php?tid=$thread[tid]">$thread[subject]</a> <span class="tip_i">...</span> <a href="$bbsdir/uid/$thread[authorid]" style="color:$name_color" class="var">$thread[author]</a></div>
<!--{/loop}-->
</div>
</td>
@@ -45,7 +45,7 @@
<!--{loop $geo_now $thread}-->
<!--{eval $name_color = rand_color();}-->
<!--{eval $thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';}-->
-<div class="geo_home_entry_$thread[bg]"><img src="$bbsdir/$thread[avatar]" class="portrait" align="absmiddle" border="0" /> <a href="$bbsdir/now-$thread[vid].html" target="_blank">$thread[content]</a><span class="tip_i"> ... <a href="$bbsdir/u-$thread[authorid].html" style="color: '$name_color'" class="var">$thread[author]</a></span></div>
+<div class="geo_home_entry_$thread[bg]"><img src="$bbsdir/$thread[avatar]" class="portrait" align="absmiddle" border="0" /> <a href="$bbsdir/now-$thread[vid].html" target="_blank">$thread[content]</a><span class="tip_i"> ... <a href="$bbsdir/uid/$thread[authorid]" style="color: '$name_color'" class="var">$thread[author]</a></span></div>
<!--{/loop}-->
</div>
</tr>
Modified: trunk/upload/templates/babel/header.htm
==============================================================================
--- trunk/upload/templates/babel/header.htm (original)
+++ trunk/upload/templates/babel/header.htm Sun Mar 23 02:41:55 2008
@@ -9,19 +9,28 @@
<link rel="archives" title="$bbname" href="{$boardurl}archiver/" />
$rsshead
$extrahead
-<!--{eval $css_babel = autoVer($bbsdir.'/templates/css/css_babel.css');}-->
-<!--{eval $css_extra = autoVer($bbsdir.'/templates/css/css_extra.css');}-->
+<!--{if CDN_CSS}-->
+ <!--{eval $css_babel = autoVer($bbsdir.'/templates/css/css_babel_cdn.css');}-->
+ <!--{eval $css_extra = autoVer($bbsdir.'/templates/css/css_extra_cdn.css');}-->
+<!--{else}-->
+ <!--{eval $css_babel = autoVer($bbsdir.'/templates/css/css_babel.css');}-->
+ <!--{eval $css_extra = autoVer($bbsdir.'/templates/css/css_extra.css');}-->
+<!--{/if}-->
+<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_babel" />
+<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_extra" />
+
+<!--{if CDN_JS}-->
+<script type="text/javascript" src="{CDN_JS}/common.js"></script>
+<script type="text/javascript" src="{CDN_JS}/menu.js"></script>
+<script type="text/javascript" src="{CDN_JS}/ajax.js"></script>
+<!--{else}-->
<!--{eval $js_common = autoVer($jsdir.'/common.js');}-->
<!--{eval $js_menu = autoVer($jsdir.'/menu.js');}-->
<!--{eval $js_ajax = autoVer($jsdir.'/ajax.js');}-->
-<!--{if $allowcsscache}-->
-<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_babel" />
-<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_extra" /><!--{else}-->
-<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_babel" />
-<link rel="stylesheet" type="text/css" href="$bbsdir/css/$css_extra" /><!--{/if}-->
<script type="text/javascript" src="$bbsdir/scripts/$js_common"></script>
<script type="text/javascript" src="$bbsdir/scripts/$js_menu"></script>
<script type="text/javascript" src="$bbsdir/scripts/$js_ajax"></script>
+<!--{/if}-->
<script type="text/javascript">var IMGDIR = '{IMGDIR}';var SMDIR = '{SMDIR}';var BBSDIR = '$bbsdir';</script>
</head>
<body onkeydown="if(event.keyCode==27) return false;">
@@ -38,7 +47,7 @@
<!--{eval $discuz_userss_encode = rawurlencode($discuz_userss);}-->
<div id="top_banner" style="background: url('{IMGDIR}/bg_$topbg.jpg');" align="left">
<div id="top_right">
- <!--{if $discuz_uid}--><div class="hi">Hi,<a href="$bbsdir/u-$discuz_uid.html" class="tr1">$discuz_userss</a>!</div> <a href="$bbsdir/memcp.nnm" target="_self" class="tr">�������</a> <!--{if $discuz_uid && in_array($adminid, array(1, 2, 3))}-->| <a href="$bbsdir/admincp.php" target="_blank" class="tr">{lang admincp}</a> <!--{/if}-->| <a href="$bbsdir/logout-{FORMHASH}.nnm" class="tr" target="_self">�dz�</a><!--{loop $extcredits $id $credit}--> | <a href="$bbsdir/expense/view.nnm" class="tr"><small>$GLOBALS[extcredits.$id]</small>$credit[unit] $credit[title]</a><!--{/loop}-->
+ <!--{if $discuz_uid}--><div class="hi">Hi,<a href="$bbsdir/uid/$discuz_uid" class="tr1">$discuz_userss</a>!</div> <a href="$bbsdir/memcp.nnm" target="_self" class="tr">�������</a> <!--{if $discuz_uid && in_array($adminid, array(1, 2, 3))}-->| <a href="$bbsdir/admincp.php" target="_blank" class="tr">{lang admincp}</a> <!--{/if}-->| <a href="$bbsdir/logout-{FORMHASH}.nnm" class="tr" target="_self">�dz�</a><!--{loop $extcredits $id $credit}--> | <a href="$bbsdir/expense/view.nnm" class="tr"><small>$GLOBALS[extcredits.$id]</small>$credit[unit] $credit[title]</a><!--{/loop}-->
<!--{else}-->
<a href="$bbsdir/login.nnm" class="tr">{lang login}</a> | <a href="$bbsdir/passwd.nnm" class="tr">�һ�����</a> | <a href="$bbsdir/signup.nnm" class="tr">ע��</a><!--{/if}-->
</div>
@@ -64,9 +73,9 @@
</li>
<!--{if $discuz_uid}-->
<li class="top">
- <a href="$bbsdir/u-$discuz_uid.html" class="top">�� $discuz_userss </a>
+ <a href="$bbsdir/uid/$discuz_uid" class="top">�� $discuz_userss </a>
<ul>
- <li><a href="$bbsdir/u-$discuz_uid.html" class="nav">��<img src="{IMGDIR}/house.png" align="absmiddle" /> �ҵ�������ҳ</a></li>
+ <li><a href="$bbsdir/uid/$discuz_uid" class="nav">��<img src="{IMGDIR}/house.png" align="absmiddle" /> �ҵ�������ҳ</a></li>
<li><a href="http://blog.orzotl.com/?action_site_type_panel" class="nav">��<img src="{IMGDIR}/pico_zen.gif" align="absmiddle"> �ҵIJ�־</a></li>
<!--{if PARASY_FEATURE_NOW}--><li><a href="$bbsdir/now/$discuz_userss_encode" class="nav">��<img src="{IMGDIR}/rainbow.png" align="absmiddle" /> Nowhere</a></li><!--{/if}-->
<!--{if PARASY_FEATURE_TOD}--><li><a href="$bbsdir/tod" class="nav">��<img src="{IMGDIR}/report_edit.png" align="absmiddle" /> Tod��y</a></li><!--{/if}-->
@@ -96,7 +105,7 @@
<ul class="menu">
<!--{if $maxpmnum}-->
<li><img src="{IMGDIR}/pico_message.gif" align="absmiddle" /> <a href="$bbsdir/pm.nnm" class="menu" target="_blank">�ҵ���Ϣ</a></li><!--{/if}-->
- <li><img src="{IMGDIR}/house.png" align="absmiddle" /> <a href="$bbsdir/u-$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_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">�ҵIJ�־</a></li>
<!--{if PARASY_FEATURE_NOW}--><li><img src="{IMGDIR}/rainbow.png" align="absmiddle" /> <a href="$bbsdir/now/$discuz_userss_encode" class="menu">Nowhere</a></li><!--{/if}-->
@@ -128,7 +137,7 @@
<hr class="board">
<!--{loop $buddy $buddy}-->
<!--{eval $buddy[friendavatar] = avRESIZE($buddy[friendavatar],'s');}-->
- <a href="$bbsdir/u-$buddy[buddyid].html" class="var" title="$buddy[username]"><img src="$bbsdir/$buddy[friendavatar]" alt="$buddy[username]" class="mp" /></a>
+ <a href="$bbsdir/uid/$buddy[buddyid]" class="var" title="$buddy[username]"><img src="$bbsdir/$buddy[friendavatar]" alt="$buddy[username]" class="mp" /></a>
<!--{/loop}-->
</div>
<!--{/if}-->
Modified: trunk/upload/templates/babel/i_avatar.htm
==============================================================================
--- trunk/upload/templates/babel/i_avatar.htm (original)
+++ trunk/upload/templates/babel/i_avatar.htm Sun Mar 23 02:41:55 2008
@@ -1,12 +1,16 @@
+<!--{if CDN_JS}-->
+<script type="text/javascript" src="{CDN_JS}/reflection.js"></script>
+<!--{else}-->
<!--{eval $js_reflection= autoVer($jsdir.'/reflection.js');}-->
<script type="text/javascript" src="$bbsdir/scripts/$js_reflection"></script>
+<!--{/if}-->
<div class="avatartable" 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>
<!--{loop $avatar_show $avatar}-->
<!--{eval $i_avatar ++;}-->
<!--{if $i_avatar < 7}-->
-<a href="$bbsdir/u-$avatar[uid].html" 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="reflect" width="75" height="75"><div class="tip">$avatar[name]</div></a>
<!--{/if}-->
<!--{/loop}-->
</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 Sun Mar 23 02:41:55 2008
@@ -9,11 +9,11 @@
<!--{eval $name_color = rand_color();}-->
<!--{eval $fav_i++;}-->
<!--{if $fav_i<= $show_num}-->
-<tr><td align="left"> <img src="$bbsdir/$fav[avatar]" alt="$fav[author]" align="absmiddle" height="16" width="16" class="portrait" /> <a href="user-$username_en.html" 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> �ղ���
<!--{if $fav['fid'] == 0}-->
���� <span class="tip_i">[ <a href="viewthread.php?tid=$fav[tid]" style="color: $name_color;" class="var">$fav[subject]</a>
<!--{else}-->
-��� <span class="tip_i">[ <a href="go/$fav[board_name]" style="color: $name_color;" class="var">$fav[name]</a>
+��� <span class="tip_i">[ <a href="$bbsdir/go/$fav[board_name]" style="color: $name_color;" class="var">$fav[name]</a>
<!--{/if}-->
] ... $favt[dateline]</span></td></tr>
<!--{/if}-->
Modified: trunk/upload/templates/babel/memcp_profile.htm
==============================================================================
--- trunk/upload/templates/babel/memcp_profile.htm (original)
+++ trunk/upload/templates/babel/memcp_profile.htm Sun Mar 23 02:41:55 2008
@@ -214,7 +214,7 @@
<tr>
<td width="200" align="right">���Ͼݵ�</td>
-<td ><a href="$bbsdir/u-$discuz_uid.html#svp" class="o">������</a></td>
+<td ><a href="$bbsdir/uid/$discuz_uid#svp" class="o">������</a></td>
</tr>
<tr>
Modified: trunk/upload/templates/babel/mobile_view.htm
==============================================================================
--- trunk/upload/templates/babel/mobile_view.htm (original)
+++ trunk/upload/templates/babel/mobile_view.htm Sun Mar 23 02:41:55 2008
@@ -26,7 +26,7 @@
<!--{else}-->
<!--{if $post['authorid'] && $post['username'] && !$post['anonymous']}-->
<div class="author">
-<small><strong># $post[number]</strong> - <a href="$bbsdir/u-$post[authorid].html">$post[author]</a> at $post[dateline]</small></div>
+<small><strong># $post[number]</strong> - <a href="$bbsdir/uid/$post[authorid]">$post[author]</a> at $post[dateline]</small></div>
<!--{else}-->
<div class="author">
<small><strong># $post[number]</strong> - ������ʿ at $post[dateline]</small></div>
Modified: trunk/upload/templates/babel/new_features.htm
==============================================================================
--- trunk/upload/templates/babel/new_features.htm (original)
+++ trunk/upload/templates/babel/new_features.htm Sun Mar 23 02:41:55 2008
@@ -22,7 +22,7 @@
<hr size="1" color="#EEE" style="color: #EEE;" />
<span class="text_large"><img src="{IMGDIR}/about/3.png" class="home" align="absmiddle" /> ������</span>
<ul style="padding-left: 10px;margin: 0px 0px 0px 2em;">
-<span class="text">��������ӵ��һ�������Լ���<a href="$bbsdir/u-1.html" class="t">��ҳ</a>��������ˣ�</span>
+<span class="text">��������ӵ��һ�������Լ���<a href="$bbsdir/uid/1" class="t">��ҳ</a>��������ˣ�</span>
<ul style="padding: 10px; margin: 0px 0px 0px 2em; list-style: square;">
<span class="tip">
<li>��ļ���ʱ�䣬������ӷ�����������Լ����ҳ��</li>
Modified: trunk/upload/templates/babel/now.htm
==============================================================================
--- trunk/upload/templates/babel/now.htm (original)
+++ trunk/upload/templates/babel/now.htm Sun Mar 23 02:41:55 2008
@@ -6,7 +6,7 @@
div#message-container textarea#content {width:370px;}
</style>
<![endif]-->
-<div class="nav"><img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" /><a href="$bbsdir/index.php">$bbname</a> » <!--{if $user_nick}--><a href="$bbsdir/u-$uid.html">$user_nick</a> »<!--{/if}--> Nowhere</div>
+<div class="nav"><img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" /><a href="$bbsdir/index.php">$bbname</a> » <!--{if $user_nick}--><a href="$bbsdir/uid/$uid">$user_nick</a> »<!--{/if}--> Nowhere</div>
</div>
<div class="maintable" align="left" style="$hack_height">
<div style="float: right; padding: 3px 10px 3px 10px; font-size: 10px; background-color: #F0F0F0; -moz-border-radius: 5px; color: #999;">
@@ -111,7 +111,7 @@
<div id="user_info">
<img src="$bbsdir/$user[avatar]" align="left" style="margin-right: 10px;" width="32" height="32" class="portrait" />
<span class="tip_i">all about</span>
-<h1 class="ititle" style="margin-bottom: 5px; display: block;"><a href="$bbsdir/u-$uid.html">$user_nick</a></h1>
+<h1 class="ititle" style="margin-bottom: 5px; display: block;"><a href="$bbsdir/uid/$uid">$user_nick</a></h1>
<hr class="board" />
<a href="$bbsdir/now/$user_nick_en/stats"><img src="{IMGDIR}/chart_bar_add.png" alt="stats" align="absmiddle" /> ״̬ͳ��</a><!--{if $user_nick==$discuz_userss}--> | <a href="$bbsdir/oimg/now" target="_blank"><img src="{IMGDIR}/cog.gif" alt="setting" align="absmiddle" /> ͼƬ����</a><!--{/if}-->
<hr class="board" />
Modified: trunk/upload/templates/babel/now_im.htm
==============================================================================
--- trunk/upload/templates/babel/now_im.htm (original)
+++ trunk/upload/templates/babel/now_im.htm Sun Mar 23 02:41:55 2008
@@ -61,7 +61,7 @@
<!--{eval $messagen[author] = rawurlencode($message[author]);}-->
<!--{eval $message['avatar'] = avRESIZE($message['avatar'],'s');}-->
<!--{eval $message['background'] = nwFROM($message['background']);}-->
-<div class="entry_$thisbg"><img src="$bbsdir/$message[avatar]" alt="$message[author]" class="portrait" align="absmiddle" /> <a href="$bbsdir/user-$messagen[author].html" class="t" target="_blank">$message[author]</a> $message[content] <span class="tip_i"><small>$message[dateline] from $message[background]</small></span></div>
+<div class="entry_$thisbg"><img src="$bbsdir/$message[avatar]" alt="$message[author]" class="portrait" align="absmiddle" /> <a href="$bbsdir/u/$messagen[author]" class="t" target="_blank">$message[author]</a> $message[content] <span class="tip_i"><small>$message[dateline] from $message[background]</small></span></div>
<!--{/loop}-->
<hr size="1" color="#EEE" style="color: #EEE; background-color: #EEE; height: 1px; border: 0;" /><a href="http://www.douban.com/" target="_blank"><img src="$bbsdir/images/favicons/douban.png" align="absmiddle" border="0" alt="����" /></a> <a href="http://www.yupoo.com/" target="_blank"><img src="$bbsdir/images/favicons/yupoo.png" align="absmiddle" border="0" alt="Yupoo" /></a> <a href="http://www.zhuaxia.com/" target="_blank"><img src="$bbsdir/images/favicons/zhuaxia.png" align="absmiddle" border="0" alt="ץϺ" /></a> <a href="http://www.blogbus.com/" target="_blank"><img src="$bbsdir/images/favicons/blogbus.png" align="absmiddle" border="0" alt="BlogBus" /></a> <a href="http://www.verycd.com/" target="_blank"><img src="$bbsdir/images/favicons/verycd.png" align="absmiddle" border="0" alt="VeryCD" /></a> <a href="http://www.wealink.com/" target="_blank"><img src="$bbsdir/images/favicons/wealink.png" align="absmiddle" border="0" alt="We@Link" /></a> <a href="http://www.tudou.com/" target="_blank"><img src="$bbsdir/images/favicons/tudou.png" align="absmiddle" border="0" alt="���" /></a> <a href="http://www.yodao.com/" target="_blank"><img src="$bbsdir/images/favicons/yodao.png" align="absmiddle" border="0" alt="�е�" /></a> <a href="http://www.kooxoo.com/" target="_blank"><img src="$bbsdir/images/favicons/kooxoo.png" align="absmiddle" border="0" alt="��Ѷ" /></a> <a href="http://www.feedsky.com/" target="_blank"><img src="$bbsdir/images/favicons/feedsky.png" align="absmiddle" border="0" alt="FeedSky" /></a> <a href="http://www.kijiji.cn/" target="_blank"><img src="$bbsdir/images/favicons/kijiji.png" align="absmiddle" border="0" alt="Kijiji" /></a>
Modified: trunk/upload/templates/babel/now_stats.htm
==============================================================================
--- trunk/upload/templates/babel/now_stats.htm (original)
+++ trunk/upload/templates/babel/now_stats.htm Sun Mar 23 02:41:55 2008
@@ -11,7 +11,7 @@
<div style="min-width: 170px; max-width: 180px; padding: 5px 0px 5px 0px; background-color: #FFF; float: right;">
<img src="$bbsdir/$member[avatar]" align="left" style="margin-right: 10px;" width="32" height="32" class="portrait" />
<span class="tip_i">all about</span>
-<h1 class="ititle" style="margin-bottom: 5px; display: block;"><a href="$bbsdir/user-$author_encode.html">$author</a></h1>
+<h1 class="ititle" style="margin-bottom: 5px; display: block;"><a href="$bbsdir/u/$author_encode">$author</a></h1>
<hr class="board" />
<small>You can Post From��</small><br /><span class="tip_i"><a href="$bbsdir/opost/now" target="_blank"><img src="$bbsdir/images/now/world_edit.png" alt="web" align="absmiddle" /> | <img src="$bbsdir/images/now/phone.png" alt="mobile" align="absmiddle" /> | <img src="$bbsdir/images/now/im.png" alt="IM" align="absmiddle" /></a></span>
<hr class="board" />
Modified: trunk/upload/templates/babel/now_view.htm
==============================================================================
--- trunk/upload/templates/babel/now_view.htm (original)
+++ trunk/upload/templates/babel/now_view.htm Sun Mar 23 02:41:55 2008
@@ -35,8 +35,8 @@
</p>
</div>
<h2 class="thumb">
- <a href="$bbsdir/user-$message[author].html"><img src="$bbsdir/$message['avatar']" /></a>
- <a href="$bbsdir/user-$message[author].html">$message[author]</a>
+ <a href="$bbsdir/u/$message[author]"><img src="$bbsdir/$message['avatar']" /></a>
+ <a href="$bbsdir/u/$message[author]">$message[author]</a>
</h2>
</div>
</div></div>
Modified: trunk/upload/templates/babel/now_wap.htm
==============================================================================
--- trunk/upload/templates/babel/now_wap.htm (original)
+++ trunk/upload/templates/babel/now_wap.htm Sun Mar 23 02:41:55 2008
@@ -37,14 +37,14 @@
<!--{if $user_nick}-->
<!--{if $action == friends}-->
<!--{loop $message_list $message}-->
-<!--{eval $message['iconshow'] = nwtextICONS($message['icons']);}-->
+<!--{eval $message['iconshow'] = nwICONS($message['icons'],'text');}-->
<!--{eval $messagen[author] = rawurlencode($message[author]);}-->
<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] <!--{if $discuz_uid && $discuz_uid == $message[authorid] }--> | <a href="$bbsdir/del/now/$message[vid]">del</a><!--{/if}--></small></div>
<!--{/loop}-->
<!--{else}-->
<!--{loop $message_list $message}-->
-<!--{eval $message['iconshow'] = nwtextICONS($message['icons']);}-->
+<!--{eval $message['iconshow'] = nwICONS($message['icons'],'text');}-->
<div class="content">$message[iconshow] $message[content]</div>
<div class="author"><small>$message[dateline] from $message[background]<!--{if $discuz_uid && $discuz_uid == $message[authorid] }--> | <a href="$bbsdir/del/now/$message[vid]">del</a><!--{/if}--></small></div>
<!--{/loop}-->
@@ -58,7 +58,7 @@
<!--{loop $message_list $message}-->
<!--{eval $messagen[author] = rawurlencode($message[author]);}-->
<!--{eval $message['background'] = nwFROM($message['background']);}-->
-<!--{eval $message['iconshow'] = nwtextICONS($message['icons']);}-->
+<!--{eval $message['iconshow'] = nwICONS($message['icons'],'text');}-->
<!--{if $page == 1 }-->
<!--{eval $message['dateline'] = make_descriptive_time($message[dateline]);}-->
<!--{/if}-->
Modified: trunk/upload/templates/babel/pmprompt.htm
==============================================================================
--- trunk/upload/templates/babel/pmprompt.htm (original)
+++ trunk/upload/templates/babel/pmprompt.htm Sun Mar 23 02:41:55 2008
@@ -15,7 +15,7 @@
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center" style="border:0px">
<!--{loop $pmlist $pm}-->
- <tr><td><li></li></td><td width="20%" nowrap><span class="bold">{lang from}:</span><!--{if $pm['announce']}-->{lang pm_announce}<!--{else}--><a href="$bbsdir/u-$pm[msgfromid].html">$pm[msgfrom]</a><!--{/if}--></td>
+ <tr><td><li></li></td><td width="20%" nowrap><span class="bold">{lang from}:</span><!--{if $pm['announce']}-->{lang pm_announce}<!--{else}--><a href="$bbsdir/uid/$pm[msgfromid]">$pm[msgfrom]</a><!--{/if}--></td>
<td width="25%"><span class="bold" nowrap>{lang subject}:</span>
<!--{if $pm['announce']}-->
<a href="$bbsdir/pm.php?action=view&folder=announce&pmid=$pm[id]" target="_blank">$pm[subject]</a></td>
Modified: trunk/upload/templates/babel/section.htm
==============================================================================
--- trunk/upload/templates/babel/section.htm (original)
+++ trunk/upload/templates/babel/section.htm Sun Mar 23 02:41:55 2008
@@ -72,9 +72,10 @@
<!--{else}-->
<!--{/if}-->
</div>
-<span class="tip_i" style="float:right">*�ְ��ͼƬ����ڿɰ��Ķ���douban.com</span>
</tr></td></table>
<!--{/if}-->
<!--{/loop}-->
+<hr class="board" />
+<div align="right"><span class="tip_i">*�ְ��ͼƬ����ڿɰ��� ����douban.com</span></div>
</div>
{template footer}
Modified: trunk/upload/templates/babel/tod.htm
==============================================================================
--- trunk/upload/templates/babel/tod.htm (original)
+++ trunk/upload/templates/babel/tod.htm Sun Mar 23 02:41:55 2008
@@ -1,7 +1,7 @@
{template header}
<!--{eval $css_color= rand_color();}-->
<!--{eval $css_color2= rand_color();}-->
-<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" /><a href="$bbsdir/index.php">$bbname</a> » <a href="$bbsdir/u-$uid.html">$user_nick</a> » Tod��y <span class="tip_i"><small>alpha</small></span></div>
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" /><a href="$bbsdir/index.php">$bbname</a> » <a href="$bbsdir/uid/$uid">$user_nick</a> » Tod��y <span class="tip_i"><small>alpha</small></span></div>
<div class="maintable" align="left">
<script type="text/javascript">
window.onload=function(){
@@ -14,8 +14,8 @@
<script type="text/javascript" src="$jsdir/tod.js"></script>
<!--{/if}-->
<link rel="stylesheet" type="text/css" href="$bbsdir/templates/css/css_tod.css" />
- <div id="tod_menu"><a href="$bbsdir/tod/$user_nick_en">Home</a> | To Do | Note | Done<!--[<a href="#$bbsdir/tod/$user_nick_en/todo">To Do</a> | <a href="#$bbsdir/tod/$user_nick_en/done">Done</a>]--></div>
-<span class="text_large"><a style="color: $css_color" href="$bbsdir/u-$uid.html" class="var">$user_nick</a> / ���ڽ��е���Ŀ</span>
+{template tod_menu}
+<span class="text_large"><a style="color: $css_color" href="$bbsdir/uid/$uid" class="var">$user_nick</a> / ���ڽ��е���Ŀ</span>
<div class="message_block">$user_nick �� $task_count ������Ҫ���, $Project_run_count �����ڽ��е���Ŀ, $Project_done_count ������ɵ���Ŀ, 0 ���ǩ</div>
<!--{if $_SESSION['tod_message'] != ''}-->
<div class="notify"><img src="{IMGDIR}/information.png" align="absmiddle" /> $_SESSION['tod_message']</div>
@@ -23,7 +23,7 @@
<!--{/if}-->
<!--{if $Project_run_count == 0}-->
<hr class="board" />
-<div class="notify"><img src="{IMGDIR}/heart.png" align="absmiddle" /><!--{if $uid == $discuz_uid}-->��û�п�ʼʹ��Tod��y���������� ��������Ŀ�� ʼ�������ʱ��ɣ�<!--{else}--><!--{if $discuz_uid && $Project_done_count == 0}-->$user_nick ��û�����ڽ��е���Ŀ<!--{/if}--><!--{/if}--></div><!--{/if}-->
+<div class="notify"><img src="{IMGDIR}/heart.png" align="absmiddle" /><!--{if $uid == $discuz_uid && $Project_done_count == 0}-->��û�п�ʼʹ��Tod��y���������� ��������Ŀ ��ʼ�������ʱ��ɣ�<!--{else}--><!--{if $Project_done_count == 0}-->$user_nick ��û�����ڽ��е���Ŀ<!--{/if}--><!--{/if}--></div><!--{/if}-->
<table width="99%" cellpadding="0" cellspacing="0" border="0" class="tod">
<!--{loop $project_list $project}-->
<tr>
@@ -51,10 +51,10 @@
<!--{/if}-->
</div>
<div class="maintable" align="left">
-<span class="text_large"><a style="color: $css_color2" href="$bbsdir/u-$uid.html" class="var">$user_nick</a> / �Ѿ���ɵ���Ŀ</span>
+<span class="text_large"><a style="color: $css_color2" href="$bbsdir/uid/$uid" class="var">$user_nick</a> / �Ѿ���ɵ���Ŀ</span>
<!--{if $Project_done_count == 0}-->
<hr class="board" />
-<div class="notify"><img src="{IMGDIR}/exclamation.png" align="absmiddle" /><!--{if $project['tpr_uid'] == $discuz_uid}-->��û������ɵ���Ŀ���ӰѾ��ɣ�<!--{else}--><!--{if $discuz_uid && $Project_done_count == 0}-->$user_nick ��û������κ���Ŀ<!--{/if}--><!--{/if}--></div><!--{/if}-->
+<div class="notify"><img src="{IMGDIR}/exclamation.png" align="absmiddle" /><!--{if $project['tpr_uid'] == $discuz_uid}-->��û������ɵ���Ŀ���ӰѾ��ɣ�<!--{else}--><!--{if $discuz_uid && $Project_done_count == 0}-->$user_nick ��û���κ���ɵ���Ŀ<!--{/if}--><!--{/if}--></div><!--{/if}-->
<table width="99%" cellpadding="0" cellspacing="0" border="0" class="tod">
<!--{loop $project_done_list $project}-->
<tr>
Modified: trunk/upload/templates/babel/topic.htm
==============================================================================
--- trunk/upload/templates/babel/topic.htm (original)
+++ trunk/upload/templates/babel/topic.htm Sun Mar 23 02:41:55 2008
@@ -18,7 +18,7 @@
<!--{/if}-->
<!--{eval $hits = $hits + $thread['views'];}-->
<!--{eval $replies = $replies + $thread['replies'];}-->
-<li style="padding-bottom: 10px;"> <img src="$bbsdir/$thread[avatar]" alt="$thread[author]" align="absmiddle" class="portrait" /> <a href="$bbsdir/u-$thread[authorid].html" class="t">$thread[author]</a> �� <a href="$bbsdir/go/$thread[board_name]">$thread[name]</a> ������: <a href="viewthread.php?tid=$thread[tid]" style="color: $name_color" class="var">$thread[subject]</a> <span class="tip_i">... $thread[dateline] ��$thread[replies] ��$thread[views] ��</span></li>
+<li style="padding-bottom: 10px;"> <img src="$bbsdir/$thread[avatar]" alt="$thread[author]" align="absmiddle" class="portrait" /> <a href="$bbsdir/uid/$thread[authorid]" class="t">$thread[author]</a> �� <a href="$bbsdir/go/$thread[board_name]">$thread[name]</a> ������: <a href="viewthread.php?tid=$thread[tid]" style="color: $name_color" class="var">$thread[subject]</a> <span class="tip_i">... $thread[dateline] ��$thread[replies] ��$thread[views] ��</span></li>
<!--{/loop}-->
</ul>
<hr class="board" />
Modified: trunk/upload/templates/babel/viewpro_classic.htm
==============================================================================
--- trunk/upload/templates/babel/viewpro_classic.htm (original)
+++ trunk/upload/templates/babel/viewpro_classic.htm Sun Mar 23 02:41:55 2008
@@ -1,19 +1,27 @@
{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> » $member[username]
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here" class="map" /><a href="$bbsdir/$indexname">$bbname</a> » $member[username]
</div></div>
+
+<!--{if $_SESSION['profile_msg']}-->
+<div class="maintable">
+<div class="notify"><img src="{IMGDIR}/information.png" align="absmiddle" class="ico" />$_SESSION['profile_msg']</div>
+</div>
+<!--{eval $_SESSION['profile_msg']='';}-->
+<!--{/if}-->
+
<div class="maintable">
<span class="text">$bbname �ĵ� <strong>$member[uid]</strong> �Ż�Ա</span>
<table width="99%" cellpadding="0" cellspacing="0" border="0" class="fav">
<tr>
<td width="95" align="left" valign="top" class="section_even"><!--{if $member[avatar]}-->
- <img src="$member[avatar]" class="portrait" width="$member[avatarwidth]" height="$member[avatarheight]" border="0" alt="" />
+ <img src="$bbsdir/$member[avatar]" class="portrait" width="$member[avatarwidth]" height="$member[avatarheight]" border="0" alt="" />
<!--{else}-->
- <img src="images/avatars/noavatar.gif" class="portrait" alt="" />
+ <img src="$bbsdir/images/avatars/noavatar.gif" class="portrait" alt="" />
<!--{/if}-->
</td>
<td align="left" valign="top" class="section_even">
- <span class="text_large">$member[username]</span> - $member['rp']<span class="excerpt"><br /><br />
+ <span class="text_large">$member[username]</span> <span class="excerpt"><br /><br />
<!--{if $member['gender'] == 1}-->{lang male}<!--{elseif $member['gender'] == 2}-->{lang female}<!--{else}-->�Ա�δ֪<!--{/if}-->��$member[regdate]���������־�������� $member[posts] ƪ���ӣ�$member[digestposts] ƪ�����������$member[pageviews]ҳ��־<br /><!--{if $member['username']==$discuz_user}--><span class="tip_i">�����ڲ쿴�����Լ���ҳ�棬�������ĵ�ַ����������ѣ������ǹ�������������־��õĿ��֣�</span><!--{/if}--></span>
</td>
</tr>
@@ -22,7 +30,7 @@
<!--{/if}-->
<!--{if $member['username']==$discuz_user}-->
<tr>
- <td colspan="2" align="center" class="section_odd"><img src="{IMGDIR}/house.png" align="absmiddle" /> ���������־��ҳ��ַ <input type="text" class="sll" onclick="this.select()" value="http://$_SERVER[HTTP_HOST]$bbsdir/u-$member[uid].html" readonly="readonly" /> <span class="tip_i">... ��ҳһ���������� $member['hits'] ��</span>
+ <td colspan="2" align="center" class="section_odd"><img src="{IMGDIR}/house.png" align="absmiddle" /> ���������־��ҳ��ַ <input type="text" class="sll" onclick="this.select()" value="http://$_SERVER[HTTP_HOST]$bbsdir/uid/$member[uid]" readonly="readonly" /> <span class="tip_i">... ��ҳһ���������� $member['hits'] ��</span>
</td>
</tr>
<!--{/if}-->
@@ -103,7 +111,7 @@
<td colspan="2" align="left" class="section_odd">
<span class="text_large"><img src="{IMGDIR}/ico_friends.gif" align="absmiddle" class="home" />$member[username] ��������</span>
<!--{if $member['username']!==$discuz_user}-->
- <span class="tip"> <a href="memcp.php?action=buddylist&newbuddyid=$member[uid]&buddysubmit=yes" id="ajax_buddy" onclick="ajaxmenu(event, this.id)" class="g">�� $member[username] �������</a></span>
+ <span class="tip"> <a href="$bbsdir/memcp.php?action=buddylist&newbuddyid=$member[uid]&buddysubmit=yes" id="ajax_buddy" onclick="ajaxmenu(event, this.id)" class="g">�� $member[username] �������</a></span>
<span class="tip"> <a href="$bbsdir/send-pm-$member[uid].html" class="g">�� $member[username] ���Ͷ���Ϣ</a></span>
<!--{/if}-->
</td>
@@ -111,7 +119,7 @@
<tr>
<td colspan="2">
<!--{loop $buddy $buddy}-->
- <a href="$bbsdir/u-$buddy[buddyid].html" class="friend"><img src="$buddy[friendavatar]" width="75" height="75" class="portrait" /><br />$buddy[username]</a>
+ <a href="$bbsdir/uid/$buddy[buddyid]" class="friend"><img src="$bbsdir/$buddy[friendavatar]" width="75" height="75" class="portrait" /><br />$buddy[username]</a>
<!--{/loop}-->
</td>
</tr>
Modified: trunk/upload/templates/babel/viewthread.htm
==============================================================================
--- trunk/upload/templates/babel/viewthread.htm (original)
+++ trunk/upload/templates/babel/viewthread.htm Sun Mar 23 02:41:55 2008
@@ -188,9 +188,9 @@
<!--{if $forum['ismoderator'] || $post['authorid'] == $discuz_uid}--> <a href="$bbsdir/edit-$fid-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/comment_edit.png" align="absmiddle" title="�༭" /></a><!--{/if}--><!--{if $allowpostreply}--> <a href="$bbsdir/quote-$fid-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/comments_add.png" align="absmiddle" title="����" /></a><!--{/if}--><!--{if $raterange && $post['authorid']}--> <a href="$bbsdir/rate-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/coins_add.png" align="absmiddle" title="���" /></a><!--{/if}--><!--{if $post['rate'] && $forum['ismoderator']}--> <a href="$bbsdir/removerate-$tid-$post[pid]-$page.html"><img src="{IMGDIR}/coins_delete.png" align="absmiddle" title="{lang removerate}" /></a><!--{/if}-->
<!--{/if}--><!--{if $forum['ismoderator'] && $allowdelpost}--><input type="checkbox" name="delete[]" value="$post[pid]"><!--{/if}--></small></div>
<!--{if $post['authorid'] && $post['username'] && !$post['anonymous']}-->
-<!--{if $post['avatar']}--><img src="$post[nmavatar]" width="32" height="32" align="absmiddle" class="re_port" /><!--{else}--><img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /><!--{/if}--> <strong><a href="$bbsdir/u-$post[authorid].html" style="color: $topic_color;" class="var">$post[author]</a></strong>
+<!--{if $post['avatar']}--><img src="$post[nmavatar]" width="32" height="32" align="absmiddle" class="re_port" /><!--{else}--><img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /><!--{/if}--> <strong><a href="$bbsdir/uid/$post[authorid]" style="color: $topic_color;" class="var">$post[author]</a></strong>
<!--{else}-->
-<img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /><!--{if !$post['authorid']}-->{lang guest} <small>$post[useip]</small>{lang unregistered}<!--{elseif $post['authorid'] && $post['username'] && $post['anonymous']}--><!--{if $forum['ismoderator']}--><strong><a href="$bbsdir/viewpro.php?uid=$post[authorid]" style="color: $topic_color;" class="var">{lang anonymous}��ʿ</a></strong><!--{else}--><strong><span style="color: $topic_color;">{lang anonymous}��ʿ</span></strong><!--{/if}--><!--{else}--><a href="$bbsdir/u-$post[authorid].html">$post[author]</a>{lang member_deleted}<!--{/if}-->
+<img src="$bbsdir/images/common/nohead_m.gif" width="32" height="32" align="absmiddle" class="re_port" /><!--{if !$post['authorid']}-->{lang guest} <small>$post[useip]</small>{lang unregistered}<!--{elseif $post['authorid'] && $post['username'] && $post['anonymous']}--><!--{if $forum['ismoderator']}--><strong><a href="$bbsdir/viewpro.php?uid=$post[authorid]" style="color: $topic_color;" class="var">{lang anonymous}��ʿ</a></strong><!--{else}--><strong><span style="color: $topic_color;">{lang anonymous}��ʿ</span></strong><!--{/if}--><!--{else}--><a href="$bbsdir/uid/$post[authorid]">$post[author]</a>{lang member_deleted}<!--{/if}-->
<!--{/if}-->
<!--{if PARASY_FEATURE_GEO}-->
<span class="tip_i"><a href="$bbsdir/geo/$post[usr_geo]" class="var">$post[geo_name]</a></span>
Modified: trunk/upload/viewpro.php
==============================================================================
--- trunk/upload/viewpro.php (original)
+++ trunk/upload/viewpro.php Sun Mar 23 02:41:55 2008
@@ -50,6 +50,18 @@
$uid = $member['uid'];
//$member['online'] = $db->result($db->query("SELECT lastactivity FROM {$tablepre}sessions WHERE uid='$uid' AND invisible='0'"), 0);
+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);
+}
+
+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" />';
+ 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
@@ -157,11 +169,11 @@
}
//E:Nowhere
@include(DISCUZ_ROOT.'./forumdata/cache_usr/svp/user_svp_'.$member['uid'].'.php');
-if(@!include('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]);
}
@include(DISCUZ_ROOT.'./forumdata/cache_usr/b/user_buddy_'.$member['uid'].'.php');
-if(@!include('forumdata/cache_usr/b/user_buddy_'.$member['uid'].'.php')){
+if(@!include(DISCUZ_ROOT.'forumdata/cache_usr/b/user_buddy_'.$member['uid'].'.php')){
$buddy = buddy_update($member[uid]);
}
@include(DISCUZ_ROOT.'./forumdata/cache_usr/g/user_geo_'.$member['uid'].'.php');
@@ -200,7 +212,7 @@
if($viewspace) {
include template('space');
} else {
- require_once './parasy/component_check.php';
+ require_once DISCUZ_ROOT.'./parasy/component_check.php';
include template('viewpro_classic');
}
?>