API: disabled login module until it is more secure. added performance comment in...

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

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 123264f..02f5e11 100644 (file)
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /*
  * Created on Sep 25, 2006
  *
@@ -29,6 +28,9 @@ if (!defined('MEDIAWIKI')) {
        require_once ('ApiQueryBase.php');
 }
 
+/**
+ * @addtogroup API
+ */
 class ApiQueryAllpages extends ApiQueryGeneratorBase {
 
        public function __construct($query, $moduleName) {
@@ -47,14 +49,18 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
        }
 
        private function run($resultPageSet = null) {
-               $limit = $from = $namespace = $filterredir = null;
-               extract($this->extractRequestParams());
 
+               wfProfileIn($this->getModuleProfileName() . '-getDB');
                $db = $this->getDB();
+               wfProfileOut($this->getModuleProfileName() . '-getDB');
+
+               wfProfileIn($this->getModuleProfileName() . '-parseParams');
+               $limit = $from = $namespace = $filterredir = $prefix = null;
+               extract($this->extractRequestParams());
 
                $this->addTables('page');
-               $this->addWhereIf('page_is_redirect = 1', $filterredir === 'redirects');
-               $this->addWhereIf('page_is_redirect = 0', $filterredir === 'nonredirects');
+               if (!$this->addWhereIf('page_is_redirect = 1', $filterredir === 'redirects'))
+                       $this->addWhereIf('page_is_redirect = 0', $filterredir === 'nonredirects');
                $this->addWhereFld('page_namespace', $namespace);
                if (isset ($from))
                        $this->addWhere('page_title>=' . $db->addQuotes(ApiQueryBase :: titleToKey($from)));
@@ -62,22 +68,27 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                        $this->addWhere("page_title LIKE '{$db->strencode(ApiQueryBase :: titleToKey($prefix))}%'");
 
                if (is_null($resultPageSet)) {
-                       $this->addFields( array (
+                       $this->addFields(array (
                                'page_id',
                                'page_namespace',
                                'page_title'
                        ));
                } else {
-                       $this->addFields( $resultPageSet->getPageTableFields());
+                       $this->addFields($resultPageSet->getPageTableFields());
                }
 
-               $this->addOption( 'USE INDEX', 'name_title');
-               $this->addOption( 'LIMIT', $limit +1);
-               $this->addOption( 'ORDER BY', 'page_namespace, page_title');
+               $this->addOption('USE INDEX', 'name_title');
+               $this->addOption('LIMIT', $limit +1);
+               $this->addOption('ORDER BY', 'page_namespace, page_title');
+
+               wfProfileOut($this->getModuleProfileName() . '-parseParams');
+
+               $res = $this->select(__METHOD__);
+
+               wfProfileIn($this->getModuleProfileName() . '-saveResults');
 
                $data = array ();
                $count = 0;
-               $res = $this->select(__METHOD__);
                while ($row = $db->fetchObject($res)) {
                        if (++ $count > $limit) {
                                // We've reached the one extra which shows that there are additional pages to be had. Stop here...
@@ -85,18 +96,12 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                                break;
                        }
 
-                       $title = Title :: makeTitle($row->page_namespace, $row->page_title);
-                       // skip any pages that user has no rights to read
-                       if ($title->userCanRead()) {
-
-                               if (is_null($resultPageSet)) {
-                                       $id = intval($row->page_id);
-                                       $data[$id] = array (
-                                               'id' => $id,
-                                       'ns' => $title->getNamespace(), 'title' => $title->getPrefixedText());
-                               } else {
-                                       $resultPageSet->processDbRow($row);
-                               }
+                       if (is_null($resultPageSet)) {
+                               $vals = $this->addRowInfo('page', $row);
+                               if ($vals)
+                                       $data[intval($row->page_id)] = $vals;
+                       } else {
+                               $resultPageSet->processDbRow($row);
                        }
                }
                $db->freeResult($res);
@@ -106,16 +111,17 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                        $result->setIndexedTagName($data, 'p');
                        $result->addValue('query', $this->getModuleName(), $data);
                }
+
+               wfProfileOut($this->getModuleProfileName() . '-saveResults');
        }
 
        protected function getAllowedParams() {
-               $namespaces = $this->getQuery()->getValidNamespaces();
                return array (
                        'from' => null,
                        'prefix' => null,
                        'namespace' => array (
                                ApiBase :: PARAM_DFLT => 0,
-                               ApiBase :: PARAM_TYPE => $namespaces
+                               ApiBase :: PARAM_TYPE => 'namespace'
                        ),
                        'filterredir' => array (
                                ApiBase :: PARAM_DFLT => 'all',
@@ -166,4 +172,4 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                return __CLASS__ . ': $Id$';
        }
 }
-?>
\ No newline at end of file
+?>