API: Add nosuchuser message to ApiBase::$messageMap

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

diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php
index 34e24f3..8d76e8b 100644 (file)
--- a/includes/api/ApiQueryExtLinksUsage.php
+++ b/includes/api/ApiQueryExtLinksUsage.php
@@ -54,7 +54,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 
                // Find the right prefix
                global $wgUrlProtocols;
-               if(!is_null($protocol) && $protocol != '' && !in_array($protocol, $wgUrlProtocols))
+               if($protocol && !in_array($protocol, $wgUrlProtocols))
                {
                        foreach ($wgUrlProtocols as $p) {
                                if( substr( $p, 0, strlen( $protocol ) ) === $protocol ) {
@@ -63,8 +63,10 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                                }
                        }
                }
+               else
+                       $protocol = null;
 
-               $db = $this->getDb();
+               $db = $this->getDB();
                $this->addTables(array('page','externallinks'));        // must be in this order for 'USE INDEX'
                $this->addOption('USE INDEX', 'el_index');
                $this->addWhere('page_id=el_from');
@@ -72,12 +74,17 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 
                if(!is_null($query) || $query != '')
                {
-                       $likeQuery = LinkFilter::makeLike($query , $protocol);
+                       if(is_null($protocol))
+                               $protocol = 'http://';
+
+                       $likeQuery = LinkFilter::makeLike($query, $protocol);
                        if (!$likeQuery)
                                $this->dieUsage('Invalid query', 'bad_query');
                        $likeQuery = substr($likeQuery, 0, strpos($likeQuery,'%')+1);
                        $this->addWhere('el_index LIKE ' . $db->addQuotes( $likeQuery ));
                }
+               else if(!is_null($protocol))
+                       $this->addWhere('el_index LIKE ' . $db->addQuotes( "$protocol%" ));
 
                $prop = array_flip($params['prop']);
                $fld_ids = isset($prop['ids']);
@@ -103,7 +110,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 
                $res = $this->select(__METHOD__);
 
-               $data = array ();
+               $result = $this->getResult();
                $count = 0;
                while ($row = $db->fetchObject($res)) {
                        if (++ $count > $limit) {
@@ -118,12 +125,16 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                                        $vals['pageid'] = intval($row->page_id);
                                if ($fld_title) {
                                        $title = Title :: makeTitle($row->page_namespace, $row->page_title);
-                                       $vals['ns'] = intval($title->getNamespace());
-                                       $vals['title'] = $title->getPrefixedText();
+                                       ApiQueryBase::addTitleInfo($vals, $title);
                                }
                                if ($fld_url)
                                        $vals['url'] = $row->el_to;
-                               $data[] = $vals;
+                               $fit = $result->addValue(array('query', $this->getModuleName()), null, $vals);
+                               if(!$fit)
+                               {
+                                       $this->setContinueEnumParameter('offset', $offset + $count - 1);
+                                       break;
+                               }
                        } else {
                                $resultPageSet->processDbRow($row);
                        }
@@ -131,15 +142,14 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                $db->freeResult($res);
 
                if (is_null($resultPageSet)) {
-                       $result = $this->getResult();
-                       $result->setIndexedTagName($data, $this->getModulePrefix());
-                       $result->addValue('query', $this->getModuleName(), $data);
+                       $result->setIndexedTagName_internal(array('query', $this->getModuleName()),
+                                       $this->getModulePrefix());
                }
        }
 
        public function getAllowedParams() {
                global $wgUrlProtocols;
-               $protocols = array();
+               $protocols = array('');
                foreach ($wgUrlProtocols as $p) {
                        $protocols[] = substr($p, 0, strpos($p,':'));
                }
@@ -159,7 +169,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                        ),
                        'protocol' => array (
                                ApiBase :: PARAM_TYPE => $protocols,
-                               ApiBase :: PARAM_DFLT => 'http',
+                               ApiBase :: PARAM_DFLT => '',
                        ),
                        'query' => null,
                        'namespace' => array (
@@ -180,10 +190,11 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                return array (
                        'prop' => 'What pieces of information to include',
                        'offset' => 'Used for paging. Use the value returned for "continue"',
-                       'protocol' => 'Protocol of the url',
-                       'query' => 'Search string without protocol. See [[Special:LinkSearch]]. Leave empty to list all external links (euprotocol will be ignored)',
+                       'protocol' => array(    'Protocol of the url. If empty and euquery set, the protocol is http.',
+                                               'Leave both this and euquery empty to list all external links'),
+                       'query' => 'Search string without protocol. See [[Special:LinkSearch]]. Leave empty to list all external links',
                        'namespace' => 'The page namespace(s) to enumerate.',
-                       'limit' => 'How many entries to return.'
+                       'limit' => 'How many pages to return.'
                );
        }
 
@@ -200,4 +211,4 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }
-}
+}
\ No newline at end of file