Fix Gadget API-Do not echo stuff to wikipedia

Page.php

@@ -91,12 +91,6 @@ public function expand_text() {
       return FALSE;
     }
 
-    //this is set to -1 only in [erstwhile file?] text.php, because there's no need to output
-    // a buffer of text for the citation-expander gadget
-    if (HTML_OUTPUT === -1) {
-      ob_start();
-    }
-
     // COMMENTS //
     $comments = $this->extract_object('Comment');
     $nowiki   = $this->extract_object('Nowiki');
@@ -135,11 +129,6 @@ public function expand_text() {
 
     $this->replace_object($comments);
     $this->replace_object($nowiki);
-
-    // seems to be set as -1  in text.php and then re-set
-    if (HTML_OUTPUT === -1) {
-      ob_end_clean();
-    }
 
     return strcasecmp($this->text, $this->start_text) != 0;
   }

README.md

@@ -29,8 +29,7 @@ Bugs and requested changes are listed here: https://en.wikipedia.org/wiki/User_t
 ## Structure
 
 Basic structure of a Citation bot script:
-* define configuration constants (for instance, `html_output` will allow or suppress
-  buffered output)
+* define configuration constants
 * require `expandFns.php`, which will set up the rest of the needed functions
 * use Page functions to fetch/expand/post the page's text
 

gadgetapi.php

@@ -2,9 +2,12 @@
 header("Access-Control-Allow-Origin: *"); //This is ok because the API is not authenticated
 header("Content-Type: text/json");
 
-//Configure setting to suppress buffered output
-define("HTML_OUTPUT", -1);
+// This code is not tested, but we have a copy of this code in the tests
 
+// This is needed because the Gadget API expects only JSON back
+// ALL output from the citation bot is throw away
+ob_start();
+
 //Set up tool requirements
 require_once __DIR__ . '/expandFns.php';
 
@@ -27,4 +30,7 @@
   'editsummary' => $editSummary,
 );
 
-echo json_encode($result);
+// Throw away all output
+ob_end_clean();
+
+echo json_encode($result);  // On error returns "FALSE", which makes echo print nothing.  Thus we do not have to check for FALSE

tests/phpunit/TemplateTest.php

@@ -564,6 +564,30 @@ public function testConvertJournalToBook() {
        $this->assertEquals('cite book', $expanded->wikiname());
    }
 
+   public function testGadgetAPI() {
+       // This does not really test API right now, but it does emulate it without firing up a webserver etc.
+       $originalText = 'This is a page.  {{Cite web|website=apple.com/phones/buy_android}}.  Indeed it is';
+       $editSummary  = 'I made this page';
+
+       $page = new Page();
+       $page->text = $originalText;
+       $page->start_text = $originalText; // Only in test environment.  Not in GadgetAPI
+       $page->expand_text();
+
+       //Modify edit summary to identify bot-assisted edits
+       if ($editSummary) {
+          $editSummary .= " | ";
+       }
+       $editSummary .= "[[WP:UCB|Assisted by Citation bot]]";
+
+       $result = array(
+           'expandedtext' => $page->text,
+           'editsummary' => $editSummary,
+       );
+       $expanded = json_encode($result);
+       $this->assertEquals('{"expandedtext":"This is a page.  {{Cite web|url=http:\/\/apple.com\/phones\/buy_android}}.  Indeed it is","editsummary":"I made this page | [[WP:UCB|Assisted by Citation bot]]"}',$expanded);
+   }
+
    public function testPagesDash() {
        $text = '{{cite journal|pages=1-2|title=do change}}';
        $expanded = $this->process_citation($text);