[Arianne-commits] stendhal_website/mediawiki accountCreationFilter.php, 1.2, 1.3

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal_website/mediawiki
In directory vz-cvs-4.sog:/tmp/cvs-serv32570/mediawiki

Modified Files:
	accountCreationFilter.php 
Log Message:
improved spam filter on user talk pages

Index: accountCreationFilter.php
===================================================================
RCS file: /cvsroot/arianne/stendhal_website/mediawiki/accountCreationFilter.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** accountCreationFilter.php	27 Nov 2011 16:31:09 -0000	1.2
--- accountCreationFilter.php	1 Jan 2012 20:11:03 -0000	1.3
***************
*** 2,12 ****
  
  function acfUserCreateForm($template) {
! 	$_SESSION['acf_wiki_timestamp'] = time();
! 	return true;
  }
  
  function acfAbortNewAccount($user, $message) {
! 	if (!isset($_SESSION) || !isset($_SESSION['acf_wiki_timestamp']) || $_SESSION['acf_wiki_timestamp'] + 3 > time()) {
! 		$message = 'Automatic SPAM filter triggered, please try again later.';
  		return false;
  	}
--- 2,27 ----
  
  function acfUserCreateForm($template) {
!         $_SESSION['acf_wiki_timestamp'] = time();
!         return true;
  }
  
  function acfAbortNewAccount($user, $message) {
!         if (!isset($_SESSION) || !isset($_SESSION['acf_wiki_timestamp']) || $_SESSION['acf_wiki_timestamp'] + 3 > time()) {
!                 $message = 'Automatic SPAM filter triggered, please try again later.';
!                 return false;
!         }
!         return true;
! }
! 
! function acfPreventTalkPageWithoutMainPage($editpage) {
! 	global $wgRequest, $wgUser, $wgTitle;
! 
! 	// user may not create their own user talk page without their user main page
! 	if (($wgTitle->getNamespace() == NS_USER_TALK)
! 		&& (!$wgTitle->exists())
! 		&& ($wgTitle->getText() == $wgUser->getName())
! 		&& (!Title::makeTitle($wgTitle->getSubjectNsText(), $wgUser->getName())->exists())) {
! 		
! 		$editpage->spamPageWithContent();
  		return false;
  	}
***************
*** 14,18 ****
  }
  
- 
  $wgHooks['UserCreateForm'][] = 'acfUserCreateForm';
  $wgHooks['AbortNewAccount'][] = 'acfAbortNewAccount';
--- 29,33 ----
  }
  
  $wgHooks['UserCreateForm'][] = 'acfUserCreateForm';
  $wgHooks['AbortNewAccount'][] = 'acfAbortNewAccount';
+ $wgHooks['AbortNewAccount'][] = 'acfPreventTalkPageWithoutMainPage';