* ignorewarnings fixes

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

diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php
index 452b9ec..0f6e6bc 100644 (file)
--- a/includes/api/ApiQueryAllLinks.php
+++ b/includes/api/ApiQueryAllLinks.php
@@ -74,41 +74,44 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
                        $arr = explode('|', $params['continue']);
                        if(count($arr) != 2)
                                $this->dieUsage("Invalid continue parameter", 'badcontinue');
-                       $params['from'] = $arr[0]; // Handled later
+                       $from = $this->getDB()->strencode($this->titleToKey($arr[0]));
                        $id = intval($arr[1]);
-                       $this->addWhere("pl_from >= $id");
+                       $this->addWhere("pl_title > '$from' OR " .
+                                       "(pl_title = '$from' AND " .
+                                       "pl_from > $id)");
                }               
 
                if (!is_null($params['from']))
-                       $this->addWhere('pl_title>=' . $db->addQuotes($this->titleToKey($params['from'])));
+                       $this->addWhere('pl_title>=' . $db->addQuotes($this->titlePartToKey($params['from'])));
                if (isset ($params['prefix']))
-                       $this->addWhere("pl_title LIKE '" . $db->escapeLike($this->titleToKey($params['prefix'])) . "%'");
+                       $this->addWhere("pl_title LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
-               if (is_null($resultPageSet)) {
-                       $this->addFields(array (
-                               'pl_namespace',
-                               'pl_title',
-                               'pl_from'
-                       ));
-               } else {
-                       $this->addFields('pl_from');
-                       $pageids = array();
-               }
+               $this->addFields(array (
+                       'pl_title',
+               ));
+               $this->addFieldsIf('pl_from', !$params['unique']);
 
                $this->addOption('USE INDEX', 'pl_namespace');
                $limit = $params['limit'];
                $this->addOption('LIMIT', $limit+1);
-               $this->addOption('ORDER BY', 'pl_title');
+               if($params['unique'])
+                       $this->addOption('ORDER BY', 'pl_title');
+               else
+                       $this->addOption('ORDER BY', 'pl_title, pl_from');
 
                $res = $this->select(__METHOD__);
 
-               $data = array ();
+               $pageids = array ();
                $count = 0;
+               $result = $this->getResult();
                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...
                                // TODO: Security issue - if the user has no right to view next title, it will still be shown
-                               $this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from);
+                               if($params['unique'])
+                                       $this->setContinueEnumParameter('from', $this->keyToTitle($row->pl_title));
+                               else
+                                       $this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from);
                                break;
                        }
 
@@ -117,11 +120,18 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
                                if ($fld_ids)
                                        $vals['fromid'] = intval($row->pl_from);
                                if ($fld_title) {
-                                       $title = Title :: makeTitle($row->pl_namespace, $row->pl_title);
-                                       $vals['ns'] = intval($title->getNamespace());
-                                       $vals['title'] = $title->getPrefixedText();
+                                       $title = Title :: makeTitle($params['namespace'], $row->pl_title);
+                                       ApiQueryBase::addTitleInfo($vals, $title);
+                               }
+                               $fit = $result->addValue(array('query', $this->getModuleName()), null, $vals);
+                               if(!$fit)
+                               {
+                                       if($params['unique'])
+                                               $this->setContinueEnumParameter('from', $this->keyToTitle($row->pl_title));
+                                       else
+                                               $this->setContinueEnumParameter('continue', $this->keyToTitle($row->pl_title) . "|" . $row->pl_from);
+                                       break;
                                }
-                               $data[] = $vals;
                        } else {
                                $pageids[] = $row->pl_from;
                        }
@@ -129,9 +139,7 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
                $db->freeResult($res);
 
                if (is_null($resultPageSet)) {
-                       $result = $this->getResult();
-                       $result->setIndexedTagName($data, 'l');
-                       $result->addValue('query', $this->getModuleName(), $data);
+                       $result->setIndexedTagName_internal(array('query', $this->getModuleName()), 'l');
                } else {
                        $resultPageSet->populateFromPageIDs($pageids);
                }
@@ -172,7 +180,8 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
                        'unique' => 'Only show unique links. Cannot be used with generator or prop=ids',
                        'prop' => 'What pieces of information to include',
                        'namespace' => 'The namespace to enumerate.',
-                       'limit' => 'How many total links to return.'
+                       'limit' => 'How many total links to return.',
+                       'continue' => 'When more results are available, use this to continue.',
                );
        }
 
@@ -189,4 +198,4 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }
-}
+}
\ No newline at end of file