* Re-applying r34449, r34500 and r34518 which Brion reverted by accident

[lhc/web/wiklou.git] / includes / api / ApiQuerySiteinfo.php

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index c79e2fa..244a665 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -30,7 +30,7 @@ if (!defined('MEDIAWIKI')) {
 
 /**
  * A query action to return meta information about the wiki site.
- * 
+ *
  * @addtogroup API
  */
 class ApiQuerySiteinfo extends ApiQueryBase {
@@ -60,7 +60,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                        $this->appendSpecialPageAliases($p);
                                        break;
                                case 'interwikimap' :
-                                       $filteriw = isset($params['filteriw']) ? $params['filteriw'] : false; 
+                                       $filteriw = isset($params['filteriw']) ? $params['filteriw'] : false;
                                        $this->appendInterwikiMap($p, $filteriw);
                                        break;
                                case 'dbrepllag' :
@@ -69,13 +69,16 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                case 'statistics' :
                                        $this->appendStatistics($p);
                                        break;
+                               case 'usergroups' :
+                                       $this->appendUserGroups($p);
+                                       break;
                        }
                }
        }
 
        protected function appendGeneralInfo($property) {
                global $wgSitename, $wgVersion, $wgCapitalLinks, $wgRightsCode, $wgRightsText, $wgLanguageCode, $IP, $wgEnableWriteAPI, $wgLang;
-               
+
                $data = array ();
                $mainPage = Title :: newFromText(wfMsgForContent('mainpage'));
                $data['mainpage'] = $mainPage->getPrefixedText();
@@ -87,7 +90,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                if ( $svn ) $data['rev'] = $svn;
 
                $data['case'] = $wgCapitalLinks ? 'first-letter' : 'case-sensitive'; // 'case-insensitive' option is reserved for future
-               
+
                if (isset($wgRightsCode))
                        $data['rightscode'] = $wgRightsCode;
                $data['rights'] = $wgRightsText;
@@ -96,13 +99,13 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 
                if ( $wgEnableWriteAPI )
                        $data['writeapi'] = '';
-               
+
                $this->getResult()->addValue('query', $property, $data);
        }
-       
+
        protected function appendNamespaces($property) {
                global $wgContLang, $wgNamespacesWithSubpages;
-               
+
                $data = array ();
                foreach ($wgContLang->getFormattedNamespaces() as $ns => $title) {
                        $data[$ns] = array (
@@ -112,14 +115,14 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        if(@$wgNamespacesWithSubpages[$ns])
                                $data[$ns]['subpages'] = '';
                }
-               
+
                $this->getResult()->setIndexedTagName($data, 'ns');
                $this->getResult()->addValue('query', $property, $data);
        }
-       
+
        protected function appendNamespaceAliases($property) {
                global $wgNamespaceAliases;
-               
+
                $data = array ();
                foreach ($wgNamespaceAliases as $title => $ns) {
                        $item = array (
@@ -128,11 +131,11 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        ApiResult :: setContent($item, strtr($title, '_', ' '));
                        $data[] = $item;
                }
-               
+
                $this->getResult()->setIndexedTagName($data, 'ns');
                $this->getResult()->addValue('query', $property, $data);
        }
-       
+
        protected function appendSpecialPageAliases($property)
        {
                global $wgLang;
@@ -162,18 +165,21 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                }
 
                $this->addOption('ORDER BY', 'iw_prefix');
-               
+
                $db = $this->getDB();
                $res = $this->select(__METHOD__);
 
                $data = array();
+               $langNames = Language::getLanguageNames();
                while($row = $db->fetchObject($res))
                {
                        $val = array();
                        $val['prefix'] = $row->iw_prefix;
-                       if ($row->iw_local == '1')
+                       if($row->iw_local == '1')
                                $val['local'] = '';
 //                     $val['trans'] = intval($row->iw_trans); // should this be exposed?
+                       if(isset($langNames[$row->iw_prefix]))
+                               $val['language'] = $langNames[$row->iw_prefix];
                        $val['url'] = $row->iw_url;
 
                        $data[] = $val;
@@ -183,21 +189,21 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $this->getResult()->setIndexedTagName($data, 'iw');
                $this->getResult()->addValue('query', $property, $data);
        }
-       
+
        protected function appendDbReplLagInfo($property, $includeAll) {
                global $wgShowHostnames;
 
                $data = array();
-               
+
                if ($includeAll) {
                        if (!$wgShowHostnames)
                                $this->dieUsage('Cannot view all servers info unless $wgShowHostnames is true', 'includeAllDenied');
-                       
-                       global $wgDBservers;
-                       $lags = wfGetLB()->getLagTimes();
+
+                       $lb = wfGetLB();
+                       $lags = $lb->getLagTimes();
                        foreach( $lags as $i => $lag ) {
                                $data[] = array (
-                                       'host' => $wgDBservers[$i]['host'],
+                                       'host' => $lb->getServerName( $i ),
                                        'lag' => $lag);
                        }
                } else {
@@ -205,12 +211,12 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $data[] = array (
                                'host' => $wgShowHostnames ? $host : '',
                                'lag' => $lag);
-               }                                       
+               }
 
                $result = $this->getResult();
                $result->setIndexedTagName($data, 'db');
                $result->addValue('query', $property, $data);
-       }       
+       }
 
        protected function appendStatistics($property) {
                $data = array ();
@@ -223,11 +229,25 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $data['admins'] = intval(SiteStats::admins());
                $data['jobs'] = intval(SiteStats::jobs());
                $this->getResult()->addValue('query', $property, $data);
-       }       
-       
+       }
+
+       protected function appendUserGroups($property) {
+               global $wgGroupPermissions;
+
+               $data = array ();
+               foreach ($wgGroupPermissions as $group => $permissions) {
+                       $arr = array ('name' => $group, 'rights' => array_keys($permissions, true));
+                       $this->getResult()->setIndexedTagName($arr['rights'], 'permission');
+                       $data[] = $arr;
+               }
+
+               $this->getResult()->setIndexedTagName($data, 'group');
+               $this->getResult()->addValue('query', $property, $data);
+       }
+
        public function getAllowedParams() {
                return array (
-               
+
                        'prop' => array (
                                ApiBase :: PARAM_DFLT => 'general',
                                ApiBase :: PARAM_ISMULTI => true,
@@ -239,6 +259,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                        'interwikimap',
                                        'dbrepllag',
                                        'statistics',
+                                       'usergroups',
                                )),
 
                        'filteriw' => array (
@@ -246,7 +267,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                        'local',
                                        '!local',
                                )),
-                               
+
                        'showalldb' => false,
                );
        }
@@ -262,6 +283,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                ' "statistics"   - Returns site statistics',
                                ' "interwikimap" - Returns interwiki map (optionally filtered)',
                                ' "dbrepllag"    - Returns database server with the highest replication lag',
+                               ' "usergroups"   - Returns user groups and the associated permissions',
                        ),
                        'filteriw' =>  'Return only local or only nonlocal entries of the interwiki map',
                        'showalldb' => 'List all database servers, not just the one lagging the most',