Skip to content

Commit 188cf63

Browse files
ZeroLZeroL
committed
新增部分特性，bug修复及代码产品优化
开发模式文案整理 windid后台融合 话题name没有自动urldecode出来 门户远程附件 core图片整合优化 界面调整 template标签design兼容 style图片整合优化 框架更新 应用配置调整 后台应用调整 获取站点配置接口修复 bug#性能优化，callback中将插入和查询删除 门户自定义页面创建 积分日志搜索，链接错误 游客下载附件，提示语言优化 getJSON > post json 伪静态防错 帖子数据支持html 分布式缓存配置 url创建强制规范，解决XXS问题
1 parent 3508727 commit 188cf63

File tree

623 files changed

+5205
-3662
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+5205
-3662
lines changed

‎AUTHORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
# Please keep the list sorted.
77

88
Zerol Lin <zerol.lin@me.com>
9+
chenjm <sky_hold@163.com>
10+
LinHao <linhao87@gmail.com>
11+
xiaoxia.xu <x_824@sina.com>

‎conf/baseconfig.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
/*-----通用缓存开启-----*/
1414

15-
'mem.isopen' => 0, //开启memcache缓存，请确保服务器上已安装 memcache 服务，并已作好相应配置
16-
'mem.server' => 'MemCache', //memcache服务名，有Memcache和Memcached两种，看当前php扩展安装的是哪个
15+
'mem.isopen' => 0, //开启memcache缓存，请确保服务器上已安装 memcache 服务，并已作好相应配置
16+
'mem.server' => 'MemCache', //memcache服务名，有MemCache和MemCached两种，看当前php扩展安装的是哪个
1717
'mem.servers' => array(
1818
'default' => array(
1919
array(
@@ -69,6 +69,7 @@
6969
/*-----预设钩子键值-----*/
7070

7171
'prehook' => array(
72+
'bbs/thread/run' => array('c_thread_run', 'm_PwThreadList', 's_PwThreadType'),
7273
'bbs/read/run' => array('c_read_run', 'm_PwThreadDisplay', 's_PwThreadType', 's_PwUbbCode_convert', 's_PwThreadsHitsDao_add'),
7374
'bbs/post/doadd' => array('c_post_doadd', 'm_PwTopicPost', 's_PwThreadsDao_add', 's_PwThreadsIndexDao_add', 's_PwThreadsCateIndexDao_add', 's_PwThreadsContentDao_add', 's_PwForumStatisticsDao_update', 's_PwForumStatisticsDao_batchUpdate', 's_PwTagRecordDao_add', 's_PwTagRelationDao_add', 's_PwTagDao_update', 's_PwTagDao_add', 's_PwThreadsContentDao_update', 's_PwFreshDao_add', 's_PwUserDataDao_update', 's_PwUser_update', 's_PwAttachDao_update', 's_PwThreadAttachDao_update', 's_PwCreditOperationConfig'),
7475
'bbs/post/doreply' => array('c_post_doreply', 'm_PwReplyPost', 's_PwPostsDao_add', 's_PwForumStatisticsDao_update', 's_PwForumStatisticsDao_batchUpdate', 's_PwThreadsDao_update', 's_PwThreadsIndexDao_update', 's_PwThreadsCateIndexDao_update', 's_PwThreadsDigestIndexDao_update', 's_PwUserDataDao_update', 's_PwUser_update', 's_PwCreditOperationConfig'),

‎conf/hooks.php‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'poll' => array(
1313
'class' => 'SRV:forum.srv.post.injector.PwPostDoPollInjector',
1414
'method' => 'run',
15-
'expression' => 'special.get==1',
15+
'expression' => 'special.get==poll',
1616
'description' => '投票帖展示'
1717
)
1818
)
@@ -89,8 +89,8 @@
8989
'list' => array(
9090
'poll' => array(
9191
'class' => 'SRV:forum.srv.post.injector.PwPostDoPollInjector',
92-
'method' => 'doadd',
93-
'expression' => 'special.post==1',
92+
'method' => 'doadd',
93+
'expression' => 'special.post==poll',
9494
'description' => '发投票帖'
9595
),
9696
'att' => array(
@@ -133,6 +133,11 @@
133133
'method' => 'run',
134134
'expression' => 'from_type.post==like',
135135
'description' => '回复发布 - 最后喜欢的回复'
136+
),
137+
'word' => array(
138+
'class' => 'SRV:forum.srv.post.injector.PwPostDoWordInjector',
139+
'method' => 'doadd',
140+
'description' => '帖子发布 - 敏感词'
136141
)
137142
)
138143
),
@@ -144,7 +149,7 @@
144149
'poll' => array(
145150
'class' => 'SRV:forum.srv.post.injector.PwPostDoPollInjector',
146151
'method' => 'modify',
147-
'expression' => 'service:special==1',
152+
'expression' => 'service:special==poll',
148153
'description' => '帖子编辑 - 投票帖'
149154
),
150155
)
@@ -157,7 +162,7 @@
157162
'poll' => array(
158163
'class' => 'SRV:forum.srv.post.injector.PwPostDoPollInjector',
159164
'method' => 'domodify',
160-
'expression' => 'service:action.info.special==1',
165+
'expression' => 'service:special==poll',
161166
'description' => '帖子编辑提交 - 投票帖'
162167
),
163168
'att' => array(
@@ -192,7 +197,7 @@
192197
'poll' => array(
193198
'class' => 'SRV:forum.srv.threadDisplay.injector.PwThreadDisplayDoPollInjector',
194199
'method' => 'run',
195-
'expression' => 'service:thread.info.special==1',
200+
'expression' => 'service:thread.info.special==poll',
196201
'description' => '帖子阅读页 - 投票帖'
197202
),
198203
'like' => array(
@@ -208,7 +213,6 @@
208213
),
209214
'word' => array(
210215
'class' => 'SRV:forum.srv.threadDisplay.injector.PwThreadDisplayDoWordInjector',
211-
'method' => 'run',
212216
'description' => '帖子阅读页 - 替换敏感词'
213217
),
214218
)
@@ -398,11 +402,11 @@
398402
'method' => 'delFollow',
399403
'loadway' => 'load'
400404
),
401-
'recommend' => array(
405+
/* 'recommend' => array(
402406
'class' => 'SRV:attention.srv.recommend.PwRecommendAttentionDo',
403407
'method' => 'delFollow',
404408
'loadway' => 'load'
405-
),
409+
),*/
406410
)
407411
),
408412

