Merge pull request #1 from styladev/986N_offsetParam404

schnubor · web-flow · commit cc58bffdf2e4 · 2016-10-25T12:09:50.000+02:00
#986N added offset parameter to SEO API request and 404 for non exist…
diff --git a/README.md b/README.md
@@ -5,13 +5,17 @@ This is an example implementation for fetching SEO content for a Styla magazine
 
 ## GET IT RUNNING
 
-In order to run the example locally on your machine you need a local server that supports PHP. To get a server like this you can utilize common software like e.g. [MAMP](https://www.mamp.info/en/downloads/) which will serve as a reference for this guide.
+#### Option A
 
-Download this repository as [a zip file](https://github.com/styladev/php-sdk/archive/master.zip) or clone and extract it. Once MAMP is installed and running, place all extracted files in the “htdocs” directory. Alternatively you can change the path to the extracted `index.php` within the MAMP settings.
+Clone this repository or download and extract it as [a zip file](https://github.com/styladev/php-sdk/archive/master.zip). Open a terminal window and change directory to the cloned directory containing the `index.php` file. Run `php -S localhost:8000` to ramp up a local PHP server. You should now be able to navigate to http://localhost:8000/ in your browser.
+
+#### Option B
+
+Another way to get a server like this running you can utilize common software like e.g. [MAMP](https://www.mamp.info/en/downloads/) which will serve as a reference for this guide. Once MAMP is installed and running, place all extracted files in the “htdocs” directory. Alternatively you can change the path to the extracted `index.php` within the MAMP settings.
 
 ---
 
-As an example for this README we are going to use "Kiveda" as an client:
+As an example for this README we are going to use "Kiveda" as an client and use MAMP for our local server:
 
 * If your magazine is using a specific rootpath (e.g. /magazin is the rootpath for Kiveda) create new folder within htdocs named after that rootpath and place all files except the .htaccess in there:
 
diff --git a/seo.php b/seo.php
@@ -19,9 +19,18 @@
     $key = array_key_exists("origUrl", $_REQUEST) ? $_REQUEST["origUrl"] : "/";
 }
 else{
+    // Extract path and query information from current URL
     $url = parse_url($_SERVER['REQUEST_URI']);
     $path = $url['path'];
+    $query = isset($url['query']) ? $url['query'] : "";
+
+    // search for rootpath in $path and remove it
     $key = str_replace("/".$config['rootpath'], "", $path);
+
+    // Append ?offset parameter if set
+    if (strpos($query, 'offset=') !== false) {
+        $key .= '?'.$query;
+    }
 }
 
 // escapes the key string
@@ -43,7 +52,6 @@ function fetchFromSeoApi($key, $url){
         	if(isset($SEO_json->status)){
                 // check if response code is 2XX
             	if(substr((string)$SEO_json->status, 0, 1) == '2'){
-
                 	// extract caching duration and SEO information from JSON
                 	$data["expire"] = isset($SEO_json->expire) ? $SEO_json->expire / 60 : 60; // in s
                     $data["head"] = isset($SEO_json->html->head) ? $SEO_json->html->head : "";
@@ -55,7 +63,10 @@ function fetchFromSeoApi($key, $url){
 
                     // return JSON to use it in index.php
                     return $SEO_json;
-            	}
+            	} else {
+                    // non existent pages/sites should return 404
+                    header("HTTP/1.0 404 Not Found");
+                }
             }
         }
     }
@@ -70,10 +81,10 @@ function fetchFromSeoApi($key, $url){
     $SEO_json = fetchFromSeoApi($key, $url);
 
     // Set SEO <head> information for index.php
-    $SEO_head = $SEO_json->html->head;
+    $SEO_head = isset($SEO_json->html->head) ? $SEO_json->html->head : "";
 
     // set SEO <body> information for index.php
-    $SEO_body = $SEO_json->html->body;
+    $SEO_body = isset($SEO_json->html->body) ? $SEO_json->html->body : "";
 }
 else{
     $debug_cache = "true";
