https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106243
Revision: 106243
Author: reedy
Date: 2011-12-14 21:24:03 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Bit more indenting
Fixup some possibly undefined variables
Modified Paths:
--------------
trunk/tools/rotatebot/login.php
trunk/tools/rotatebot/upload.php
Modified: trunk/tools/rotatebot/login.php
===================================================================
--- trunk/tools/rotatebot/login.php 2011-12-14 21:20:52 UTC (rev 106242)
+++ trunk/tools/rotatebot/login.php 2011-12-14 21:24:03 UTC (rev 106243)
@@ -29,7 +29,7 @@
$useragent = "Luxo (toolserver; php) [email protected]";
//$cookies
- if(!$cookies["commonswikiUserName"] OR !$cookies["commonswikiUserID"])
+ if(!$cookies["commonswikiUserName"] || !$cookies["commonswikiUserID"])
{
$username = "Rotatebot";
$password = "**removed**";
@@ -51,9 +51,8 @@
$bodyw.=$linew;
}
echo $bodyw;*/
- $header = "";
+ $accept = "";
-
//Angemeldet, Cookies ausgelesen, editieren kann beginnen**************
$fpb = fsockopen ($project, 80, $errno, $errstr, 30);
@@ -65,13 +64,13 @@
fputs($fpb, "Accept: $accept\n");
fputs($fpb, "Accept-Language: de\n");
- foreach ($cookies as $key=>$value)
+ $cookie = '';
+ foreach ($cookies as $value)
{
$cookie .= trim($value).";";
}
$cookie = substr($cookie,0,-1);
-
logfile("Lade Seite; Cookies: $cookie\n");
fputs($fpb, "Cookie: ".$cookie."\n");
@@ -79,6 +78,7 @@
fputs($fpb, "Connection: close\n");
fputs($fpb, "\n");
+ $headerrx = '';
//Response Header auslesen forallem cooke********************
do {
@@ -88,9 +88,10 @@
//auf cookie prüfen
if(substr($linex,0,11) == "Set-Cookie:")
{
+ // FIXME: $line is undefined
$rawcookie = substr($line,11,strpos($line,";")-11);
//Format: session=DFJ3ASD2S
$cookiename =
trim(substr($rawcookie,0,strpos($rawcookie,"=")));
- $cookies[$cookiename] = $rawcookie;
+ $cookies[$cookiename] = $rawcookie;
}
} while (trim($linex)!="");
@@ -103,7 +104,7 @@
}
$cookie = substr($cookie,0,-1);
-
+ $bodyy = '';
logfile("Neue Cookies: $cookie\n");
//echo $headerrx."\n\n";
Modified: trunk/tools/rotatebot/upload.php
===================================================================
--- trunk/tools/rotatebot/upload.php 2011-12-14 21:20:52 UTC (rev 106242)
+++ trunk/tools/rotatebot/upload.php 2011-12-14 21:24:03 UTC (rev 106243)
@@ -21,45 +21,47 @@
// ############### EDIT WIKIPEDIA - FUNCTION ###############
function wikiupload($project,$filename_local,$filename_wiki,$license,$desc)
{
-global $cookies;
-$username = "Rotatebot";
-$password = "**removed**";
-
-logfile("Lade Bild '$filename_wiki' hoch am ".date("r",time()).".");
-
-//$cookies
-if(!$cookies["commonswikiUserName"] OR !$cookies["commonswikiUserID"])
-{
+ global $cookies;
$username = "Rotatebot";
$password = "**removed**";
- logfile("Login to $project!\n");
- wikilogin($username,$password,$project,$useragent);
- logfile("logged in to $project!\n");
- print_r($cookies);
-}
-else
-{
- logfile("already logged in to $project for upload\n");
-}
+ logfile("Lade Bild '$filename_wiki' hoch am ".date("r",time()).".");
-if($cookies) {
- logfile("Angemeldet in $project!\n");
-} else {
- die("Keine Cookies! Abbruch\n$header\n");
-}
+ //$cookies
+ if(!$cookies["commonswikiUserName"] || !$cookies["commonswikiUserID"])
+ {
+ $username = "Rotatebot";
+ $password = "**removed**";
+ $useragent = "Luxo (toolserver; php) [email protected]";
+ logfile("Login to $project!\n");
+ wikilogin($username,$password,$project,$useragent);
+ logfile("logged in to $project!\n");
+ print_r($cookies);
+ }
+ else
+ {
+ logfile("already logged in to $project for upload\n");
+ }
-//Angemeldet, Cookies formatieren**************
+ $header = '';
+ if($cookies) {
+ logfile("Angemeldet in $project!\n");
+ } else {
+ die("Keine Cookies! Abbruch\n$header\n");
+ }
-foreach ($cookies as $key=>$value)
-{
- $cookie .= trim($value).";";
-}
-$cookie = substr($cookie,0,-1);
+ //Angemeldet, Cookies formatieren**************
-//************ BILD HOCHLADEN ****************
-wiki_upload_file
($filename_local,$filename_wiki,$license,$desc,$project,$cookie);
+ $cookie = '';
+ foreach ($cookies as $key=>$value)
+ {
+ $cookie .= trim($value).";";
+ }
+ $cookie = substr($cookie,0,-1);
+ //************ BILD HOCHLADEN ****************
+ wiki_upload_file
($filename_local,$filename_wiki,$license,$desc,$project,$cookie);
+
}
/* ###########################################
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
