Remove more contractions

[quix0rs-gnu-social.git] / actions / twitapisearchatom.php

diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 708b1494d1e54cc9ff498150d4d323e390be8df9..511d7cdc66ac3efb6d614c28bed9840325d52029 100644 (file)
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Action for showing Twitter-like Atom search results
  *
@@ -20,18 +20,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Search
- * @package   Laconica
- * @author    Zach Copley <zach@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Action for outputting search results in Twitter compatible Atom
@@ -41,15 +41,15 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * RSS10Action.
  *
  * @category Search
- * @package  Laconica
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * @see      TwitterapiAction
+ * @see      ApiAction
  */
 
-class TwitapisearchatomAction extends TwitterapiAction
+class TwitapisearchatomAction extends ApiAction
 {
 
     var $cnt;
@@ -172,6 +172,7 @@ class TwitapisearchatomAction extends TwitterapiAction
         }
 
         $cnt = 0;
+        $this->max_id = 0;
 
         if ($this->cnt > 0) {
             while ($notice->fetch()) {
@@ -226,7 +227,7 @@ class TwitapisearchatomAction extends TwitterapiAction
         $server   = common_config('site', 'server');
         $sitename = common_config('site', 'name');
 
-        // XXX: Use xmlns:laconica instead?
+        // XXX: Use xmlns:statusnet instead?
 
         $this->elementStart('feed',
             array('xmlns' => 'http://www.w3.org/2005/Atom',
@@ -249,7 +250,7 @@ class TwitapisearchatomAction extends TwitterapiAction
         }
 
         // FIXME: this alternate link is not quite right because our
-        // web-based notice search doesn't support a rpp (responses per
+        // web-based notice search does not support a rpp (responses per
         // page) param yet
 
         $this->element('link', array('type' => 'text/html',
@@ -339,7 +340,7 @@ class TwitapisearchatomAction extends TwitterapiAction
         // TODO: Here is where we'd put in a link to an atom feed for threads
 
         $this->element("twitter:source", null,
-            htmlentities($this->source_link($notice->source)));
+            htmlentities($this->sourceLink($notice->source)));
 
         $this->elementStart('author');