@@ -461,7 +465,7 @@
461465
)
462466
),
463467

464-
'm_PwMessageService' => array( //todo 金龙 simpleHook
468+
'm_PwMessageService' => array(
465469
'description' => '消息服务',
466470
'param' => array(),
467471
'interface' => 'SRV:message.srv.do.PwMessageDoBase',
@@ -491,14 +495,14 @@
491495
'class' => 'SRV:medal.srv.condition.do.PwMedalUserDo',
492496
'loadway' => 'load'
493497
),
494-
'recommendUser' => array(
495-
'class' => 'SRV:attention.srv.recommend.PwRecommendUserDo',
496-
'loadway' => 'load'
497-
),
498498
'updateOnline' => array(
499499
'class' => 'SRV:online.srv.do.PwLoginDoUpdateOnline',
500500
'loadway' => 'load'
501501
),
502+
/* 'recommendUser' => array(
503+
'class' => 'SRV:attention.srv.recommend.PwRecommendUserDo',
504+
'loadway' => 'load'
505+
),*/
502506
)
503507
),
504508
's_PwUser_delete' => array(
@@ -594,18 +598,18 @@
594598
),
595599
)
596600
),
597-
'c_space_profile' => array(
601+
's_space_profile' => array(
598602
'description' => '空间资料页面',
599603
'param' => array(''),
600604
'interface' => '',
601605
'list' => array( //这个顺序别改，pd要求的
602606
'education' => array(
603-
'class' => 'SRV:space.srv.profile.injector.PwSpaceProfileInjector',
604-
'method' => 'extendEducation'
607+
'class' => 'SRV:education.srv.profile.do.PwSpaceProfileDoEducation',
608+
'method' => 'createHtml'
605609
),
606610
'work' => array(
607-
'class' => 'SRV:space.srv.profile.injector.PwSpaceProfileInjector',
608-
'method' => 'extendWork'
611+
'class' => 'SRV:work.srv.profile.do.PwSpaceProfileDoWork',
612+
'method' => 'createHtml'
609613
),
610614
)
611615
),
@@ -887,15 +891,20 @@
887891
),
888892
)
889893
),
890-
'm_threadmanage_copy' => array( //todo
894+
's_PwThreadManageDoCopy' => array( //todo
895+
'description' => '退出登录',
896+
'param' => array('@param PwThreadManage $srv', '@return void'),
897+
'interface' => 'PwThreadManageCopyDoBase',
891898
'list' => array(
892899
'poll' => array(
893900
'class' => 'SRV:forum.srv.manage.do.PwThreadManageCopyDoPoll',
901+
'method' => 'copyThread',
894902
'loadway' => 'load',
895-
'expression' => 'service:special!=0',
903+
'expression' => 'service:special==poll',
896904
),
897905
'att' => array(
898906
'class' => 'SRV:forum.srv.manage.do.PwThreadManageCopyDoAtt',
907+
'method' => 'copyThread',
899908
'loadway' => 'load',
900909
'expression' => 'service:ifupload!=0',
901910
),

0 commit comments

Comments
 (0)