enwikipedia-acc / waca

includes/Tasks/JsonApiPageBase.php

Indentation +53 added lines, -53 removed lines

@@ -14,68 +14,68 @@
 
 abstract class JsonApiPageBase extends ApiPageBase implements IJsonApiAction
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     *
-     * @return void
-     * @throws ApiException
-     */
-    final protected function main()
-    {
-        if (headers_sent()) {
-            throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
-        }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 *
+	 * @return void
+	 * @throws ApiException
+	 */
+	final protected function main()
+	{
+		if (headers_sent()) {
+			throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
+		}
 
-        // javascript access control
-        $httpOrigin = WebRequest::origin();
+		// javascript access control
+		$httpOrigin = WebRequest::origin();
 
-        if ($httpOrigin !== null) {
-            $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
+		if ($httpOrigin !== null) {
+			$CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
 
-            if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
-            }
-        }
+			if (in_array($httpOrigin, $CORSallowed)) {
+				header("Access-Control-Allow-Origin: " . $httpOrigin);
+			}
+		}
 
-        $responseData = $this->runApiPage();
+		$responseData = $this->runApiPage();
 
-        ob_end_clean();
-        print($responseData);
-        ob_start();
-    }
+		ob_end_clean();
+		print($responseData);
+		ob_start();
+	}
 
-    /**
-     * Method that runs API action
-     *
-     * @return object|array The modified API document
-     */
-    public abstract function executeApiAction();
+	/**
+	 * Method that runs API action
+	 *
+	 * @return object|array The modified API document
+	 */
+	public abstract function executeApiAction();
 
-    /**
-     * @return string
-     */
-    final public function runApiPage()
-    {
+	/**
+	 * @return string
+	 */
+	final public function runApiPage()
+	{
 
-        try {
-            $apiDocument = $this->executeApiAction();
-        }
-        catch (ApiException $ex) {
-            $apiDocument = [
-                'error' => $ex->getMessage(),
-            ];
-        }
+		try {
+			$apiDocument = $this->executeApiAction();
+		}
+		catch (ApiException $ex) {
+			$apiDocument = [
+				'error' => $ex->getMessage(),
+			];
+		}
 
-        $data = json_encode($apiDocument, JSON_UNESCAPED_UNICODE);
+		$data = json_encode($apiDocument, JSON_UNESCAPED_UNICODE);
 
-        $targetVar = WebRequest::getString('targetVariable');
-        if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
-            $data = $targetVar . ' = ' . $data . ';';
-            header("Content-Type: text/javascript");
-        } else {
-            header("Content-Type: application/json");
-        }
+		$targetVar = WebRequest::getString('targetVariable');
+		if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
+			$data = $targetVar . ' = ' . $data . ';';
+			header("Content-Type: text/javascript");
+		} else {
+			header("Content-Type: application/json");
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
             $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
 
             if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
+                header("Access-Control-Allow-Origin: ".$httpOrigin);
             }
         }
 
@@ -70,7 +70,7 @@ 
 
         $targetVar = WebRequest::getString('targetVariable');
         if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
-            $data = $targetVar . ' = ' . $data . ';';
+            $data = $targetVar.' = '.$data.';';
             header("Content-Type: text/javascript");
         } else {
             header("Content-Type: application/json");

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
         if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
             $data = $targetVar . ' = ' . $data . ';';
             header("Content-Type: text/javascript");
-        } else {
+        }
+        else {
             header("Content-Type: application/json");
         }