fixed bug

Author: ZeroL

conf/application/windidadmin.php

@@ -7,10 +7,13 @@
 
 /**=====配置开始于此=====**/
 
+'dbcache' => '0',				//开启数据库数据缓存，当开启mem(或redis)时，开启此项，将使用mem(或redis)缓存数据库数据
+'distributed' => '0',			//是否使用分布式架构，当开启此项时，将仅使用支持分布式的缓存策略
+
 /*-----通用缓存开启-----*/
 
 'mem.isopen' => 0,		//开启memcache缓存，请确保服务器上已安装 memcache 服务，并已作好相应配置
-'mem.server' => 'Memcache', //memcache服务名，有Memcache和Memcached两种，看当前php扩展安装的是哪个
+'mem.server' => 'MemCache', //memcache服务名，有Memcache和Memcached两种，看当前php扩展安装的是哪个
 'mem.servers' => array(
 	'default' => array(
 		array(
@@ -25,20 +28,23 @@
 		),
 	),
 ),
+'mem.key.prefix' => 'pw',
 
 
-'redis.isopen' => 0,	//开启redis缓存，请确保服务器上已安装 redis 服务，并已作好相应配置
+'redis.isopen' => 0,			//开启redis缓存，请确保服务器上已安装 redis 服务，并已作好相应配置
 'redis.servers' => array(
 	'default' => array(
 		array(
-			'host' => '127.0.0.1',
+			'host' => '10.12.83.10',
 			'port' => 6379,
 			'pconn' => false,
 			'timeout' => 0,
 		),
 	),
 ),
-'apc.isopen' => 0,		//开启apc缓存，请确保服务器上已安装 apc 服务
+'redis.key.prefix' => 'pw',
+
+'apc.isopen' => 0,				//开启apc缓存，请确保服务器上已安装 apc 服务
 
 
 /*-----预设缓存键值-----*/

conf/baseconfig.php

@@ -10,6 +10,11 @@
  */
 return array(
 	'support-tags' => array(
+		'portal' => array(
+			'tag' => 'pw',
+			'compiler' => 'LIB:engine.extension.viewer.PwTemplateCompilerPortal',
+			'pattern' => '/\<pw-start\/>(.+)<pw-end\/>/isU'
+		),
 		'page' => array(
 			'tag' => 'page',
 			'compiler' => 'LIB:engine.extension.viewer.PwTemplateCompilerPage'
@@ -18,13 +23,6 @@
 			'tag' => 'design',
 			'compiler' => 'LIB:engine.extension.viewer.PwTemplateCompilerDesign',
 		),
-		
-		'portal' => array(
-			'tag' => 'pw',
-			'compiler' => 'LIB:engine.extension.viewer.PwTemplateCompilerPortal',
-			//'pattern' => '/\<pw-start\/>/i'
-			'pattern' => '/\<pw-start\/>(.+)<pw-end\/>/isU'
-		),
 		'component'	=> array(
 			'tag' => 'component',
 			'compiler' => 'LIB:engine.extension.viewer.PwTemplateCompilerComponent'

conf/compiler.php

@@ -42,7 +42,11 @@
 			),
 			'remind' => array(
 				'class' => 'SRV:forum.srv.post.do.PwPostDoRemind',
-			)
+			),
+			'word' => array(
+				'class' => 'SRV:forum.srv.post.do.PwReplyDoWord',
+				'description' => '回复-敏感词'
+			),
 		)
 	),
 	'm_PwReplyPost' => array(
@@ -72,6 +76,10 @@
 				'class' => 'SRV:forum.srv.post.do.PwReplyDoNotice',
 				'description' => '回复-通知'
 			),
+			'word' => array(
+				'class' => 'SRV:forum.srv.post.do.PwReplyDoWord',
+				'description' => '回复-敏感词'
+			),
 		)
 	),
 	'c_post_doadd' => array(
@@ -125,11 +133,6 @@
 				'method' => 'run', 
 				'expression' => 'from_type.post==like',
 				'description' => '回复发布 - 最后喜欢的回复'
-			),
-			'word' => array(
-				'class' => 'SRV:forum.srv.post.injector.PwPostDoWordInjector', 
-				'method' => 'doadd',
-				'description' => '帖子发布 - 敏感词'
 			)
 		)
 	), 
@@ -296,6 +299,28 @@
 			),
 		)
 	),
+	's_PwThreadsDao_revertTopic' => array(
+		'description' => '还原帖子时，调用',
+		'param' => array('@param array $tids 帖子tid序列', '@return void'),
+		'interface' => '',
+		'list' => array(
+			'threadsIndex' => array(
+				'class' => 'SRV:forum.dao.PwThreadsIndexDao',
+				'method' => 'revertTopic',
+				'loadway' => 'loadDao'
+			),
+			'threadsCateIndex' => array(
+				'class' => 'SRV:forum.dao.PwThreadsCateIndexDao',
+				'method' => 'revertTopic',
+				'loadway' => 'loadDao'
+			),
+			'threadsDigestIndex' => array(
+				'class' => 'SRV:forum.dao.PwThreadsDigestIndexDao',
+				'method' => 'revertTopic',
+				'loadway' => 'loadDao'
+			),
+		)
+	),
 	's_PwThreadsDao_delete' => array(
 		'description' => '删除一个帖子时，调用',
 		'param' => array('@param int $id 帖子tid', '@return void'),
@@ -832,11 +857,6 @@
 				'class' => 'SRV:forum.srv.post.injector.PwPostDoAttInjector', 
 				'method' => 'run', 
 				'expression' => 'flashatt.post!=0'
-			),
-			'word' => array(
-				'class' => 'SRV:forum.srv.post.injector.PwPostDoWordInjector', 
-				'method' => 'doadd',
-				'description' => '帖子发布 - 敏感词'
 			)
 		)
 	), 
@@ -984,4 +1004,16 @@
 
 		)
 	),
+	
+	'm_PwFreshReplyByWeibo' => array(
+		'description' => '微博',
+		'param' => array(),
+		'interface' => 'SRV:attention.srv.reply.weibo.PwWeiboDoBase',
+		'list' => array(
+			'word' => array(
+				'class' => 'SRV:attention.srv.reply.weibo.PwWeiboDoWord',
+				'description' => '微博-敏感词'
+			),
+		)
+	),
 );