Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55817
Change subject: add a table for wikivoyage (bug 44194)
......................................................................
add a table for wikivoyage (bug 44194)
Change-Id: I04c617c4ea8b394c41163cc2787c2fbcf659fcd8
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M usr/share/php/wikistats/coalesced_query.php
M var/www/wikistats/index.php
4 files changed, 19 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/17/55817/1
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index 0594c69..ec82e39 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -60,13 +60,13 @@
$socket_timeout="10";
# list all tables (which should be displayed on index page and included in
grand totals)
-$listtables=array("wikipedias","wikiquotes","wikibooks","wiktionaries","wikinews","wikisources","wikia","editthis","wikitravel","mediawikis","uncyclomedia","anarchopedias","opensuse","richdex","gratiswiki","qweki","wikisite","gentoo","hyperwave","scoutwiki","wmspecials","qweki","wikiversity","wikifur","metapedias","neoseeker","shoutwiki","referata","pardus","rodovid","wikkii","lxde");
+$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage');
# list tables which are valid for our api.php - CHECKME
-$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity');
+$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage');
# list tables which should have language columns in the html tables
-$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde');
+$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde','wikivoyage');
# list tables with URLs like wikiname.domain.org/api.php
$tables_with_prefix_short=array('anarchopedias', 'wikisite', 'pardus',
'rodovid', 'opensuse','wikisite','scoutwiki');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index cb554d8..a2d4265 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -85,6 +85,10 @@
$table="wikiversity";
$domain="wikiversity.org";
break;
+ case "wy":
+ $table="wikivoyage";
+ $domain="wikivoyage.org";
+ break;
case "mw":
$table="mediawikis";
$domain="na";
@@ -166,6 +170,8 @@
print "unkown table. exiting\n";
exit;
}
+
+# if (isset($argv[2])) {
switch ($argv[2]) {
case "prefix":
@@ -319,7 +325,7 @@
print "!(${mycount}/${totalcount}) -
${prefix}.${domain} - NO API URL! (method: ".$row['method'].") trying ${url}\n";
}
- $buffer = file_get_contents($url);
+# disabled $buffer = file_get_contents($url);
if (isset($http_response_header[0])) {
$statuscode=explode(" ",$http_response_header[0]);
diff --git a/usr/share/php/wikistats/coalesced_query.php
b/usr/share/php/wikistats/coalesced_query.php
index 927a4b8..b6ff543 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -10,7 +10,9 @@
union all
(select 'wn' as project,'wikinews' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikinews)
union all
-(select 'ws' as project,'wikisources' as name,sum(good) as ggood, sum(total)
as gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikisources)
+(select 'ws' as project,'wikisources' as name,sum(good) as ggood, sum(total)
as gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikisources)
+union all
+(select 'wy' as project,'wikivoyages' as name,sum(good) as ggood, sum(total)
as gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikivoyage)
union all
(select 'wx' as project,'wmspecials' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwkis from wmspecials)
union all
@@ -53,6 +55,6 @@
(select 'wk' as project,'wikkii' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikkii)
union all
(select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
-order by $sort;";
+order by ${sort};";
?>
diff --git a/var/www/wikistats/index.php b/var/www/wikistats/index.php
index 8b7747c..b47b860 100644
--- a/var/www/wikistats/index.php
+++ b/var/www/wikistats/index.php
@@ -112,14 +112,14 @@
$sort = "ggood desc,gtotal desc,gedits desc,gusers desc,gadmins
desc";
}
-$sort=mysql_escape_string($sort);
+$sort=htmlspecialchars(mysql_escape_string($sort));
# Get "Last Updated" timestamps
mysql_connect("$dbhost", "$dbuser", "$dbpass") or die(mysql_error());
mysql_select_db("$dbname") or die(mysql_error());
foreach ($listtables as $listtable) {
- $query="select ts,TIMESTAMPDIFF(MINUTE, ts, now()) as oldness from
$listtable order by ts desc limit 1";
+ $query="select ts,TIMESTAMPDIFF(MINUTE, ts, now()) as oldness from
${listtable} order by ts desc limit 1";
$result = mysql_query("$query") or die(mysql_error());
while($row = mysql_fetch_array( $result )) {
@@ -211,7 +211,7 @@
}
echo "<tr>
-<td class=\"number\">$count</td>
+<td class=\"number\">${count}</td>
<td class=\"text\"><a href=\"display.php?t=".$project."\">$name</a></td>
<td class=\"text\">".$row['numwikis']."</td>
<td class=\"text\">".$row['ggood']."</td>
@@ -243,6 +243,7 @@
union all (select good,total,edits,admins,users,images from wikibooks)
union all (select good,total,edits,admins,users,images from wikinews)
union all (select good,total,edits,admins,users,images from wmspecials)
+ union all (select good,total,edits,admins,users,images from wikivoyage)
order by good;
FNORD;
@@ -317,7 +318,7 @@
}
-echo "</table></div><div id=\"grandtotals\"
style=\"float:right;width:70%;padding:22px;\"><table><tr><th colspan=\"15\"
class=\"grand\">grand totals</th></tr><tr><th></th><th
class=\"grand\">wikis</th><th class=\"grand\">articles</th><th
class=\"grand\">total</th><th class=\"grand\">edits</th><th
class=\"grand\">admins</th><th class=\"grand\">users</th><th
class=\"grand\">images</th><th class=\"grand\">stub ratio</th><th
class=\"grand\" colspan=\"5\">formats</th></tr><tr><td style=\"background:
".$color['html'].";\" class=\"text\"><a href=\"wikimedias_html.php\">All
wikimedia wikis</a></td><td class=\"grand\">$wm_wikis</td><td class=\"grand\">
$wm_good </td><td class=\"grand\"> $wm_total </td><td class=\"grand\">
$wm_edits </td><td class=\"grand\"> $wm_admins </td><td class=\"grand\">
$wm_users </td><td class=\"grand\"> $wm_images </td><td class=\"grand\">
$wm_ratio </td>
+echo "</table></div><div id=\"grandtotals\"
style=\"float:right;width:70%;padding:22px;\"><table><tr><th colspan=\"15\"
class=\"grand\">grand totals</th></tr><tr><th></th><th
class=\"grand\">wikis</th><th class=\"grand\">articles</th><th
class=\"grand\">total</th><th class=\"grand\">edits</th><th
class=\"grand\">admins</th><th class=\"grand\">users</th><th
class=\"grand\">images</th><th class=\"grand\">stub ratio</th><th
class=\"grand\" colspan=\"5\">formats</th></tr><tr><td style=\"background:
".$color['html'].";\" class=\"text\"><a href=\"wikimedias_html.php\">All
wikimedia wikis</a></td><td class=\"grand\">${wm_wikis}</td><td
class=\"grand\"> ${wm_good} </td><td class=\"grand\"> ${wm_total} </td><td
class=\"grand\"> ${wm_edits} </td><td class=\"grand\"> ${wm_admins} </td><td
class=\"grand\"> ${wm_users} </td><td class=\"grand\"> ${wm_images} </td><td
class=\"grand\"> ${wm_ratio} </td>
<td class=\"formats\"><a href=\"wikimedias_csv.php\"> csv </a></td>
<td class=\"formats\"><a href=\"wikimedias_csv.php?semicolon\"> ssv </a></td>
<td class=\"formats\"></td>
--
To view, visit https://gerrit.wikimedia.org/r/55817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04c617c4ea8b394c41163cc2787c2fbcf659fcd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
