Merge pull request googleapis#519 from ianbarber/master

Fix missing value errors to be more helpful in examples

Author: ianbarber

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 phpunit.xml
 composer.lock
 vendor

examples/batch.php

@@ -34,8 +34,9 @@
 $client->setApplicationName("Client_Library_Examples");
 $apiKey = "<YOUR_API_KEY>"; // Change to your API key.
 // Warn if the API key isn't changed!
-if ($apiKey == '<YOUR_API_KEY>') {
+if (strpos($apiKey, "<") !== false) {
   echo missingApiKeyWarning();
+  exit;
 } else {
   $client->setDeveloperKey($apiKey);
 

examples/fileupload.php

@@ -109,11 +109,9 @@
   fclose($handle);
 }
 echo pageHeader("File Upload - Uploading a large file");
-if (
-    $client_id == '<YOUR_CLIENT_ID>'
-    || $client_secret == '<YOUR_CLIENT_SECRET>'
-    || $redirect_uri == '<YOUR_REDIRECT_URI>') {
+if (strpos($client_id, "googleusercontent") == false) {
   echo missingClientSecretsWarning();
+  exit;
 }
 ?>
 <div class="box">

examples/idtoken.php

@@ -79,11 +79,9 @@ function. We store the resultant access token
 }
 
 echo pageHeader("User Query - Retrieving An Id Token");
-if (
-    $client_id == '<YOUR_CLIENT_ID>'
-    || $client_secret == '<YOUR_CLIENT_SECRET>'
-    || $redirect_uri == '<YOUR_REDIRECT_URI>') {
+if (strpos($client_id, "googleusercontent") == false) {
   echo missingClientSecretsWarning();
+  exit;
 }
 ?>
 <div class="box">

examples/multi-api.php

@@ -88,11 +88,9 @@
 }
 
 echo pageHeader("User Query - Multiple APIs");
-if (
-    $client_id == '<YOUR_CLIENT_ID>'
-    || $client_secret == '<YOUR_CLIENT_SECRET>'
-    || $redirect_uri == '<YOUR_REDIRECT_URI>') {
+if (strpos($client_id, "googleusercontent") == false) {
   echo missingClientSecretsWarning();
+  exit;
 }
 ?>
 <div class="box">

examples/service-account.php

@@ -41,10 +41,11 @@
 $key_file_location = ''; //key.p12
 
 echo pageHeader("Service Account Access");
-if ($client_id == '<YOUR_CLIENT_ID>'
+if (strpos($client_id, "googleusercontent") == false
     || !strlen($service_account_name)
     || !strlen($key_file_location)) {
   echo missingServiceAccountDetailsWarning();
+  exit;
 }
 
 $client = new Google_Client();

examples/simple-query.php

@@ -37,8 +37,9 @@
 $client->setApplicationName("Client_Library_Examples");
 $apiKey = "<YOUR_API_KEY>"; // Change this line.
 // Warn if the API key isn't changed.
-if ($apiKey == '<YOUR_API_KEY>') {
+if (strpos($apiKey, "<") !== false) {
   echo missingApiKeyWarning();
+  exit;
 }
 $client->setDeveloperKey($apiKey);
 

examples/simplefileupload.php

@@ -96,11 +96,9 @@
 }
 
 echo pageHeader("File Upload - Uploading a small file");
-if (
-    $client_id == '<YOUR_CLIENT_ID>'
-    || $client_secret == '<YOUR_CLIENT_SECRET>'
-    || $redirect_uri == '<YOUR_REDIRECT_URI>') {
+if (strpos($client_id, "googleusercontent") == false) {
   echo missingClientSecretsWarning();
+  exit;
 }
 ?>
 <div class="box">

examples/templates/base.php

@@ -52,7 +52,7 @@ function missingApiKeyWarning()
       </h3>";
   } else {
     $ret = "Warning: You need to set a Simple API Access key from the Google API console:";
-    $ret .= "\nhttp://developers.google.com/console";
+    $ret .= "\nhttp://developers.google.com/console\n";
   }
   return $ret;
 }
@@ -68,7 +68,7 @@ function missingClientSecretsWarning()
       </h3>";
   } else {
     $ret = "Warning: You need to set Client ID, Client Secret and Redirect URI from the";
-    $ret .= "Google API console:\nhttp://developers.google.com/console";
+    $ret .= " Google API console:\nhttp://developers.google.com/console\n";
   }
   return $ret;
 }
@@ -84,7 +84,7 @@ function missingServiceAccountDetailsWarning()
       </h3>";
   } else {
     $ret = "Warning: You need to set Client ID, Email address and the location of the Key from the";
-    $ret .= "Google API console:\nhttp://developers.google.com/console";
+    $ret .= " Google API console:\nhttp://developers.google.com/console\n";
   }
   return $ret;
 }

examples/user-example.php

@@ -98,11 +98,9 @@ function. We store the resultant access token
 }
 
 echo pageHeader("User Query - URL Shortener");
-if (
-    $client_id == '<YOUR_CLIENT_ID>'
-    || $client_secret == '<YOUR_CLIENT_SECRET>'
-    || $redirect_uri == '<YOUR_REDIRECT_URI>') {
+if (strpos($client_id, "googleusercontent") == false) {
   echo missingClientSecretsWarning();
+  exit;
 }
 ?>
 <div class="box">