TheRakeshPurohit / rtCamp

unlink_directory.php

Spacing +7 added lines, -7 removed lines

@@ -1,16 +1,16 @@
 <?php
 class unlink_directory {
 	
-    function remove_directory( $directory ) {
-        if ( isset( $directory ) ) {
-            foreach ( glob( "{$directory}/*" ) as $file ) {
-                if ( is_dir( $file ) ) { 
-                    $this->remove_directory( $file );
+    function remove_directory($directory) {
+        if (isset($directory)) {
+            foreach (glob("{$directory}/*") as $file) {
+                if (is_dir($file)) { 
+                    $this->remove_directory($file);
                 } else {
-                    unlink( $file );
+                    unlink($file);
                 }
             }
-            rmdir( $directory );
+            rmdir($directory);
         }
     }
 }
\ No newline at end of file

zipper.php

Indentation +167 added lines, -167 removed lines

@@ -6,195 +6,195 @@
 
 class zipper {
 
-	public function LoadZipFiles($source) {
+    public function LoadZipFiles($source) {
 
-		if (!file_exists($source)) {
-			return false;
-		}
+        if (!file_exists($source)) {
+            return false;
+        }
 
-		$source = str_replace('\\', '/', realpath($source));
+        $source = str_replace('\\', '/', realpath($source));
 
-		$a = array();
+        $a = array();
 
-		if (is_dir($source) === true) {
-			$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
+        if (is_dir($source) === true) {
+            $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
 
-			foreach ($files as $file) {
-				$file = str_replace('\\', '/', $file);
+            foreach ($files as $file) {
+                $file = str_replace('\\', '/', $file);
 
-				// Ignore "." and ".." folders
-				if (in_array(substr($file, strrpos($file, '/') + 1), array('.', '..')))
-					continue;
+                // Ignore "." and ".." folders
+                if (in_array(substr($file, strrpos($file, '/') + 1), array('.', '..')))
+                    continue;
 
-				$file = realpath($file);
+                $file = realpath($file);
 
-				if (is_dir($file) === true) {
-					$a[] = array(
-						'type' => 'dir',
-						'source' => str_replace($source . '/', '', $file . '/'),
-						'file' => $file,
-						'size' => 0
-					);
-				} else if (is_file($file) === true) {
-					$src = str_replace($source . '/', '', $file);
-					$size = filesize($file);
+                if (is_dir($file) === true) {
+                    $a[] = array(
+                        'type' => 'dir',
+                        'source' => str_replace($source . '/', '', $file . '/'),
+                        'file' => $file,
+                        'size' => 0
+                    );
+                } else if (is_file($file) === true) {
+                    $src = str_replace($source . '/', '', $file);
+                    $size = filesize($file);
 
-					$a[] = array(
-						'type' => 'file',
-						'source' => $src,
-						'file' => $file,
-						'size' => false != $size ? $size : 16000 // this is fallback in case no size
-					);
-				}
-			}
-		}
+                    $a[] = array(
+                        'type' => 'file',
+                        'source' => $src,
+                        'file' => $file,
+                        'size' => false != $size ? $size : 16000 // this is fallback in case no size
+                    );
+                }
+            }
+        }
 
-		return $a;
-	}
+        return $a;
+    }
 
-	public function ProcessZip($foldercontent, $folder, $maxsize) {
+    public function ProcessZip($foldercontent, $folder, $maxsize) {
 
-		$split = array();
+        $split = array();
 
-		$splits = 1;
-		$t = 0;
+        $splits = 1;
+        $t = 0;
 
-		// Determine how many zip files to create
-		if ( isset( $foldercontent ) ) {
-			foreach ($foldercontent as $entry) {
+        // Determine how many zip files to create
+        if ( isset( $foldercontent ) ) {
+            foreach ($foldercontent as $entry) {
 	
-				$t = $t + $entry['size'];
+                $t = $t + $entry['size'];
 	
-				if ($entry['type'] == 'dir') {
-					$lastdir = $entry;
-				}
+                if ($entry['type'] == 'dir') {
+                    $lastdir = $entry;
+                }
 	
-				if ($t >= $maxsize) {
-					$splits++;
-					$t = 0;
-					// create lastdir in next archive, in case files still exist
-					// even if the next file is not in this archive it doesn't hurt
-					if ($lastdir !== '') {
-						$split[$splits][] = $lastdir;
-					}
-				}
+                if ($t >= $maxsize) {
+                    $splits++;
+                    $t = 0;
+                    // create lastdir in next archive, in case files still exist
+                    // even if the next file is not in this archive it doesn't hurt
+                    if ($lastdir !== '') {
+                        $split[$splits][] = $lastdir;
+                    }
+                }
 	
-				$split[$splits][] = $entry;
-			}
+                $split[$splits][] = $entry;
+            }
 	
-			// delete the $foldercontent array
-			unset($foldercontent);
+            // delete the $foldercontent array
+            unset($foldercontent);
 	
-			// Create the folder to put the zip files in
-			$date = new DateTime();
-			$tS = $date->format('YmdHis');
+            // Create the folder to put the zip files in
+            $date = new DateTime();
+            $tS = $date->format('YmdHis');
 	
-			// Process the splits
-			foreach ($split as $idx => $sp) {
+            // Process the splits
+            foreach ($split as $idx => $sp) {
 				
-				// create the zip file
-	
-				$zip = new ZipArchive();
-	
-				$destination = $folder . '.zip';
-	
-				if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
-					return false;
-				}
-	
-				$i = 1;
-				$dir = "";
-				foreach ($sp as $entry) {
-					if ($entry['type'] === 'dir') {
-						$dir = explode('\\', $entry['file']);
-						$zip->addEmptyDir(end($dir));
-					} else {
-						$zip->addFromString(end($dir).'/'.$i.'.jpg', file_get_contents($entry['file']));
-						$i++;
-					}
-				}
-				$zip->close();
-			}
-			return array(
-				'splits' => count($split),
-				'foldername' => ''
-			);
-		}
-	}
-
-	public function getMemoryLimit() {
-		$memory_limit = ini_get('memory_limit');
-
-		if (preg_match('/^(\d+)(.)$/', $memory_limit, $matches)) {
-			if ($matches[2] == 'M') {
-				$memory_limit = $matches[1] * 1024 * 1024; // nnnM -> nnn MB
-			} else if ($matches[2] == 'K') {
-				$memory_limit = $matches[1] * 1024; // nnnK -> nnn KB
-			}
-		}
-
-		return $memory_limit;
-	}
-
-	public function make_zip($album_download_directory) {
-		$zipfilename = "";
-		if ( isset( $album_download_directory) ) {
-			//$zipfilename = 'libs/resources'.DIRECTORY_SEPARATOR.'albums'.DIRECTORY_SEPARATOR.'fb-album_'.date("Y-m-d").'_'.date("H-i-s");
-			$zipfilename = 'lib/resources/albums/fb-album_'.date("Y-m-d").'_'.date("H-i-s");
-	
-			// name of folder starting from the root of the webserver
-			// as in Wordpress /wp-content/themes/ (end on backslash)
-	
-	
-			$folder = dirname($_SERVER['PHP_SELF']).'/'.$album_download_directory;
-	
-			// Server Root
-			$root = $_SERVER["DOCUMENT_ROOT"];
-	
-			// source of the folder to unpack
-			$sourcedir = $root . $folder; // target directory
-	
-			// Don't use more than half the memory limit
-			$memory_limit = $this->getMemoryLimit();
-			$maxsize = $memory_limit / 2;
-	
-			// Is zipping possible on the server ?
-			if (!extension_loaded('zip')) {
-				echo 'Zipping not possible on this server';
-				exit;
-			}
-	
-			// Get the files to zip
-			$foldercontent = $this->LoadZipFiles($sourcedir);
-			if ($foldercontent === false) {
-				echo 'Something went wrong gathering the file entries';
-				exit;
-			}
-	
-			// Process the files to zip
-			$zip = $this->ProcessZip($foldercontent, $zipfilename, $maxsize);
-			if ($zip === false) {
-				echo 'Something went wrong zipping the files';
-			}
+                // create the zip file
+	
+                $zip = new ZipArchive();
+	
+                $destination = $folder . '.zip';
+	
+                if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
+                    return false;
+                }
+	
+                $i = 1;
+                $dir = "";
+                foreach ($sp as $entry) {
+                    if ($entry['type'] === 'dir') {
+                        $dir = explode('\\', $entry['file']);
+                        $zip->addEmptyDir(end($dir));
+                    } else {
+                        $zip->addFromString(end($dir).'/'.$i.'.jpg', file_get_contents($entry['file']));
+                        $i++;
+                    }
+                }
+                $zip->close();
+            }
+            return array(
+                'splits' => count($split),
+                'foldername' => ''
+            );
+        }
+    }
+
+    public function getMemoryLimit() {
+        $memory_limit = ini_get('memory_limit');
+
+        if (preg_match('/^(\d+)(.)$/', $memory_limit, $matches)) {
+            if ($matches[2] == 'M') {
+                $memory_limit = $matches[1] * 1024 * 1024; // nnnM -> nnn MB
+            } else if ($matches[2] == 'K') {
+                $memory_limit = $matches[1] * 1024; // nnnK -> nnn KB
+            }
+        }
+
+        return $memory_limit;
+    }
+
+    public function make_zip($album_download_directory) {
+        $zipfilename = "";
+        if ( isset( $album_download_directory) ) {
+            //$zipfilename = 'libs/resources'.DIRECTORY_SEPARATOR.'albums'.DIRECTORY_SEPARATOR.'fb-album_'.date("Y-m-d").'_'.date("H-i-s");
+            $zipfilename = 'lib/resources/albums/fb-album_'.date("Y-m-d").'_'.date("H-i-s");
+	
+            // name of folder starting from the root of the webserver
+            // as in Wordpress /wp-content/themes/ (end on backslash)
+	
+	
+            $folder = dirname($_SERVER['PHP_SELF']).'/'.$album_download_directory;
+	
+            // Server Root
+            $root = $_SERVER["DOCUMENT_ROOT"];
+	
+            // source of the folder to unpack
+            $sourcedir = $root . $folder; // target directory
+	
+            // Don't use more than half the memory limit
+            $memory_limit = $this->getMemoryLimit();
+            $maxsize = $memory_limit / 2;
+	
+            // Is zipping possible on the server ?
+            if (!extension_loaded('zip')) {
+                echo 'Zipping not possible on this server';
+                exit;
+            }
+	
+            // Get the files to zip
+            $foldercontent = $this->LoadZipFiles($sourcedir);
+            if ($foldercontent === false) {
+                echo 'Something went wrong gathering the file entries';
+                exit;
+            }
+	
+            // Process the files to zip
+            $zip = $this->ProcessZip($foldercontent, $zipfilename, $maxsize);
+            if ($zip === false) {
+                echo 'Something went wrong zipping the files';
+            }
 			
-			// clear the stat cache (created by filesize command)
-			clearstatcache();
+            // clear the stat cache (created by filesize command)
+            clearstatcache();
 			
-			require_once( 'unlink_directory.php' );
-			$unlink_directory = new unlink_directory();
-			$unlink_directory->remove_directory( $album_download_directory );
-		}
-		return $zipfilename;
-	}
-
-	public function get_zip( $album_download_directory ) {
-		$response = '<span style="color: #ffffff;">Sorry due to some reasons albums cannot be downloaded.</span>';
-		if ( isset( $album_download_directory ) ) {
-			$zip_folder = $this->make_zip( $album_download_directory );
-			if ( !empty( $zip_folder ) ) {
-				$response = '<a href="' . $zip_folder . '.zip" id="download-link" class="btn btn-success link-buttons-border-color" >Download Zip Folder</a>';
-			}
-		}
-		return $response;
-	}
+            require_once( 'unlink_directory.php' );
+            $unlink_directory = new unlink_directory();
+            $unlink_directory->remove_directory( $album_download_directory );
+        }
+        return $zipfilename;
+    }
+
+    public function get_zip( $album_download_directory ) {
+        $response = '<span style="color: #ffffff;">Sorry due to some reasons albums cannot be downloaded.</span>';
+        if ( isset( $album_download_directory ) ) {
+            $zip_folder = $this->make_zip( $album_download_directory );
+            if ( !empty( $zip_folder ) ) {
+                $response = '<a href="' . $zip_folder . '.zip" id="download-link" class="btn btn-success link-buttons-border-color" >Download Zip Folder</a>';
+            }
+        }
+        return $response;
+    }
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
 		$t = 0;
 
 		// Determine how many zip files to create
-		if ( isset( $foldercontent ) ) {
+		if (isset($foldercontent)) {
 			foreach ($foldercontent as $entry) {
 	
 				$t = $t + $entry['size'];
@@ -109,7 +109,7 @@ 
 						$dir = explode('\\', $entry['file']);
 						$zip->addEmptyDir(end($dir));
 					} else {
-						$zip->addFromString(end($dir).'/'.$i.'.jpg', file_get_contents($entry['file']));
+						$zip->addFromString(end($dir) . '/' . $i . '.jpg', file_get_contents($entry['file']));
 						$i++;
 					}
 				}
@@ -138,15 +138,15 @@ 
 
 	public function make_zip($album_download_directory) {
 		$zipfilename = "";
-		if ( isset( $album_download_directory) ) {
+		if (isset($album_download_directory)) {
 			//$zipfilename = 'libs/resources'.DIRECTORY_SEPARATOR.'albums'.DIRECTORY_SEPARATOR.'fb-album_'.date("Y-m-d").'_'.date("H-i-s");
-			$zipfilename = 'lib/resources/albums/fb-album_'.date("Y-m-d").'_'.date("H-i-s");
+			$zipfilename = 'lib/resources/albums/fb-album_' . date("Y-m-d") . '_' . date("H-i-s");
 	
 			// name of folder starting from the root of the webserver
 			// as in Wordpress /wp-content/themes/ (end on backslash)
 	
 	
-			$folder = dirname($_SERVER['PHP_SELF']).'/'.$album_download_directory;
+			$folder = dirname($_SERVER['PHP_SELF']) . '/' . $album_download_directory;
 	
 			// Server Root
 			$root = $_SERVER["DOCUMENT_ROOT"];
@@ -180,18 +180,18 @@ 
 			// clear the stat cache (created by filesize command)
 			clearstatcache();
 			
-			require_once( 'unlink_directory.php' );
+			require_once('unlink_directory.php');
 			$unlink_directory = new unlink_directory();
-			$unlink_directory->remove_directory( $album_download_directory );
+			$unlink_directory->remove_directory($album_download_directory);
 		}
 		return $zipfilename;
 	}
 
-	public function get_zip( $album_download_directory ) {
+	public function get_zip($album_download_directory) {
 		$response = '<span style="color: #ffffff;">Sorry due to some reasons albums cannot be downloaded.</span>';
-		if ( isset( $album_download_directory ) ) {
-			$zip_folder = $this->make_zip( $album_download_directory );
-			if ( !empty( $zip_folder ) ) {
+		if (isset($album_download_directory)) {
+			$zip_folder = $this->make_zip($album_download_directory);
+			if (!empty($zip_folder)) {
 				$response = '<a href="' . $zip_folder . '.zip" id="download-link" class="btn btn-success link-buttons-border-color" >Download Zip Folder</a>';
 			}
 		}

Braces +3 added lines, -2 removed lines

@@ -23,8 +23,9 @@
 				$file = str_replace('\\', '/', $file);
 
 				// Ignore "." and ".." folders
-				if (in_array(substr($file, strrpos($file, '/') + 1), array('.', '..')))
-					continue;
+				if (in_array(substr($file, strrpos($file, '/') + 1), array('.', '..'))) {
+									continue;
+				}
 
 				$file = realpath($file);
 

index.php

Indentation +9 added lines, -9 removed lines

@@ -3,13 +3,13 @@
 require_once 'appconfig.php';
 
 $fb = new Facebook\Facebook([
-  'app_id' => $appId, // variable with Facebook App ID
-  'app_secret' => $appSecret,
-  'default_graph_version' => 'v3.3',
-  ]);
-  $helper = $fb->getRedirectLoginHelper();  
-  $permissions = ['email','user_photos','user_videos','user_posts','user_link','user_status','user_link']; // Optional permissions
-  $loginUrl = $helper->getLoginUrl($CallbackUrl,$permissions);
+    'app_id' => $appId, // variable with Facebook App ID
+    'app_secret' => $appSecret,
+    'default_graph_version' => 'v3.3',
+    ]);
+    $helper = $fb->getRedirectLoginHelper();  
+    $permissions = ['email','user_photos','user_videos','user_posts','user_link','user_status','user_link']; // Optional permissions
+    $loginUrl = $helper->getLoginUrl($CallbackUrl,$permissions);
   
-  echo "<h3> Connect Clicking Below Facebook Icon Using Your Facebook Account.<h3>";
-  echo '<a href="' .htmlspecialchars($loginUrl).'"><img alt="Login With Facebook" src="images/fb_icon.png"></a>';
\ No newline at end of file
+    echo "<h3> Connect Clicking Below Facebook Icon Using Your Facebook Account.<h3>";
+    echo '<a href="' .htmlspecialchars($loginUrl).'"><img alt="Login With Facebook" src="images/fb_icon.png"></a>';
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@
   'default_graph_version' => 'v3.3',
   ]);
   $helper = $fb->getRedirectLoginHelper();  
-  $permissions = ['email','user_photos','user_videos','user_posts','user_link','user_status','user_link']; // Optional permissions
-  $loginUrl = $helper->getLoginUrl($CallbackUrl,$permissions);
+  $permissions = ['email', 'user_photos', 'user_videos', 'user_posts', 'user_link', 'user_status', 'user_link']; // Optional permissions
+  $loginUrl = $helper->getLoginUrl($CallbackUrl, $permissions);
   
   echo "<h3> Connect Clicking Below Facebook Icon Using Your Facebook Account.<h3>";
-  echo '<a href="' .htmlspecialchars($loginUrl).'"><img alt="Login With Facebook" src="images/fb_icon.png"></a>';
\ No newline at end of file
+  echo '<a href="' . htmlspecialchars($loginUrl) . '"><img alt="Login With Facebook" src="images/fb_icon.png"></a>';
\ No newline at end of file

fb-callback.php

Indentation +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
 session_start();
 require_once 'appconfig.php';
 $fb = new Facebook\Facebook([
-  'app_id' => $appId, // variable with Facebook App ID
-  'app_secret' => $appSecret,
-  'default_graph_version' => 'v3.3',
-  ]);
+    'app_id' => $appId, // variable with Facebook App ID
+    'app_secret' => $appSecret,
+    'default_graph_version' => 'v3.3',
+    ]);
 $helper = $fb->getRedirectLoginHelper();
 try {
     $accessToken = $helper->getAccessToken();

Spacing +3 added lines, -3 removed lines

@@ -16,11 +16,11 @@ 
 $helper = $fb->getRedirectLoginHelper();
 try {
     $accessToken = $helper->getAccessToken();
-} catch(Facebook\Exceptions\FacebookResponseException $e) {
+} catch (Facebook\Exceptions\FacebookResponseException $e) {
     // When Graph returns an error
     echo 'Graph returned an error: ' . $e->getMessage();
     exit;
-} catch(Facebook\Exceptions\FacebookSDKException $e) {
+} catch (Facebook\Exceptions\FacebookSDKException $e) {
     // When validation fails or other local issues
     echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
@@ -52,7 +52,7 @@ 
 // If you know the user ID this access token belongs to, you can validate it here
 //$tokenMetadata->validateUserId('123');
 $tokenMetadata->validateExpiration();
-if (! $accessToken->isLongLived()) {
+if (!$accessToken->isLongLived()) {
     // Exchanges a short-lived access token for a long-lived one
     try {
     $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

lib/Google/Utils/UriTemplate.php

Indentation +189 added lines, -189 removed lines

@@ -21,176 +21,176 @@ 
  */
 class Google_Utils_UriTemplate
 {
-  const TYPE_MAP = "1";
-  const TYPE_LIST = "2";
-  const TYPE_SCALAR = "4";
+    const TYPE_MAP = "1";
+    const TYPE_LIST = "2";
+    const TYPE_SCALAR = "4";
 
-  /**
-   * @var $operators array
-   * These are valid at the start of a template block to
-   * modify the way in which the variables inside are
-   * processed.
-   */
-  private $operators = array(
-      "+" => "reserved",
-      "/" => "segments",
-      "." => "dotprefix",
-      "#" => "fragment",
-      ";" => "semicolon",
-      "?" => "form",
-      "&" => "continuation"
-  );
+    /**
+     * @var $operators array
+     * These are valid at the start of a template block to
+     * modify the way in which the variables inside are
+     * processed.
+     */
+    private $operators = array(
+        "+" => "reserved",
+        "/" => "segments",
+        "." => "dotprefix",
+        "#" => "fragment",
+        ";" => "semicolon",
+        "?" => "form",
+        "&" => "continuation"
+    );
 
-  /**
-   * @var reserved array
-   * These are the characters which should not be URL encoded in reserved
-   * strings.
-   */
-  private $reserved = array(
-      "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
-  );
-  private $reservedEncoded = array(
+    /**
+     * @var reserved array
+     * These are the characters which should not be URL encoded in reserved
+     * strings.
+     */
+    private $reserved = array(
+        "=", ",", "!", "@", "|", ":", "/", "?", "#",
+        "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
+    );
+    private $reservedEncoded = array(
     "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
     "%23", "%5B", "%5D", "%24", "%26", "%27", "%28", "%29",
     "%2A", "%2B", "%3B"
-  );
+    );
 
-  public function parse($string, array $parameters)
-  {
+    public function parse($string, array $parameters)
+    {
     return $this->resolveNextSection($string, $parameters);
-  }
+    }
 
-  /**
-   * This function finds the first matching {...} block and
-   * executes the replacement. It then calls itself to find
-   * subsequent blocks, if any.
-   */
-  private function resolveNextSection($string, $parameters)
-  {
+    /**
+     * This function finds the first matching {...} block and
+     * executes the replacement. It then calls itself to find
+     * subsequent blocks, if any.
+     */
+    private function resolveNextSection($string, $parameters)
+    {
     $start = strpos($string, "{");
     if ($start === false) {
-      return $string;
+        return $string;
     }
     $end = strpos($string, "}");
     if ($end === false) {
-      return $string;
+        return $string;
     }
     $string = $this->replace($string, $start, $end, $parameters);
     return $this->resolveNextSection($string, $parameters);
-  }
+    }
 
-  private function replace($string, $start, $end, $parameters)
-  {
+    private function replace($string, $start, $end, $parameters)
+    {
     // We know a data block will have {} round it, so we can strip that.
     $data = substr($string, $start + 1, $end - $start - 1);
 
     // If the first character is one of the reserved operators, it effects
     // the processing of the stream.
     if (isset($this->operators[$data[0]])) {
-      $op = $this->operators[$data[0]];
-      $data = substr($data, 1);
-      $prefix = "";
-      $prefix_on_missing = false;
+        $op = $this->operators[$data[0]];
+        $data = substr($data, 1);
+        $prefix = "";
+        $prefix_on_missing = false;
 
-      switch ($op) {
+        switch ($op) {
         case "reserved":
           // Reserved means certain characters should not be URL encoded
           $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
+            break;
         case "fragment":
           // Comma separated with fragment prefix. Bare values only.
           $prefix = "#";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
+            $prefix_on_missing = true;
+            $data = $this->replaceVars($data, $parameters, ",", null, true);
+            break;
         case "segments":
           // Slash separated data. Bare values only.
           $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
-          break;
+            $data =$this->replaceVars($data, $parameters, "/");
+            break;
         case "dotprefix":
           // Dot separated data. Bare values only.
           $prefix = ".";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ".");
-          break;
+            $prefix_on_missing = true;
+            $data = $this->replaceVars($data, $parameters, ".");
+            break;
         case "semicolon":
           // Semicolon prefixed and separated. Uses the key name
           $prefix = ";";
-          $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
-          break;
+            $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
+            break;
         case "form":
           // Standard URL format. Uses the key name
           $prefix = "?";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
+            $data = $this->replaceVars($data, $parameters, "&", "=");
+            break;
         case "continuation":
           // Standard URL, but with leading ampersand. Uses key name.
           $prefix = "&";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
-      }
+            $data = $this->replaceVars($data, $parameters, "&", "=");
+            break;
+        }
 
-      // Add the initial prefix character if data is valid.
-      if ($data || ($data !== false && $prefix_on_missing)) {
+        // Add the initial prefix character if data is valid.
+        if ($data || ($data !== false && $prefix_on_missing)) {
         $data = $prefix . $data;
-      }
+        }
 
     } else {
-      // If no operator we replace with the defaults.
-      $data = $this->replaceVars($data, $parameters);
+        // If no operator we replace with the defaults.
+        $data = $this->replaceVars($data, $parameters);
     }
     // This is chops out the {...} and replaces with the new section.
     return substr($string, 0, $start) . $data . substr($string, $end + 1);
-  }
+    }
 
-  private function replaceVars(
-      $section,
-      $parameters,
-      $sep = ",",
-      $combine = null,
-      $reserved = false,
-      $tag_empty = false,
-      $combine_on_empty = true
-  ) {
+    private function replaceVars(
+        $section,
+        $parameters,
+        $sep = ",",
+        $combine = null,
+        $reserved = false,
+        $tag_empty = false,
+        $combine_on_empty = true
+    ) {
     if (strpos($section, ",") === false) {
-      // If we only have a single value, we can immediately process.
-      return $this->combine(
-          $section,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
+        // If we only have a single value, we can immediately process.
+        return $this->combine(
+            $section,
+            $parameters,
+            $sep,
+            $combine,
+            $reserved,
+            $tag_empty,
+            $combine_on_empty
+        );
     } else {
-      // If we have multiple values, we need to split and loop over them.
-      // Each is treated individually, then glued together with the
-      // separator character.
-      $vars = explode(",", $section);
-      return $this->combineList(
-          $vars,
-          $sep,
-          $parameters,
-          $combine,
-          $reserved,
-          false, // Never emit empty strings in multi-param replacements
-          $combine_on_empty
-      );
+        // If we have multiple values, we need to split and loop over them.
+        // Each is treated individually, then glued together with the
+        // separator character.
+        $vars = explode(",", $section);
+        return $this->combineList(
+            $vars,
+            $sep,
+            $parameters,
+            $combine,
+            $reserved,
+            false, // Never emit empty strings in multi-param replacements
+            $combine_on_empty
+        );
+    }
     }
-  }
 
-  public function combine(
-      $key,
-      $parameters,
-      $sep,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
-  ) {
+    public function combine(
+        $key,
+        $parameters,
+        $sep,
+        $combine,
+        $reserved,
+        $tag_empty,
+        $combine_on_empty
+    ) {
     $length = false;
     $explode = false;
     $skip_final_combine = false;
@@ -198,136 +198,136 @@ 
 
     // Check for length restriction.
     if (strpos($key, ":") !== false) {
-      list($key, $length) = explode(":", $key);
+        list($key, $length) = explode(":", $key);
     }
 
     // Check for explode parameter.
     if ($key[strlen($key) - 1] == "*") {
-      $explode = true;
-      $key = substr($key, 0, -1);
-      $skip_final_combine = true;
+        $explode = true;
+        $key = substr($key, 0, -1);
+        $skip_final_combine = true;
     }
 
     // Define the list separator.
     $list_sep = $explode ? $sep : ",";
 
     if (isset($parameters[$key])) {
-      $data_type = $this->getDataType($parameters[$key]);
-      switch ($data_type) {
+        $data_type = $this->getDataType($parameters[$key]);
+        switch ($data_type) {
         case self::TYPE_SCALAR:
           $value = $this->getValue($parameters[$key], $length);
-          break;
+            break;
         case self::TYPE_LIST:
           $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
+            foreach ($parameters[$key] as $pkey => $pvalue) {
             $pvalue = $this->getValue($pvalue, $length);
             if ($combine && $explode) {
-              $values[$pkey] = $key . $combine . $pvalue;
+                $values[$pkey] = $key . $combine . $pvalue;
             } else {
-              $values[$pkey] = $pvalue;
+                $values[$pkey] = $pvalue;
+            }
             }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
+            $value = implode($list_sep, $values);
+            if ($value == '') {
             return '';
-          }
-          break;
+            }
+            break;
         case self::TYPE_MAP:
           $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
+            foreach ($parameters[$key] as $pkey => $pvalue) {
             $pvalue = $this->getValue($pvalue, $length);
             if ($explode) {
-              $pkey = $this->getValue($pkey, $length);
-              $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
+                $pkey = $this->getValue($pkey, $length);
+                $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
             } else {
-              $values[] = $pkey;
-              $values[] = $pvalue;
+                $values[] = $pkey;
+                $values[] = $pvalue;
             }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
+            }
+            $value = implode($list_sep, $values);
+            if ($value == '') {
             return false;
-          }
-          break;
-      }
+            }
+            break;
+        }
     } else if ($tag_empty) {
-      // If we are just indicating empty values with their key name, return that.
-      return $key;
+        // If we are just indicating empty values with their key name, return that.
+        return $key;
     } else {
-      // Otherwise we can skip this variable due to not being defined.
-      return false;
+        // Otherwise we can skip this variable due to not being defined.
+        return false;
     }
 
     if ($reserved) {
-      $value = str_replace($this->reservedEncoded, $this->reserved, $value);
+        $value = str_replace($this->reservedEncoded, $this->reserved, $value);
     }
 
     // If we do not need to include the key name, we just return the raw
     // value.
     if (!$combine || $skip_final_combine) {
-      return $value;
+        return $value;
     }
 
     // Else we combine the key name: foo=bar, if value is not the empty string.
     return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
-  }
+    }
 
-  /**
-   * Return the type of a passed in value
-   */
-  private function getDataType($data)
-  {
+    /**
+     * Return the type of a passed in value
+     */
+    private function getDataType($data)
+    {
     if (is_array($data)) {
-      reset($data);
-      if (key($data) !== 0) {
+        reset($data);
+        if (key($data) !== 0) {
         return self::TYPE_MAP;
-      }
-      return self::TYPE_LIST;
+        }
+        return self::TYPE_LIST;
     }
     return self::TYPE_SCALAR;
-  }
+    }
 
-  /**
-   * Utility function that merges multiple combine calls
-   * for multi-key templates.
-   */
-  private function combineList(
-      $vars,
-      $sep,
-      $parameters,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
-  ) {
+    /**
+     * Utility function that merges multiple combine calls
+     * for multi-key templates.
+     */
+    private function combineList(
+        $vars,
+        $sep,
+        $parameters,
+        $combine,
+        $reserved,
+        $tag_empty,
+        $combine_on_empty
+    ) {
     $ret = array();
     foreach ($vars as $var) {
-      $response = $this->combine(
-          $var,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
-      if ($response === false) {
+        $response = $this->combine(
+            $var,
+            $parameters,
+            $sep,
+            $combine,
+            $reserved,
+            $tag_empty,
+            $combine_on_empty
+        );
+        if ($response === false) {
         continue;
-      }
-      $ret[] = $response;
+        }
+        $ret[] = $response;
     }
     return implode($sep, $ret);
-  }
+    }
 
-  /**
-   * Utility function to encode and trim values
-   */
-  private function getValue($value, $length)
-  {
+    /**
+     * Utility function to encode and trim values
+     */
+    private function getValue($value, $length)
+    {
     if ($length) {
-      $value = substr($value, 0, $length);
+        $value = substr($value, 0, $length);
     }
     $value = rawurlencode($value);
     return $value;
-  }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
    */
   private $reserved = array(
       "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
+      "[", "]", '$', "&", "'", "(", ")", "*", "+", ";"
   );
   private $reservedEncoded = array(
     "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
@@ -107,7 +107,7 @@ 
         case "segments":
           // Slash separated data. Bare values only.
           $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
+          $data = $this->replaceVars($data, $parameters, "/");
           break;
         case "dotprefix":
           // Dot separated data. Bare values only.

lib/Google/Service/Exception.php

Indentation +40 added lines, -40 removed lines

@@ -17,52 +17,52 @@
 
 class Google_Service_Exception extends Google_Exception
 {
-  /**
-   * Optional list of errors returned in a JSON body of an HTTP error response.
-   */
-  protected $errors = array();
+    /**
+     * Optional list of errors returned in a JSON body of an HTTP error response.
+     */
+    protected $errors = array();
 
-  /**
-   * Override default constructor to add the ability to set $errors and a retry
-   * map.
-   *
-   * @param string $message
-   * @param int $code
-   * @param Exception|null $previous
-   * @param [{string, string}] errors List of errors returned in an HTTP
-   * response.  Defaults to [].
-   * @param array|null $retryMap Map of errors with retry counts.
-   */
-  public function __construct(
-      $message,
-      $code = 0,
-      Exception $previous = null,
-      $errors = array()
-  ) {
+    /**
+     * Override default constructor to add the ability to set $errors and a retry
+     * map.
+     *
+     * @param string $message
+     * @param int $code
+     * @param Exception|null $previous
+     * @param [{string, string}] errors List of errors returned in an HTTP
+     * response.  Defaults to [].
+     * @param array|null $retryMap Map of errors with retry counts.
+     */
+    public function __construct(
+        $message,
+        $code = 0,
+        Exception $previous = null,
+        $errors = array()
+    ) {
     if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-      parent::__construct($message, $code, $previous);
+        parent::__construct($message, $code, $previous);
     } else {
-      parent::__construct($message, $code);
+        parent::__construct($message, $code);
     }
 
     $this->errors = $errors;
-  }
+    }
 
-  /**
-   * An example of the possible errors returned.
-   *
-   * {
-   *   "domain": "global",
-   *   "reason": "authError",
-   *   "message": "Invalid Credentials",
-   *   "locationType": "header",
-   *   "location": "Authorization",
-   * }
-   *
-   * @return [{string, string}] List of errors return in an HTTP response or [].
-   */
-  public function getErrors()
-  {
+    /**
+     * An example of the possible errors returned.
+     *
+     * {
+     *   "domain": "global",
+     *   "reason": "authError",
+     *   "message": "Invalid Credentials",
+     *   "locationType": "header",
+     *   "location": "Authorization",
+     * }
+     *
+     * @return [{string, string}] List of errors return in an HTTP response or [].
+     */
+    public function getErrors()
+    {
     return $this->errors;
-  }
+    }
 }

lib/Google/Service/Resource.php

Indentation +120 added lines, -120 removed lines

@@ -25,40 +25,40 @@ 
  */
 class Google_Service_Resource
 {
-  // Valid query parameters that work, but don't appear in discovery.
-  private $stackParameters = array(
-      'alt' => array('type' => 'string', 'location' => 'query'),
-      'fields' => array('type' => 'string', 'location' => 'query'),
-      'trace' => array('type' => 'string', 'location' => 'query'),
-      'userIp' => array('type' => 'string', 'location' => 'query'),
-      'quotaUser' => array('type' => 'string', 'location' => 'query'),
-      'data' => array('type' => 'string', 'location' => 'body'),
-      'mimeType' => array('type' => 'string', 'location' => 'header'),
-      'uploadType' => array('type' => 'string', 'location' => 'query'),
-      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
-      'prettyPrint' => array('type' => 'string', 'location' => 'query'),
-  );
-
-  /** @var string $rootUrl */
-  private $rootUrl;
-
-  /** @var Google_Client $client */
-  private $client;
-
-  /** @var string $serviceName */
-  private $serviceName;
-
-  /** @var string $servicePath */
-  private $servicePath;
-
-  /** @var string $resourceName */
-  private $resourceName;
-
-  /** @var array $methods */
-  private $methods;
-
-  public function __construct($service, $serviceName, $resourceName, $resource)
-  {
+    // Valid query parameters that work, but don't appear in discovery.
+    private $stackParameters = array(
+        'alt' => array('type' => 'string', 'location' => 'query'),
+        'fields' => array('type' => 'string', 'location' => 'query'),
+        'trace' => array('type' => 'string', 'location' => 'query'),
+        'userIp' => array('type' => 'string', 'location' => 'query'),
+        'quotaUser' => array('type' => 'string', 'location' => 'query'),
+        'data' => array('type' => 'string', 'location' => 'body'),
+        'mimeType' => array('type' => 'string', 'location' => 'header'),
+        'uploadType' => array('type' => 'string', 'location' => 'query'),
+        'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
+        'prettyPrint' => array('type' => 'string', 'location' => 'query'),
+    );
+
+    /** @var string $rootUrl */
+    private $rootUrl;
+
+    /** @var Google_Client $client */
+    private $client;
+
+    /** @var string $serviceName */
+    private $serviceName;
+
+    /** @var string $servicePath */
+    private $servicePath;
+
+    /** @var string $resourceName */
+    private $resourceName;
+
+    /** @var array $methods */
+    private $methods;
+
+    public function __construct($service, $serviceName, $resourceName, $resource)
+    {
     $this->rootUrl = $service->rootUrl;
     $this->client = $service->getClient();
     $this->servicePath = $service->servicePath;
@@ -67,32 +67,32 @@ 
     $this->methods = is_array($resource) && isset($resource['methods']) ?
         $resource['methods'] :
         array($resourceName => $resource);
-  }
-
-  /**
-   * TODO: This function needs simplifying.
-   * @param $name
-   * @param $arguments
-   * @param $expectedClass - optional, the expected class name
-   * @return Google_Http_Request|expectedClass
-   * @throws Google_Exception
-   */
-  public function call($name, $arguments, $expectedClass = null)
-  {
+    }
+
+    /**
+     * TODO: This function needs simplifying.
+     * @param $name
+     * @param $arguments
+     * @param $expectedClass - optional, the expected class name
+     * @return Google_Http_Request|expectedClass
+     * @throws Google_Exception
+     */
+    public function call($name, $arguments, $expectedClass = null)
+    {
     if (! isset($this->methods[$name])) {
-      $this->client->getLogger()->error(
-          'Service method unknown',
-          array(
-              'service' => $this->serviceName,
-              'resource' => $this->resourceName,
-              'method' => $name
-          )
-      );
-
-      throw new Google_Exception(
-          "Unknown function: " .
-          "{$this->serviceName}->{$this->resourceName}->{$name}()"
-      );
+        $this->client->getLogger()->error(
+            'Service method unknown',
+            array(
+                'service' => $this->serviceName,
+                'resource' => $this->resourceName,
+                'method' => $name
+            )
+        );
+
+        throw new Google_Exception(
+            "Unknown function: " .
+            "{$this->serviceName}->{$this->resourceName}->{$name}()"
+        );
     }
     $method = $this->methods[$name];
     $parameters = $arguments[0];
@@ -101,31 +101,31 @@ 
     // document as parameter, but we abuse the param entry for storing it.
     $postBody = null;
     if (isset($parameters['postBody'])) {
-      if ($parameters['postBody'] instanceof Google_Model) {
+        if ($parameters['postBody'] instanceof Google_Model) {
         // In the cases the post body is an existing object, we want
         // to use the smart method to create a simple object for
         // for JSONification.
         $parameters['postBody'] = $parameters['postBody']->toSimpleObject();
-      } else if (is_object($parameters['postBody'])) {
+        } else if (is_object($parameters['postBody'])) {
         // If the post body is another kind of object, we will try and
         // wrangle it into a sensible format.
         $parameters['postBody'] =
             $this->convertToArrayAndStripNulls($parameters['postBody']);
-      }
-      $postBody = (array) $parameters['postBody'];
-      unset($parameters['postBody']);
+        }
+        $postBody = (array) $parameters['postBody'];
+        unset($parameters['postBody']);
     }
 
     // TODO: optParams here probably should have been
     // handled already - this may well be redundant code.
     if (isset($parameters['optParams'])) {
-      $optParams = $parameters['optParams'];
-      unset($parameters['optParams']);
-      $parameters = array_merge($parameters, $optParams);
+        $optParams = $parameters['optParams'];
+        unset($parameters['optParams']);
+        $parameters = array_merge($parameters, $optParams);
     }
 
     if (!isset($method['parameters'])) {
-      $method['parameters'] = array();
+        $method['parameters'] = array();
     }
 
     $method['parameters'] = array_merge(
@@ -134,7 +134,7 @@ 
     );
 
     foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+        if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
         $this->client->getLogger()->error(
             'Service parameter unknown',
             array(
@@ -145,14 +145,14 @@ 
             )
         );
         throw new Google_Exception("($name) unknown parameter: '$key'");
-      }
+        }
     }
 
     foreach ($method['parameters'] as $paramName => $paramSpec) {
-      if (isset($paramSpec['required']) &&
+        if (isset($paramSpec['required']) &&
           $paramSpec['required'] &&
           ! isset($parameters[$paramName])
-      ) {
+        ) {
         $this->client->getLogger()->error(
             'Service parameter missing',
             array(
@@ -163,16 +163,16 @@ 
             )
         );
         throw new Google_Exception("($name) missing required param: '$paramName'");
-      }
-      if (isset($parameters[$paramName])) {
+        }
+        if (isset($parameters[$paramName])) {
         $value = $parameters[$paramName];
         $parameters[$paramName] = $paramSpec;
         $parameters[$paramName]['value'] = $value;
         unset($parameters[$paramName]['required']);
-      } else {
+        } else {
         // Ensure we don't pass nulls.
         unset($parameters[$paramName]);
-      }
+        }
     }
 
     $this->client->getLogger()->info(
@@ -203,100 +203,100 @@ 
 
     // support uploads
     if (isset($parameters['data'])) {
-      $mimeType = isset($parameters['mimeType'])
+        $mimeType = isset($parameters['mimeType'])
         ? $parameters['mimeType']['value']
         : 'application/octet-stream';
-      $data = $parameters['data']['value'];
-      $upload = new Google_Http_MediaFileUpload($this->client, $request, $mimeType, $data);
+        $data = $parameters['data']['value'];
+        $upload = new Google_Http_MediaFileUpload($this->client, $request, $mimeType, $data);
 
-      // pull down the modified request
-      $request = $upload->getRequest();
+        // pull down the modified request
+        $request = $upload->getRequest();
     }
 
     // if this is a media type, we will return the raw response
     // rather than using an expected class
     if (isset($parameters['alt']) && $parameters['alt']['value'] == 'media') {
-      $expectedClass = null;
+        $expectedClass = null;
     }
 
     // if the client is marked for deferring, rather than
     // execute the request, return the response
     if ($this->client->shouldDefer()) {
-      // @TODO find a better way to do this
-      $request = $request
+        // @TODO find a better way to do this
+        $request = $request
         ->withHeader('X-Php-Expected-Class', $expectedClass);
 
-      return $request;
+        return $request;
     }
 
     return $this->client->execute($request, $expectedClass);
-  }
+    }
 
-  protected function convertToArrayAndStripNulls($o)
-  {
+    protected function convertToArrayAndStripNulls($o)
+    {
     $o = (array) $o;
     foreach ($o as $k => $v) {
-      if ($v === null) {
+        if ($v === null) {
         unset($o[$k]);
-      } elseif (is_object($v) || is_array($v)) {
+        } elseif (is_object($v) || is_array($v)) {
         $o[$k] = $this->convertToArrayAndStripNulls($o[$k]);
-      }
+        }
     }
     return $o;
-  }
-
-  /**
-   * Parse/expand request parameters and create a fully qualified
-   * request uri.
-   * @static
-   * @param string $restPath
-   * @param array $params
-   * @return string $requestUrl
-   */
-  public function createRequestUri($restPath, $params)
-  {
+    }
+
+    /**
+     * Parse/expand request parameters and create a fully qualified
+     * request uri.
+     * @static
+     * @param string $restPath
+     * @param array $params
+     * @return string $requestUrl
+     */
+    public function createRequestUri($restPath, $params)
+    {
     // Override the default servicePath address if the $restPath use a /
     if ('/' == substr($restPath, 0, 1)) {
-      $requestUrl = substr($restPath, 1);
+        $requestUrl = substr($restPath, 1);
     } else {
-      $requestUrl = $this->servicePath . $restPath;
+        $requestUrl = $this->servicePath . $restPath;
     }
 
     // code for leading slash
     if ($this->rootUrl) {
-      if ('/' !== substr($this->rootUrl, -1) && '/' !== substr($requestUrl, 0, 1)) {
+        if ('/' !== substr($this->rootUrl, -1) && '/' !== substr($requestUrl, 0, 1)) {
         $requestUrl = '/' . $requestUrl;
-      }
-      $requestUrl = $this->rootUrl . $requestUrl;
+        }
+        $requestUrl = $this->rootUrl . $requestUrl;
     }
     $uriTemplateVars = array();
     $queryVars = array();
     foreach ($params as $paramName => $paramSpec) {
-      if ($paramSpec['type'] == 'boolean') {
+        if ($paramSpec['type'] == 'boolean') {
         $paramSpec['value'] = $paramSpec['value'] ? 'true' : 'false';
-      }
-      if ($paramSpec['location'] == 'path') {
+        }
+        if ($paramSpec['location'] == 'path') {
         $uriTemplateVars[$paramName] = $paramSpec['value'];
-      } else if ($paramSpec['location'] == 'query') {
+        } else if ($paramSpec['location'] == 'query') {
         if (is_array($paramSpec['value'])) {
-          foreach ($paramSpec['value'] as $value) {
+            foreach ($paramSpec['value'] as $value) {
             $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
-          }
+            }
         } else {
-          $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
+            $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
+        }
         }
-      }
     }
 
     if (count($uriTemplateVars)) {
-      $uriTemplateParser = new Google_Utils_UriTemplate();
-      $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
+        $uriTemplateParser = new Google_Utils_UriTemplate();
+        $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
     }
 
     if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
+        $requestUrl .= '?' . implode($queryVars, '&');
     }
 
     return $requestUrl;
-  }
+    }
 }

Spacing +6 added lines, -7 removed lines

@@ -65,8 +65,7 @@ 
     $this->serviceName = $serviceName;
     $this->resourceName = $resourceName;
     $this->methods = is_array($resource) && isset($resource['methods']) ?
-        $resource['methods'] :
-        array($resourceName => $resource);
+        $resource['methods'] : array($resourceName => $resource);
   }
 
   /**
@@ -79,7 +78,7 @@ 
    */
   public function call($name, $arguments, $expectedClass = null)
   {
-    if (! isset($this->methods[$name])) {
+    if (!isset($this->methods[$name])) {
       $this->client->getLogger()->error(
           'Service method unknown',
           array(
@@ -112,7 +111,7 @@ 
         $parameters['postBody'] =
             $this->convertToArrayAndStripNulls($parameters['postBody']);
       }
-      $postBody = (array) $parameters['postBody'];
+      $postBody = (array)$parameters['postBody'];
       unset($parameters['postBody']);
     }
 
@@ -134,7 +133,7 @@ 
     );
 
     foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+      if ($key != 'postBody' && !isset($method['parameters'][$key])) {
         $this->client->getLogger()->error(
             'Service parameter unknown',
             array(
@@ -151,7 +150,7 @@ 
     foreach ($method['parameters'] as $paramName => $paramSpec) {
       if (isset($paramSpec['required']) &&
           $paramSpec['required'] &&
-          ! isset($parameters[$paramName])
+          !isset($parameters[$paramName])
       ) {
         $this->client->getLogger()->error(
             'Service parameter missing',
@@ -234,7 +233,7 @@ 
 
   protected function convertToArrayAndStripNulls($o)
   {
-    $o = (array) $o;
+    $o = (array)$o;
     foreach ($o as $k => $v) {
       if ($v === null) {
         unset($o[$k]);

lib/Google/Collection.php

Indentation +45 added lines, -45 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!class_exists('Google_Client')) {
-  require_once __DIR__ . '/autoload.php';
+    require_once __DIR__ . '/autoload.php';
 }
 
 /**
@@ -11,90 +11,90 @@ 
  */
 class Google_Collection extends Google_Model implements Iterator, Countable
 {
-  protected $collection_key = 'items';
+    protected $collection_key = 'items';
 
-  public function rewind()
-  {
+    public function rewind()
+    {
     if (isset($this->{$this->collection_key})
         && is_array($this->{$this->collection_key})) {
-      reset($this->{$this->collection_key});
+        reset($this->{$this->collection_key});
+    }
     }
-  }
 
-  public function current()
-  {
+    public function current()
+    {
     $this->coerceType($this->key());
     if (is_array($this->{$this->collection_key})) {
-      return current($this->{$this->collection_key});
+        return current($this->{$this->collection_key});
+    }
     }
-  }
 
-  public function key()
-  {
+    public function key()
+    {
     if (isset($this->{$this->collection_key})
         && is_array($this->{$this->collection_key})) {
-      return key($this->{$this->collection_key});
+        return key($this->{$this->collection_key});
+    }
     }
-  }
 
-  public function next()
-  {
+    public function next()
+    {
     return next($this->{$this->collection_key});
-  }
+    }
 
-  public function valid()
-  {
+    public function valid()
+    {
     $key = $this->key();
     return $key !== null && $key !== false;
-  }
+    }
 
-  public function count()
-  {
+    public function count()
+    {
     if (!isset($this->{$this->collection_key})) {
-      return 0;
+        return 0;
     }
     return count($this->{$this->collection_key});
-  }
+    }
 
-  public function offsetExists($offset)
-  {
+    public function offsetExists($offset)
+    {
     if (!is_numeric($offset)) {
-      return parent::offsetExists($offset);
+        return parent::offsetExists($offset);
     }
     return isset($this->{$this->collection_key}[$offset]);
-  }
+    }
 
-  public function offsetGet($offset)
-  {
+    public function offsetGet($offset)
+    {
     if (!is_numeric($offset)) {
-      return parent::offsetGet($offset);
+        return parent::offsetGet($offset);
     }
     $this->coerceType($offset);
     return $this->{$this->collection_key}[$offset];
-  }
+    }
 
-  public function offsetSet($offset, $value)
-  {
+    public function offsetSet($offset, $value)
+    {
     if (!is_numeric($offset)) {
-      return parent::offsetSet($offset, $value);
+        return parent::offsetSet($offset, $value);
     }
     $this->{$this->collection_key}[$offset] = $value;
-  }
+    }
 
-  public function offsetUnset($offset)
-  {
+    public function offsetUnset($offset)
+    {
     if (!is_numeric($offset)) {
-      return parent::offsetUnset($offset);
+        return parent::offsetUnset($offset);
     }
     unset($this->{$this->collection_key}[$offset]);
-  }
+    }
 
-  private function coerceType($offset)
-  {
+    private function coerceType($offset)
+    {
     $keyType = $this->keyType($this->collection_key);
     if ($keyType && !is_object($this->{$this->collection_key}[$offset])) {
-      $this->{$this->collection_key}[$offset] =
-          new $keyType($this->{$this->collection_key}[$offset]);
+        $this->{$this->collection_key}[$offset] =
+            new $keyType($this->{$this->collection_key}[$offset]);
+    }
     }
-  }
 }

lib/Google/Service.php

Indentation +25 added lines, -25 removed lines

@@ -17,40 +17,40 @@
 
 class Google_Service
 {
-  public $batchPath;
-  public $rootUrl;
-  public $version;
-  public $servicePath;
-  public $availableScopes;
-  public $resource;
-  private $client;
+    public $batchPath;
+    public $rootUrl;
+    public $version;
+    public $servicePath;
+    public $availableScopes;
+    public $resource;
+    private $client;
 
-  public function __construct(Google_Client $client)
-  {
+    public function __construct(Google_Client $client)
+    {
     $this->client = $client;
-  }
+    }
 
-  /**
-   * Return the associated Google_Client class.
-   * @return Google_Client
-   */
-  public function getClient()
-  {
+    /**
+     * Return the associated Google_Client class.
+     * @return Google_Client
+     */
+    public function getClient()
+    {
     return $this->client;
-  }
+    }
 
-  /**
-   * Create a new HTTP Batch handler for this service
-   *
-   * @return Google_Http_Batch
-   */
-  public function createBatch()
-  {
+    /**
+     * Create a new HTTP Batch handler for this service
+     *
+     * @return Google_Http_Batch
+     */
+    public function createBatch()
+    {
     return new Google_Http_Batch(
         $this->client,
         false,
         $this->rootUrl,
         $this->batchPath
     );
-  }
+    }
 }