https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106361
Revision: 106361
Author: reedy
Date: 2011-12-15 19:53:05 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Variablise database name
Fixup my left fixme
Modified Paths:
--------------
trunk/tools/rotatebot/login.php
trunk/tools/rotatebot/rotbot.php
trunk/tools/rotatebot/settings.php
trunk/tools/rotatebot/upload.php
Modified: trunk/tools/rotatebot/login.php
===================================================================
--- trunk/tools/rotatebot/login.php 2011-12-15 19:52:28 UTC (rev 106360)
+++ trunk/tools/rotatebot/login.php 2011-12-15 19:53:05 UTC (rev 106361)
@@ -23,15 +23,15 @@
// ############### EDIT WIKIPEDIA - FUNCTION ###############
function wikiedit($project,$page,$newtext,$description,$minor)
{
- global $cookies, $useragent;
+ global $cookies, $useragent, $username;
logfile("Funktion gestartet...");
logfile("Schreibe Text am ".date("r",time())." in die Seite '$page'.");
//$cookies
if(!$cookies["commonswikiUserName"] || !$cookies["commonswikiUserID"])
{
- $username = "Rotatebot";
- $password = "**removed**";
+ global $password;
+
logfile("Login to $project!\n");
wikilogin($username,$password,$project,$useragent);
logfile("logged in to $project!\n");
@@ -87,8 +87,7 @@
//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
+ $rawcookie = substr($linex,11,strpos($linex,";")-11);
//Format: session=DFJ3ASD2S
$cookiename =
trim(substr($rawcookie,0,strpos($rawcookie,"=")));
$cookies[$cookiename] = $rawcookie;
}
@@ -139,7 +138,7 @@
}
logfile("Seite geladen, Anmeldung prüfen.");
- if(strstr($bodyy,'"wgUserName": "Rotatebot",'))
+ if(strstr($bodyy,'"wgUserName": "' . $username . '",'))
{
logfile("Anmeldung erfolgreich!");
Modified: trunk/tools/rotatebot/rotbot.php
===================================================================
--- trunk/tools/rotatebot/rotbot.php 2011-12-15 19:52:28 UTC (rev 106360)
+++ trunk/tools/rotatebot/rotbot.php 2011-12-15 19:53:05 UTC (rev 106361)
@@ -19,7 +19,7 @@
$myLockfile = $homedir."rotatebotlock";
ini_set('memory_limit', '100M'); //Speicher auf 100 MBytes hochsetzen
-ini_set('user_agent', ' User:Rotatebot by Luxo on the Toolserver / PHP');
+ini_set('user_agent', $useragent);
logfile("Starte Bot!");
@@ -55,7 +55,6 @@
logfile("Verbinde zur Datenbank!");
$myslink = mysql_connect($databanknames, $userloginname, $databasepw) or
suicide ("Can't connect to MySQL");
-$database = "commonswiki_p";
mysql_select_db($database, $myslink)
or suicide ("Konnte $database
nicht öffnen: ".mysql_error());
//Datenbank verbunden
@@ -217,7 +216,7 @@
//Datenbank abfragen nach status
if(!$cachedbar["$wgAuthor"])
{
- $mysresult = mysql_query( "SELECT * FROM user WHERE
user_name='".mysql_real_escape_string($wgAuthor)."'") or suicide("MySQL error");
+ $mysresult = mysql_query( "SELECT * FROM user WHERE
user_name='".mysql_real_escape_string($wgAuthor)."'", $myslink) or
suicide("MySQL error");
$a_row = mysql_fetch_row($mysresult);
$cachedbar[$wgAuthor] = $a_row;
}
@@ -689,7 +688,7 @@
//##################### LOG LOG LOG LOG LOG LOG LOG #########################
-$logfilew =
file_get_contents("http://commons.wikimedia.org/w/index.php?title=User:Rotatebot/Log&action=raw";);
+$logfilew =
file_get_contents("http://commons.wikimedia.org/w/index.php?title=User:$username/Log&action=raw";);
$somanyrot = count($catcontent2);
$logfilew =
deleteold($logfilew,$somanyrot,$config['logfilesize'],$config['logheader']);
@@ -769,7 +768,7 @@
$msgerr = ", ".count($wrongfiles)." errors";
}
- wikiedit("commons.wikimedia.org","User:Rotatebot/Log",$logfilew,"Bot:
$somanyrot images rotated".$msgerr.".","1");
+ wikiedit("commons.wikimedia.org","User:$username/Log",$logfilew,"Bot:
$somanyrot images rotated".$msgerr.".","1");
}
mysql_close($myslink); // TODO should/can this be moved to function suicide? -
Probably not due to line 33.
@@ -936,13 +935,15 @@
function botsetup()
{
- $setupraw =
file("http://commons.wikimedia.org/w/index.php?title=User:Rotatebot/config.js&action=raw";);
+ global $username;
+ $setupraw =
file("http://commons.wikimedia.org/w/index.php?title=User:$username/config.js&action=raw";);
+ $array = array();
foreach($setupraw as $line)
{
$line = trim($line);
- if(substr($line,0,2) != "//" AND $line != "")
+ if(substr($line,0,2) != "//" && $line != "")
{
$gleich = strpos($line, "=");
@@ -956,12 +957,12 @@
//falls vorhanden "" entfernen
if(substr($content, 0, 1) == '"')
{
- $content = substr($content, 1);
+ $content = substr($content, 1);
}
if(substr($content, -1) == '"')
{
- $content = substr($content, 0, -1);
+ $content = substr($content, 0, -1);
}
$content = trim($content);
Modified: trunk/tools/rotatebot/settings.php
===================================================================
--- trunk/tools/rotatebot/settings.php 2011-12-15 19:52:28 UTC (rev 106360)
+++ trunk/tools/rotatebot/settings.php 2011-12-15 19:53:05 UTC (rev 106361)
@@ -3,10 +3,13 @@
$homedir = "/home/luxo/rotbot/";
$cookies = "/home/lux/cks";
$exiftool = "/home/luxor/rotbot/exiftool/exiftool";
-$useragent = "Luxo (Toolserver; php) [email protected]";
+$useragent = "Luxo (Toolserver; php) [email protected]"; // '
User:Rotatebot by Luxo on the Toolserver / PHP'
$databanknames = ""; // server
+$database = ""; // database name
$userloginname = ""; // database username
$databasepw = ""; // database password
+$username = ""; // Bot username
+$password = ""; // Bot password
Modified: trunk/tools/rotatebot/upload.php
===================================================================
--- trunk/tools/rotatebot/upload.php 2011-12-15 19:52:28 UTC (rev 106360)
+++ trunk/tools/rotatebot/upload.php 2011-12-15 19:53:05 UTC (rev 106361)
@@ -30,8 +30,7 @@
//$cookies
if(!$cookies["commonswikiUserName"] || !$cookies["commonswikiUserID"])
{
- $username = "Rotatebot";
- $password = "**removed**";
+ global $username, $password;
logfile("Login to $project!\n");
wikilogin($username,$password,$project,$useragent);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
