[PerlWikiBot] SF.net SVN: perlwikibot: [23] trunk/includes

[<rot...@us...>]

Revision: 23
          http://svn.sourceforge.net/perlwikibot/?rev=23&view=rev
Author:   rotemliss
Date:     2006-09-16 06:26:26 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
Fixes, now broken.

Modified Paths:
--------------
    trunk/includes/actions.pm
    trunk/includes/functions.pm

Modified: trunk/includes/actions.pm
===================================================================
--- trunk/includes/actions.pm	2006-09-16 13:06:38 UTC (rev 22)
+++ trunk/includes/actions.pm	2006-09-16 13:26:26 UTC (rev 23)
@@ -75,24 +75,25 @@
 # Move page
 sub movePage {
 	# Get parameters
-	my ( $title, $newTitle, $moveReason ) = @_;
+	my ( $title, $newTitle, $reason ) = @_;
 
 	print "Moving page $title to $newTitle...\n";
 
 	# Get the delete page contents
 	my $movePage = http::getPage( "Special:Movepage/$title" );
 
-	# Get the edit token
-	if ($movePage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/) {
-		my $editToken = $1;
+	# Get edit token
+	$editPage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
+	my $editToken = $1;
 
-		# Send page
+	# Send page
+	if ( defined( $editToken ) && $editToken =~ /[0-9a-f]{32}/ ) {
 		if ( $configure::sendPages == 1 ) {
 			http::postPage( "Special:Movepage", "submit",
 				[
 					wpOldTitle => $title,
 					wpNewTitle => $newTitle,
-					wpReason => $moveReason,
+					wpReason => $reason,
 					wpEditToken => $editToken,
 				],
 			);
@@ -113,11 +114,12 @@
 	# Get the delete page contents
 	my $deletePage = http::getPage( $title, "delete" );
 
-	# Get the edit token
-	if ($deletePage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/) {
-		my $editToken = $1;
+	# Get edit token
+	$editPage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
+	my $editToken = $1;
 
-		# Send page
+	# Send page
+	if ( defined( $editToken ) && $editToken =~ /[0-9a-f]{32}/ ) {
 		if ( $configure::sendPages == 1 ) {
 			http::postPage( $title, "delete",
 				[

Modified: trunk/includes/functions.pm
===================================================================
--- trunk/includes/functions.pm	2006-09-16 13:06:38 UTC (rev 22)
+++ trunk/includes/functions.pm	2006-09-16 13:26:26 UTC (rev 23)
@@ -222,15 +222,15 @@
 	}
 }
 
-# Refresh page
+# Delete page
 sub deletePage {
 	# Get parameters
 	my ( $title ) = @_;
 
 	if ( $configure::sendPages == 1 || $configure::sendPages == 2 ) {
-		actions::deletePage( $title, getPageContents( $title ), "Refreshing page" );
+		actions::deletePage( $title );
 	} else {
-		print "Refreshed page $title.\n";
+		print "Deleted page $title.\n";
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.