las93 / venus3

bundles/core/Config.php

Doc Comments +3 added lines, -3 removed lines

@@ -196,8 +196,8 @@ 
 	 *
 	 * @access private
 	 * @param  string $sFileToMerge file to get
-	 * @param  object $base base
-	 * @return object
+	 * @param  stdClass $base base
+	 * @return stdClass
 	 */
 	private static function  _mergeAndGetConf(string $sFileToMerge, \StdClass $base) : \StdClass
 	{
@@ -222,7 +222,7 @@ 
 	 *
 	 * @access private
 	 * @param  $oConfFiles
-	 * @param  StdClass $base
+	 * @param  stdClass $base
 	 * @return multitype:array multitype:array
 	 */
 	private static function _recursiveGet($oConfFiles, StdClass $base) : array

Indentation +60 added lines, -60 removed lines

@@ -50,17 +50,17 @@ 
 	 */
 	public static function get(string $sName, string $sPortal = null, bool $bNoDoRedirect = false)
 	{
-	    if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; }
-	    else { $sNameCache = $sName; }
+		if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; }
+		else { $sNameCache = $sName; }
 	    
 		if ($sPortal === null || !is_string($sPortal)) {
 		    
-		    if (defined('PORTAL')) {
+			if (defined('PORTAL')) {
 
 				$sPortal = PORTAL;
 				$aDirectories = array($sPortal);
 			}
-		    else {
+			else {
 
 				$sPortal = '';
 				$aDirectories = scandir(str_replace('core', 'src', __DIR__));
@@ -73,84 +73,84 @@ 
 
 			foreach ($aDirectories as $sPortal) {
 			
-			    if ($sPortal != '..' && $sPortal != '.') {
+				if ($sPortal != '..' && $sPortal != '.') {
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         				
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
         
-        			$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        			$base = self::_mergeAndGetConf($sJsonFile, $base);
-			    }
-		    }
+					$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+					$base = self::_mergeAndGetConf($sJsonFile, $base);
+				}
+			}
 
 			if ($base === '') {
 				
@@ -185,10 +185,10 @@ 
 	 */
 	public static function getBundleLocationName(string $sName): string
 	{
-	    $oConfig = self::get($sName, null, true);
+		$oConfig = self::get($sName, null, true);
 
-	    if (isset($oConfig->redirect)) { return $oConfig->redirect; }
-	    else { return PORTAL; }
+		if (isset($oConfig->redirect)) { return $oConfig->redirect; }
+		else { return PORTAL; }
 	}
 
 	/**

bundles/core/Mother.php

Doc Comments +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
 	 *
 	 * @access public
 	 * @param  mixed $mKey
-	 * @return void
+	 * @return boolean
 	 */
 	public function __isset($mKey)
 	{
@@ -130,7 +130,7 @@ 
 	 *
 	 * @access public
 	 * @param  mixed $mOffset
-	 * @return mixed
+	 * @return boolean
 	 */
 	function offsetExists($mOffset)
 	{

bundles/core/Router.php

Doc Comments +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 * run the routeur
 	 *
 	 * @access public
-	 * @return void
+	 * @return null|boolean
 	 */
 	public function run() 
 	{
@@ -378,7 +378,7 @@ 
 	 * load a route
 	 *
 	 * @access private
-	 * @param  stdClass $oRoute one route
+	 * @param  \stdClass $oRoute one route
 	 * @param  string $RequestUri URI
 	 * @return void
 	 */

Indentation +106 added lines, -106 removed lines

@@ -82,8 +82,8 @@ 
 	 */
 	public function __construct() 
 	{
-	    $oLogger = Debug::getInstance();
-	    $this->setLogger($oLogger);
+		$oLogger = Debug::getInstance();
+		$this->setLogger($oLogger);
 	}
 
 	/**
@@ -100,120 +100,120 @@ 
 
 		if (Request::isHttpRequest()) {
         
-		    // Search if a Less file exists
-		    if (defined('LESS_ACTIVE') && LESS_ACTIVE === true) {
+			// Search if a Less file exists
+			if (defined('LESS_ACTIVE') && LESS_ACTIVE === true) {
 		        
-		        if (strstr($_SERVER['REQUEST_URI'], '.css')
-                    && file_exists(preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
+				if (strstr($_SERVER['REQUEST_URI'], '.css')
+					&& file_exists(preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
 		        
-		            Less::toCss($_SERVER['REQUEST_URI']);
-		            exit;
-		        }
-		    }
+					Less::toCss($_SERVER['REQUEST_URI']);
+					exit;
+				}
+			}
 		    
-		    // Search if a typescript file exists
-		    if (defined('TYPESCRIPT_ACTIVE') && TYPESCRIPT_ACTIVE === true) {
+			// Search if a typescript file exists
+			if (defined('TYPESCRIPT_ACTIVE') && TYPESCRIPT_ACTIVE === true) {
 		    
-		        if (strstr($_SERVER['REQUEST_URI'], '.js')
-		        && file_exists(preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
+				if (strstr($_SERVER['REQUEST_URI'], '.js')
+				&& file_exists(preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
 		    
-		            Typescript::toJs($_SERVER['REQUEST_URI']);
-		            exit;
-		        }
-		    }
+					Typescript::toJs($_SERVER['REQUEST_URI']);
+					exit;
+				}
+			}
 		    
-		    // Search public files in all plugins
-		    if ($_SERVER['REQUEST_URI'] !== '/') {
+			// Search public files in all plugins
+			if ($_SERVER['REQUEST_URI'] !== '/') {
 	
-    		    foreach (Config::get('Plugins')->list as $iKey => $sPlugin) {
+				foreach (Config::get('Plugins')->list as $iKey => $sPlugin) {
     		        
-    		        if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI'])) {
+					if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI'])) {
     		            
-    		            echo file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI']);
-                        exit;
-    		        }
-                    else if (strstr($_SERVER['REQUEST_URI'], '.css')
-		                && file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
-
-		                Less::toCss(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']));
-		                exit;
-                    }
-		            else if (strstr($_SERVER['REQUEST_URI'], '.js')
-		                && file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
-
-		                Typescript::toJs(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']));
-		                exit;
-		            }
-		        }
-	        }
+						echo file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI']);
+						exit;
+					}
+					else if (strstr($_SERVER['REQUEST_URI'], '.css')
+						&& file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
+
+						Less::toCss(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']));
+						exit;
+					}
+					else if (strstr($_SERVER['REQUEST_URI'], '.js')
+						&& file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
+
+						Typescript::toJs(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']));
+						exit;
+					}
+				}
+			}
 		    
 			foreach (Config::get('Route') as $sMultiHost => $oHost) {
 
-			    foreach (explode(',', $sMultiHost) as $sHost) {
+				foreach (explode(',', $sMultiHost) as $sHost) {
 
-    				if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST']) || (strstr($sHost, '/')
-    					&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
+					if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST']) || (strstr($sHost, '/')
+						&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
     
-    					$this->_oRoutes = $oHost;
+						$this->_oRoutes = $oHost;
 
-    					if (strstr($sHost, '/')
-    						&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
+						if (strstr($sHost, '/')
+							&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
 
-    						$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
-    					}
+							$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
+						}
     
-    					if (isset($oHost->location)) {
+						if (isset($oHost->location)) {
     
-    						header('Status: 301 Moved Permanently', false, 301);
-    	  					header('Location: '.$oHost->location);
-    	  					exit;
-    					}
-    					else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
+							header('Status: 301 Moved Permanently', false, 301);
+		  					header('Location: '.$oHost->location);
+		  					exit;
+						}
+						else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
     					    
-    					    foreach ($_GET as $sKey => $sValue) {
+							foreach ($_GET as $sKey => $sValue) {
 
-    					        if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')) {
+								if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')) {
     					            
-    					            echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')."\n";
-    					        }
-    					    }
+									echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')."\n";
+								}
+							}
     					    
-    					    exit;
-    					}
-    					else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
+							exit;
+						}
+						else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
     					    
-    					    foreach ($_GET as $sKey => $sValue) {
+							foreach ($_GET as $sKey => $sValue) {
 
-    					        if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')) {
+								if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')) {
     					            
-    					            echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')."\n";
-    					        }
-    					    }
+									echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')."\n";
+								}
+							}
     					    
-    					    exit;
-    					}
-    					else if (isset($oHost->routes)) {
+							exit;
+						}
+						else if (isset($oHost->routes)) {
     
-    						foreach($oHost->routes as $sKey => $oRoute) {
+							foreach($oHost->routes as $sKey => $oRoute) {
 
-    							$mReturn = $this->_route($oRoute, $_SERVER['REQUEST_URI']);
+								$mReturn = $this->_route($oRoute, $_SERVER['REQUEST_URI']);
 
-    							if ($mReturn === 403) {
+								if ($mReturn === 403) {
     
-    								$this->_getPage403();
-    							}
-    							else if ($mReturn == true) {
+									$this->_getPage403();
+								}
+								else if ($mReturn == true) {
     
-    								if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
+									if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
     
-    								return true;
-    							}							
-    						}
+									return true;
+								}							
+							}
     
-    						$this->_getPage404();
-    					}
-    				}
-			    }
+							$this->_getPage404();
+						}
+					}
+				}
 
 				//@todo fait l'erreur à chaque passage
 //				if ($sHost !== $_SERVER['HTTP_HOST']) {
@@ -227,7 +227,7 @@ 
 //				}
 			}
 		}
-        else if (Request::isCliRequest()) {
+		else if (Request::isCliRequest()) {
 
 			if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
 			else { $aArguments = $argv; }
@@ -235,15 +235,15 @@ 
 			define('PORTAL', 'Batch');
 			set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 
-            if (!isset($aArguments[1]) && strstr($aArguments[0], '/phpunit')) {
+			if (!isset($aArguments[1]) && strstr($aArguments[0], '/phpunit')) {
 
-                $sBatchName = "phpunit";
-                $aArguments[0] = "bin/console";
-                $aArguments[1] = "phpunit";
-            }
-            else {
-                $sBatchName = $aArguments[1];
-            }
+				$sBatchName = "phpunit";
+				$aArguments[0] = "bin/console";
+				$aArguments[1] = "phpunit";
+			}
+			else {
+				$sBatchName = $aArguments[1];
+			}
 
 			if (isset(Config::get('Route')->batch->script->{$sBatchName})) {
 
@@ -285,7 +285,7 @@ 
 						array_shift($aArguments);
 					}
 				}
-      		}
+	  		}
 
 			if (isset($oBatch->controller) && isset($oBatch->action)) {
 
@@ -358,7 +358,7 @@ 
 			foreach (Config::get('Route') as $sHost => $oHost) {
 
 				if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST'])
-				    || (strstr($sHost, '/') && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
+					|| (strstr($sHost, '/') && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
 
 					$this->_oRoutes = $oHost->routes;
 
@@ -388,7 +388,7 @@ 
 
 		if (isset($oRoute->route)) {
 
-		    $sRoute = str_replace("*", ".*", $oRoute->route);
+			$sRoute = str_replace("*", ".*", $oRoute->route);
 
 			$sFinalRoute = preg_replace_callback(
 				'|\[/{0,1}:([a-zA-Z_]+)\]|',
@@ -464,8 +464,8 @@ 
 
 			if (isset($oRoute->controller)) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->controller));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->controller));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			     
 				if (isset($oRoute->content_type)) {
 
@@ -519,7 +519,7 @@ 
 						}
 						else {
 
-						    $this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
+							$this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
 							break;
 						}
 					}
@@ -545,10 +545,10 @@ 
 			}
 			else if (isset($oRoute->template) && isset($oRoute->layout) && $oRoute->layout === true) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			    
-			    $oLayout = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl');
+				$oLayout = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl');
 
 				if (isset($oRoute->vars)) {
 
@@ -563,8 +563,8 @@ 
 			}
 			else if (isset($oRoute->template)) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			    
 				$oTemplate = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl');
 
@@ -664,14 +664,14 @@ 
 		
 		if (method_exists($oController, 'beforeExecuteRoute')) { 
 		    
-		    call_user_func_array(array($oController, 'beforeExecuteRoute'), array());
+			call_user_func_array(array($oController, 'beforeExecuteRoute'), array());
 		}
 
 		$mReturnController = call_user_func_array(array($oController, $sActionName), $aParams);
 
 		if (method_exists($oController, 'afterExecuteRoute')) { 
 		    
-		    call_user_func_array(array($oController, 'afterExecuteRoute'), array());
+			call_user_func_array(array($oController, 'afterExecuteRoute'), array());
 		}
 		
 		$mReturn = ob_get_clean();
@@ -811,6 +811,6 @@ 
 	 */
 	public function setLogger(LoggerInterface $logger) {
 	    
-	    $this->_oLogger = $logger;
+		$this->_oLogger = $logger;
 	}
 }

bundles/core/Security.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * check security of access
 	 *
 	 * @access public
-	 * @return void
+	 * @return null|boolean
 	 */
 
 	public function checkSecurity() {

bundles/core/UrlManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @access public
 	 * @param  string $sCode code of the url between "routes" and "route" in Route.conf
 	 * @param  array $aParams parameters to create the url
-	 * @return void
+	 * @return string
 	 *
 	 * @tutorial	If I have this route I could make my URL:
 	 *

bundles/ext/facebook/base_facebook.php

Doc Comments +6 added lines, -2 removed lines

@@ -503,7 +503,7 @@ 
    * Get the UID of the connected user, or 0
    * if the Facebook user is not connected.
    *
-   * @return string the UID if available.
+   * @return integer the UID if available.
    */
   public function getUser() {
     if ($this->user !== null) {
@@ -757,6 +757,7 @@ 
    * either logged in to Facebook or has granted an offline access permission.
    *
    * @param string $code An authorization code.
+   * @param string $redirect_uri
    * @return mixed An access token exchanged for the authorization code, or
    *               false if an access token could not be generated.
    */
@@ -1135,7 +1136,7 @@ 
   /**
    * Build the URL for given domain alias, path and parameters.
    *
-   * @param $name string The name of the domain
+   * @param string $name string The name of the domain
    * @param $path string Optional path (without a leading slash)
    * @param $params array Optional query parameters
    *
@@ -1402,6 +1403,9 @@ 
     return self::endsWith($big, '.'.$small);
   }
 
+  /**
+   * @param string $small
+   */
   protected static function endsWith($big, $small) {
     $len = strlen($small);
     if ($len === 0) {

Indentation +739 added lines, -739 removed lines

@@ -40,24 +40,24 @@ 
    * @param array $result The result from the API server
    */
   public function __construct($result) {
-    $this->result = $result;
-
-    $code = isset($result['error_code']) ? $result['error_code'] : 0;
-
-    if (isset($result['error_description'])) {
-      // OAuth 2.0 Draft 10 style
-      $msg = $result['error_description'];
-    } else if (isset($result['error']) && is_array($result['error'])) {
-      // OAuth 2.0 Draft 00 style
-      $msg = $result['error']['message'];
-    } else if (isset($result['error_msg'])) {
-      // Rest server style
-      $msg = $result['error_msg'];
-    } else {
-      $msg = 'Unknown Error. Check getResult()';
-    }
-
-    parent::__construct($msg, $code);
+	$this->result = $result;
+
+	$code = isset($result['error_code']) ? $result['error_code'] : 0;
+
+	if (isset($result['error_description'])) {
+	  // OAuth 2.0 Draft 10 style
+	  $msg = $result['error_description'];
+	} else if (isset($result['error']) && is_array($result['error'])) {
+	  // OAuth 2.0 Draft 00 style
+	  $msg = $result['error']['message'];
+	} else if (isset($result['error_msg'])) {
+	  // Rest server style
+	  $msg = $result['error_msg'];
+	} else {
+	  $msg = 'Unknown Error. Check getResult()';
+	}
+
+	parent::__construct($msg, $code);
   }
 
   /**
@@ -66,7 +66,7 @@ 
    * @return array The result from the API server
    */
   public function getResult() {
-    return $this->result;
+	return $this->result;
   }
 
   /**
@@ -76,20 +76,20 @@ 
    * @return string
    */
   public function getType() {
-    if (isset($this->result['error'])) {
-      $error = $this->result['error'];
-      if (is_string($error)) {
-        // OAuth 2.0 Draft 10 style
-        return $error;
-      } else if (is_array($error)) {
-        // OAuth 2.0 Draft 00 style
-        if (isset($error['type'])) {
-          return $error['type'];
-        }
-      }
-    }
-
-    return 'Exception';
+	if (isset($this->result['error'])) {
+	  $error = $this->result['error'];
+	  if (is_string($error)) {
+		// OAuth 2.0 Draft 10 style
+		return $error;
+	  } else if (is_array($error)) {
+		// OAuth 2.0 Draft 00 style
+		if (isset($error['type'])) {
+		  return $error['type'];
+		}
+	  }
+	}
+
+	return 'Exception';
   }
 
   /**
@@ -98,11 +98,11 @@ 
    * @return string The string representation of the error
    */
   public function __toString() {
-    $str = $this->getType() . ': ';
-    if ($this->code != 0) {
-      $str .= $this->code . ': ';
-    }
-    return $str . $this->message;
+	$str = $this->getType() . ': ';
+	if ($this->code != 0) {
+	  $str .= $this->code . ': ';
+	}
+	return $str . $this->message;
   }
 }
 
@@ -131,10 +131,10 @@ 
    * Default options for curl.
    */
   public static $CURL_OPTS = array(
-    CURLOPT_CONNECTTIMEOUT => 10,
-    CURLOPT_RETURNTRANSFER => true,
-    CURLOPT_TIMEOUT        => 60,
-    CURLOPT_USERAGENT      => 'facebook-php-3.2',
+	CURLOPT_CONNECTTIMEOUT => 10,
+	CURLOPT_RETURNTRANSFER => true,
+	CURLOPT_TIMEOUT        => 60,
+	CURLOPT_USERAGENT      => 'facebook-php-3.2',
   );
 
   /**
@@ -142,21 +142,21 @@ 
    * the current URL.
    */
   protected static $DROP_QUERY_PARAMS = array(
-    'code',
-    'state',
-    'signed_request',
+	'code',
+	'state',
+	'signed_request',
   );
 
   /**
    * Maps aliases to Facebook domains.
    */
   public static $DOMAIN_MAP = array(
-    'api'         => 'https://api.facebook.com/',
-    'api_video'   => 'https://api-video.facebook.com/',
-    'api_read'    => 'https://api-read.facebook.com/',
-    'graph'       => 'https://graph.facebook.com/',
-    'graph_video' => 'https://graph-video.facebook.com/',
-    'www'         => 'https://www.facebook.com/',
+	'api'         => 'https://api.facebook.com/',
+	'api_video'   => 'https://api-video.facebook.com/',
+	'api_read'    => 'https://api-read.facebook.com/',
+	'graph'       => 'https://graph.facebook.com/',
+	'graph_video' => 'https://graph-video.facebook.com/',
+	'www'         => 'https://www.facebook.com/',
   );
 
   /**
@@ -223,18 +223,18 @@ 
    * @param array $config The application configuration
    */
   public function __construct($config) {
-    $this->setAppId($config['appId']);
-    $this->setAppSecret($config['secret']);
-    if (isset($config['fileUpload'])) {
-      $this->setFileUploadSupport($config['fileUpload']);
-    }
-    if (isset($config['trustForwarded']) && $config['trustForwarded']) {
-      $this->trustForwarded = true;
-    }
-    $state = $this->getPersistentData('state');
-    if (!empty($state)) {
-      $this->state = $state;
-    }
+	$this->setAppId($config['appId']);
+	$this->setAppSecret($config['secret']);
+	if (isset($config['fileUpload'])) {
+	  $this->setFileUploadSupport($config['fileUpload']);
+	}
+	if (isset($config['trustForwarded']) && $config['trustForwarded']) {
+	  $this->trustForwarded = true;
+	}
+	$state = $this->getPersistentData('state');
+	if (!empty($state)) {
+	  $this->state = $state;
+	}
   }
 
   /**
@@ -244,8 +244,8 @@ 
    * @return BaseFacebook
    */
   public function setAppId($appId) {
-    $this->appId = $appId;
-    return $this;
+	$this->appId = $appId;
+	return $this;
   }
 
   /**
@@ -254,7 +254,7 @@ 
    * @return string the Application ID
    */
   public function getAppId() {
-    return $this->appId;
+	return $this->appId;
   }
 
   /**
@@ -265,8 +265,8 @@ 
    * @deprecated
    */
   public function setApiSecret($apiSecret) {
-    $this->setAppSecret($apiSecret);
-    return $this;
+	$this->setAppSecret($apiSecret);
+	return $this;
   }
 
   /**
@@ -276,8 +276,8 @@ 
    * @return BaseFacebook
    */
   public function setAppSecret($appSecret) {
-    $this->appSecret = $appSecret;
-    return $this;
+	$this->appSecret = $appSecret;
+	return $this;
   }
 
   /**
@@ -287,7 +287,7 @@ 
    * @deprecated
    */
   public function getApiSecret() {
-    return $this->getAppSecret();
+	return $this->getAppSecret();
   }
 
   /**
@@ -296,7 +296,7 @@ 
    * @return string the App Secret
    */
   public function getAppSecret() {
-    return $this->appSecret;
+	return $this->appSecret;
   }
 
   /**
@@ -306,8 +306,8 @@ 
    * @return BaseFacebook
    */
   public function setFileUploadSupport($fileUploadSupport) {
-    $this->fileUploadSupport = $fileUploadSupport;
-    return $this;
+	$this->fileUploadSupport = $fileUploadSupport;
+	return $this;
   }
 
   /**
@@ -316,7 +316,7 @@ 
    * @return boolean true if and only if the server supports file upload.
    */
   public function getFileUploadSupport() {
-    return $this->fileUploadSupport;
+	return $this->fileUploadSupport;
   }
 
   /**
@@ -327,7 +327,7 @@ 
    * @return boolean true if and only if the server supports file upload.
    */
   public function useFileUploadSupport() {
-    return $this->getFileUploadSupport();
+	return $this->getFileUploadSupport();
   }
 
   /**
@@ -339,8 +339,8 @@ 
    * @return BaseFacebook
    */
   public function setAccessToken($access_token) {
-    $this->accessToken = $access_token;
-    return $this;
+	$this->accessToken = $access_token;
+	return $this;
   }
 
   /**
@@ -349,41 +349,41 @@ 
    * for the workaround.
    */
   public function setExtendedAccessToken() {
-    try {
-      // need to circumvent json_decode by calling _oauthRequest
-      // directly, since response isn't JSON format.
-      $access_token_response = $this->_oauthRequest(
-        $this->getUrl('graph', '/oauth/access_token'),
-        $params = array(
-          'client_id' => $this->getAppId(),
-          'client_secret' => $this->getAppSecret(),
-          'grant_type' => 'fb_exchange_token',
-          'fb_exchange_token' => $this->getAccessToken(),
-        )
-      );
-    }
-    catch (FacebookApiException $e) {
-      // most likely that user very recently revoked authorization.
-      // In any event, we don't have an access token, so say so.
-      return false;
-    }
-
-    if (empty($access_token_response)) {
-      return false;
-    }
-
-    $response_params = array();
-    parse_str($access_token_response, $response_params);
-
-    if (!isset($response_params['access_token'])) {
-      return false;
-    }
-
-    $this->destroySession();
-
-    $this->setPersistentData(
-      'access_token', $response_params['access_token']
-    );
+	try {
+	  // need to circumvent json_decode by calling _oauthRequest
+	  // directly, since response isn't JSON format.
+	  $access_token_response = $this->_oauthRequest(
+		$this->getUrl('graph', '/oauth/access_token'),
+		$params = array(
+		  'client_id' => $this->getAppId(),
+		  'client_secret' => $this->getAppSecret(),
+		  'grant_type' => 'fb_exchange_token',
+		  'fb_exchange_token' => $this->getAccessToken(),
+		)
+	  );
+	}
+	catch (FacebookApiException $e) {
+	  // most likely that user very recently revoked authorization.
+	  // In any event, we don't have an access token, so say so.
+	  return false;
+	}
+
+	if (empty($access_token_response)) {
+	  return false;
+	}
+
+	$response_params = array();
+	parse_str($access_token_response, $response_params);
+
+	if (!isset($response_params['access_token'])) {
+	  return false;
+	}
+
+	$this->destroySession();
+
+	$this->setPersistentData(
+	  'access_token', $response_params['access_token']
+	);
   }
 
   /**
@@ -396,21 +396,21 @@ 
    * @return string The access token
    */
   public function getAccessToken() {
-    if ($this->accessToken !== null) {
-      // we've done this already and cached it.  Just return.
-      return $this->accessToken;
-    }
-
-    // first establish access token to be the application
-    // access token, in case we navigate to the /oauth/access_token
-    // endpoint, where SOME access token is required.
-    $this->setAccessToken($this->getApplicationAccessToken());
-    $user_access_token = $this->getUserAccessToken();
-    if ($user_access_token) {
-      $this->setAccessToken($user_access_token);
-    }
-
-    return $this->accessToken;
+	if ($this->accessToken !== null) {
+	  // we've done this already and cached it.  Just return.
+	  return $this->accessToken;
+	}
+
+	// first establish access token to be the application
+	// access token, in case we navigate to the /oauth/access_token
+	// endpoint, where SOME access token is required.
+	$this->setAccessToken($this->getApplicationAccessToken());
+	$user_access_token = $this->getUserAccessToken();
+	if ($user_access_token) {
+	  $this->setAccessToken($user_access_token);
+	}
+
+	return $this->accessToken;
   }
 
   /**
@@ -424,60 +424,60 @@ 
    *                could not be determined.
    */
   protected function getUserAccessToken() {
-    // first, consider a signed request if it's supplied.
-    // if there is a signed request, then it alone determines
-    // the access token.
-    $signed_request = $this->getSignedRequest();
-    if ($signed_request) {
-      // apps.facebook.com hands the access_token in the signed_request
-      if (array_key_exists('oauth_token', $signed_request)) {
-        $access_token = $signed_request['oauth_token'];
-        $this->setPersistentData('access_token', $access_token);
-        return $access_token;
-      }
-
-      // the JS SDK puts a code in with the redirect_uri of ''
-      if (array_key_exists('code', $signed_request)) {
-        $code = $signed_request['code'];
-        if ($code && $code == $this->getPersistentData('code')) {
-          // short-circuit if the code we have is the same as the one presented
-          return $this->getPersistentData('access_token');
-        }
-
-        $access_token = $this->getAccessTokenFromCode($code, '');
-        if ($access_token) {
-          $this->setPersistentData('code', $code);
-          $this->setPersistentData('access_token', $access_token);
-          return $access_token;
-        }
-      }
-
-      // signed request states there's no access token, so anything
-      // stored should be cleared.
-      $this->clearAllPersistentData();
-      return false; // respect the signed request's data, even
-                    // if there's an authorization code or something else
-    }
-
-    $code = $this->getCode();
-    if ($code && $code != $this->getPersistentData('code')) {
-      $access_token = $this->getAccessTokenFromCode($code);
-      if ($access_token) {
-        $this->setPersistentData('code', $code);
-        $this->setPersistentData('access_token', $access_token);
-        return $access_token;
-      }
-
-      // code was bogus, so everything based on it should be invalidated.
-      $this->clearAllPersistentData();
-      return false;
-    }
-
-    // as a fallback, just return whatever is in the persistent
-    // store, knowing nothing explicit (signed request, authorization
-    // code, etc.) was present to shadow it (or we saw a code in $_REQUEST,
-    // but it's the same as what's in the persistent store)
-    return $this->getPersistentData('access_token');
+	// first, consider a signed request if it's supplied.
+	// if there is a signed request, then it alone determines
+	// the access token.
+	$signed_request = $this->getSignedRequest();
+	if ($signed_request) {
+	  // apps.facebook.com hands the access_token in the signed_request
+	  if (array_key_exists('oauth_token', $signed_request)) {
+		$access_token = $signed_request['oauth_token'];
+		$this->setPersistentData('access_token', $access_token);
+		return $access_token;
+	  }
+
+	  // the JS SDK puts a code in with the redirect_uri of ''
+	  if (array_key_exists('code', $signed_request)) {
+		$code = $signed_request['code'];
+		if ($code && $code == $this->getPersistentData('code')) {
+		  // short-circuit if the code we have is the same as the one presented
+		  return $this->getPersistentData('access_token');
+		}
+
+		$access_token = $this->getAccessTokenFromCode($code, '');
+		if ($access_token) {
+		  $this->setPersistentData('code', $code);
+		  $this->setPersistentData('access_token', $access_token);
+		  return $access_token;
+		}
+	  }
+
+	  // signed request states there's no access token, so anything
+	  // stored should be cleared.
+	  $this->clearAllPersistentData();
+	  return false; // respect the signed request's data, even
+					// if there's an authorization code or something else
+	}
+
+	$code = $this->getCode();
+	if ($code && $code != $this->getPersistentData('code')) {
+	  $access_token = $this->getAccessTokenFromCode($code);
+	  if ($access_token) {
+		$this->setPersistentData('code', $code);
+		$this->setPersistentData('access_token', $access_token);
+		return $access_token;
+	  }
+
+	  // code was bogus, so everything based on it should be invalidated.
+	  $this->clearAllPersistentData();
+	  return false;
+	}
+
+	// as a fallback, just return whatever is in the persistent
+	// store, knowing nothing explicit (signed request, authorization
+	// code, etc.) was present to shadow it (or we saw a code in $_REQUEST,
+	// but it's the same as what's in the persistent store)
+	return $this->getPersistentData('access_token');
   }
 
   /**
@@ -487,16 +487,16 @@ 
    * @return string the signed request, if available, or null otherwise.
    */
   public function getSignedRequest() {
-    if (!$this->signedRequest) {
-      if (!empty($_REQUEST['signed_request'])) {
-        $this->signedRequest = $this->parseSignedRequest(
-          $_REQUEST['signed_request']);
-      } else if (!empty($_COOKIE[$this->getSignedRequestCookieName()])) {
-        $this->signedRequest = $this->parseSignedRequest(
-          $_COOKIE[$this->getSignedRequestCookieName()]);
-      }
-    }
-    return $this->signedRequest;
+	if (!$this->signedRequest) {
+	  if (!empty($_REQUEST['signed_request'])) {
+		$this->signedRequest = $this->parseSignedRequest(
+		  $_REQUEST['signed_request']);
+	  } else if (!empty($_COOKIE[$this->getSignedRequestCookieName()])) {
+		$this->signedRequest = $this->parseSignedRequest(
+		  $_COOKIE[$this->getSignedRequestCookieName()]);
+	  }
+	}
+	return $this->signedRequest;
   }
 
   /**
@@ -506,12 +506,12 @@ 
    * @return string the UID if available.
    */
   public function getUser() {
-    if ($this->user !== null) {
-      // we've already determined this and cached the value.
-      return $this->user;
-    }
+	if ($this->user !== null) {
+	  // we've already determined this and cached the value.
+	  return $this->user;
+	}
 
-    return $this->user = $this->getUserFromAvailableData();
+	return $this->user = $this->getUserFromAvailableData();
   }
 
   /**
@@ -523,45 +523,45 @@ 
    *                 or 0 if no such user exists.
    */
   protected function getUserFromAvailableData() {
-    // if a signed request is supplied, then it solely determines
-    // who the user is.
-    $signed_request = $this->getSignedRequest();
-    if ($signed_request) {
-      if (array_key_exists('user_id', $signed_request)) {
-        $user = $signed_request['user_id'];
-
-        if($user != $this->getPersistentData('user_id')){
-          $this->clearAllPersistentData();
-        }
-
-        $this->setPersistentData('user_id', $signed_request['user_id']);
-        return $user;
-      }
-
-      // if the signed request didn't present a user id, then invalidate
-      // all entries in any persistent store.
-      $this->clearAllPersistentData();
-      return 0;
-    }
-
-    $user = $this->getPersistentData('user_id', $default = 0);
-    $persisted_access_token = $this->getPersistentData('access_token');
-
-    // use access_token to fetch user id if we have a user access_token, or if
-    // the cached access token has changed.
-    $access_token = $this->getAccessToken();
-    if ($access_token &&
-        $access_token != $this->getApplicationAccessToken() &&
-        !($user && $persisted_access_token == $access_token)) {
-      $user = $this->getUserFromAccessToken();
-      if ($user) {
-        $this->setPersistentData('user_id', $user);
-      } else {
-        $this->clearAllPersistentData();
-      }
-    }
-
-    return $user;
+	// if a signed request is supplied, then it solely determines
+	// who the user is.
+	$signed_request = $this->getSignedRequest();
+	if ($signed_request) {
+	  if (array_key_exists('user_id', $signed_request)) {
+		$user = $signed_request['user_id'];
+
+		if($user != $this->getPersistentData('user_id')){
+		  $this->clearAllPersistentData();
+		}
+
+		$this->setPersistentData('user_id', $signed_request['user_id']);
+		return $user;
+	  }
+
+	  // if the signed request didn't present a user id, then invalidate
+	  // all entries in any persistent store.
+	  $this->clearAllPersistentData();
+	  return 0;
+	}
+
+	$user = $this->getPersistentData('user_id', $default = 0);
+	$persisted_access_token = $this->getPersistentData('access_token');
+
+	// use access_token to fetch user id if we have a user access_token, or if
+	// the cached access token has changed.
+	$access_token = $this->getAccessToken();
+	if ($access_token &&
+		$access_token != $this->getApplicationAccessToken() &&
+		!($user && $persisted_access_token == $access_token)) {
+	  $user = $this->getUserFromAccessToken();
+	  if ($user) {
+		$this->setPersistentData('user_id', $user);
+	  } else {
+		$this->clearAllPersistentData();
+	  }
+	}
+
+	return $user;
   }
 
   /**
@@ -577,23 +577,23 @@ 
    * @return string The URL for the login flow
    */
   public function getLoginUrl($params=array()) {
-    $this->establishCSRFTokenState();
-    $currentUrl = $this->getCurrentUrl();
-
-    // if 'scope' is passed as an array, convert to comma separated list
-    $scopeParams = isset($params['scope']) ? $params['scope'] : null;
-    if ($scopeParams && is_array($scopeParams)) {
-      $params['scope'] = implode(',', $scopeParams);
-    }
-
-    return $this->getUrl(
-      'www',
-      'dialog/oauth',
-      array_merge(array(
-                    'client_id' => $this->getAppId(),
-                    'redirect_uri' => $currentUrl, // possibly overwritten
-                    'state' => $this->state),
-                  $params));
+	$this->establishCSRFTokenState();
+	$currentUrl = $this->getCurrentUrl();
+
+	// if 'scope' is passed as an array, convert to comma separated list
+	$scopeParams = isset($params['scope']) ? $params['scope'] : null;
+	if ($scopeParams && is_array($scopeParams)) {
+	  $params['scope'] = implode(',', $scopeParams);
+	}
+
+	return $this->getUrl(
+	  'www',
+	  'dialog/oauth',
+	  array_merge(array(
+					'client_id' => $this->getAppId(),
+					'redirect_uri' => $currentUrl, // possibly overwritten
+					'state' => $this->state),
+				  $params));
   }
 
   /**
@@ -606,14 +606,14 @@ 
    * @return string The URL for the logout flow
    */
   public function getLogoutUrl($params=array()) {
-    return $this->getUrl(
-      'www',
-      'logout.php',
-      array_merge(array(
-        'next' => $this->getCurrentUrl(),
-        'access_token' => $this->getUserAccessToken(),
-      ), $params)
-    );
+	return $this->getUrl(
+	  'www',
+	  'logout.php',
+	  array_merge(array(
+		'next' => $this->getCurrentUrl(),
+		'access_token' => $this->getUserAccessToken(),
+	  ), $params)
+	);
   }
 
   /**
@@ -628,17 +628,17 @@ 
    * @return string The URL for the logout flow
    */
   public function getLoginStatusUrl($params=array()) {
-    return $this->getUrl(
-      'www',
-      'extern/login_status.php',
-      array_merge(array(
-        'api_key' => $this->getAppId(),
-        'no_session' => $this->getCurrentUrl(),
-        'no_user' => $this->getCurrentUrl(),
-        'ok_session' => $this->getCurrentUrl(),
-        'session_version' => 3,
-      ), $params)
-    );
+	return $this->getUrl(
+	  'www',
+	  'extern/login_status.php',
+	  array_merge(array(
+		'api_key' => $this->getAppId(),
+		'no_session' => $this->getCurrentUrl(),
+		'no_user' => $this->getCurrentUrl(),
+		'ok_session' => $this->getCurrentUrl(),
+		'session_version' => 3,
+	  ), $params)
+	);
   }
 
   /**
@@ -647,12 +647,12 @@ 
    * @return mixed The decoded response
    */
   public function api(/* polymorphic */) {
-    $args = func_get_args();
-    if (is_array($args[0])) {
-      return $this->_restserver($args[0]);
-    } else {
-      return call_user_func_array(array($this, '_graph'), $args);
-    }
+	$args = func_get_args();
+	if (is_array($args[0])) {
+	  return $this->_restserver($args[0]);
+	} else {
+	  return call_user_func_array(array($this, '_graph'), $args);
+	}
   }
 
   /**
@@ -665,7 +665,7 @@ 
    *         the signed request value.
    */
   protected function getSignedRequestCookieName() {
-    return 'fbsr_'.$this->getAppId();
+	return 'fbsr_'.$this->getAppId();
   }
 
   /**
@@ -676,7 +676,7 @@ 
    * @return string the name of the cookie that would house metadata.
    */
   protected function getMetadataCookieName() {
-    return 'fbm_'.$this->getAppId();
+	return 'fbm_'.$this->getAppId();
   }
 
   /**
@@ -688,22 +688,22 @@ 
    *               code could not be determined.
    */
   protected function getCode() {
-    if (isset($_REQUEST['code'])) {
-      if ($this->state !== null &&
-          isset($_REQUEST['state']) &&
-          $this->state === $_REQUEST['state']) {
-
-        // CSRF state has done its job, so clear it
-        $this->state = null;
-        $this->clearPersistentData('state');
-        return $_REQUEST['code'];
-      } else {
-        self::errorLog('CSRF state token does not match one provided.');
-        return false;
-      }
-    }
-
-    return false;
+	if (isset($_REQUEST['code'])) {
+	  if ($this->state !== null &&
+		  isset($_REQUEST['state']) &&
+		  $this->state === $_REQUEST['state']) {
+
+		// CSRF state has done its job, so clear it
+		$this->state = null;
+		$this->clearPersistentData('state');
+		return $_REQUEST['code'];
+	  } else {
+		self::errorLog('CSRF state token does not match one provided.');
+		return false;
+	  }
+	}
+
+	return false;
   }
 
   /**
@@ -717,12 +717,12 @@ 
    *                 if the Facebook user could not be determined.
    */
   protected function getUserFromAccessToken() {
-    try {
-      $user_info = $this->api('/me');
-      return $user_info['id'];
-    } catch (FacebookApiException $e) {
-      return 0;
-    }
+	try {
+	  $user_info = $this->api('/me');
+	  return $user_info['id'];
+	} catch (FacebookApiException $e) {
+	  return 0;
+	}
   }
 
   /**
@@ -733,7 +733,7 @@ 
    *                public information about users and applications.
    */
   protected function getApplicationAccessToken() {
-    return $this->appId.'|'.$this->appSecret;
+	return $this->appId.'|'.$this->appSecret;
   }
 
   /**
@@ -742,10 +742,10 @@ 
    * @return void
    */
   protected function establishCSRFTokenState() {
-    if ($this->state === null) {
-      $this->state = md5(uniqid(mt_rand(), true));
-      $this->setPersistentData('state', $this->state);
-    }
+	if ($this->state === null) {
+	  $this->state = md5(uniqid(mt_rand(), true));
+	  $this->setPersistentData('state', $this->state);
+	}
   }
 
   /**
@@ -761,41 +761,41 @@ 
    *               false if an access token could not be generated.
    */
   protected function getAccessTokenFromCode($code, $redirect_uri = null) {
-    if (empty($code)) {
-      return false;
-    }
-
-    if ($redirect_uri === null) {
-      $redirect_uri = $this->getCurrentUrl();
-    }
-
-    try {
-      // need to circumvent json_decode by calling _oauthRequest
-      // directly, since response isn't JSON format.
-      $access_token_response =
-        $this->_oauthRequest(
-          $this->getUrl('graph', '/oauth/access_token'),
-          $params = array('client_id' => $this->getAppId(),
-                          'client_secret' => $this->getAppSecret(),
-                          'redirect_uri' => $redirect_uri,
-                          'code' => $code));
-    } catch (FacebookApiException $e) {
-      // most likely that user very recently revoked authorization.
-      // In any event, we don't have an access token, so say so.
-      return false;
-    }
-
-    if (empty($access_token_response)) {
-      return false;
-    }
-
-    $response_params = array();
-    parse_str($access_token_response, $response_params);
-    if (!isset($response_params['access_token'])) {
-      return false;
-    }
-
-    return $response_params['access_token'];
+	if (empty($code)) {
+	  return false;
+	}
+
+	if ($redirect_uri === null) {
+	  $redirect_uri = $this->getCurrentUrl();
+	}
+
+	try {
+	  // need to circumvent json_decode by calling _oauthRequest
+	  // directly, since response isn't JSON format.
+	  $access_token_response =
+		$this->_oauthRequest(
+		  $this->getUrl('graph', '/oauth/access_token'),
+		  $params = array('client_id' => $this->getAppId(),
+						  'client_secret' => $this->getAppSecret(),
+						  'redirect_uri' => $redirect_uri,
+						  'code' => $code));
+	} catch (FacebookApiException $e) {
+	  // most likely that user very recently revoked authorization.
+	  // In any event, we don't have an access token, so say so.
+	  return false;
+	}
+
+	if (empty($access_token_response)) {
+	  return false;
+	}
+
+	$response_params = array();
+	parse_str($access_token_response, $response_params);
+	if (!isset($response_params['access_token'])) {
+	  return false;
+	}
+
+	return $response_params['access_token'];
   }
 
   /**
@@ -807,29 +807,29 @@ 
    * @throws FacebookApiException
    */
   protected function _restserver($params) {
-    // generic application level parameters
-    $params['api_key'] = $this->getAppId();
-    $params['format'] = 'json-strings';
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getApiUrl($params['method']),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error_code'])) {
-      $this->throwAPIException($result);
-      // @codeCoverageIgnoreStart
-    }
-    // @codeCoverageIgnoreEnd
-
-    $method = strtolower($params['method']);
-    if ($method === 'auth.expiresession' ||
-        $method === 'auth.revokeauthorization') {
-      $this->destroySession();
-    }
-
-    return $result;
+	// generic application level parameters
+	$params['api_key'] = $this->getAppId();
+	$params['format'] = 'json-strings';
+
+	$result = json_decode($this->_oauthRequest(
+	  $this->getApiUrl($params['method']),
+	  $params
+	), true);
+
+	// results are returned, errors are thrown
+	if (is_array($result) && isset($result['error_code'])) {
+	  $this->throwAPIException($result);
+	  // @codeCoverageIgnoreStart
+	}
+	// @codeCoverageIgnoreEnd
+
+	$method = strtolower($params['method']);
+	if ($method === 'auth.expiresession' ||
+		$method === 'auth.revokeauthorization') {
+	  $this->destroySession();
+	}
+
+	return $result;
   }
 
   /**
@@ -841,10 +841,10 @@ 
    * @return boolean true if this is video post
    */
   protected function isVideoPost($path, $method = 'GET') {
-    if ($method == 'POST' && preg_match("/^(\/)(.+)(\/)(videos)$/", $path)) {
-      return true;
-    }
-    return false;
+	if ($method == 'POST' && preg_match("/^(\/)(.+)(\/)(videos)$/", $path)) {
+	  return true;
+	}
+	return false;
   }
 
   /**
@@ -858,31 +858,31 @@ 
    * @throws FacebookApiException
    */
   protected function _graph($path, $method = 'GET', $params = array()) {
-    if (is_array($method) && empty($params)) {
-      $params = $method;
-      $method = 'GET';
-    }
-    $params['method'] = $method; // method override as we always do a POST
-
-    if ($this->isVideoPost($path, $method)) {
-      $domainKey = 'graph_video';
-    } else {
-      $domainKey = 'graph';
-    }
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getUrl($domainKey, $path),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error'])) {
-      $this->throwAPIException($result);
-      // @codeCoverageIgnoreStart
-    }
-    // @codeCoverageIgnoreEnd
-
-    return $result;
+	if (is_array($method) && empty($params)) {
+	  $params = $method;
+	  $method = 'GET';
+	}
+	$params['method'] = $method; // method override as we always do a POST
+
+	if ($this->isVideoPost($path, $method)) {
+	  $domainKey = 'graph_video';
+	} else {
+	  $domainKey = 'graph';
+	}
+
+	$result = json_decode($this->_oauthRequest(
+	  $this->getUrl($domainKey, $path),
+	  $params
+	), true);
+
+	// results are returned, errors are thrown
+	if (is_array($result) && isset($result['error'])) {
+	  $this->throwAPIException($result);
+	  // @codeCoverageIgnoreStart
+	}
+	// @codeCoverageIgnoreEnd
+
+	return $result;
   }
 
   /**
@@ -895,22 +895,22 @@ 
    * @throws FacebookApiException
    */
   protected function _oauthRequest($url, $params) {
-    if (!isset($params['access_token'])) {
-      $params['access_token'] = $this->getAccessToken();
-    }
-
-    if (isset($params['access_token'])) {
-      $params['appsecret_proof'] = $this->getAppSecretProof($params['access_token']);
-    }
-
-    // json_encode all params values that are not strings
-    foreach ($params as $key => $value) {
-      if (!is_string($value)) {
-        $params[$key] = json_encode($value);
-      }
-    }
-
-    return $this->makeRequest($url, $params);
+	if (!isset($params['access_token'])) {
+	  $params['access_token'] = $this->getAccessToken();
+	}
+
+	if (isset($params['access_token'])) {
+	  $params['appsecret_proof'] = $this->getAppSecretProof($params['access_token']);
+	}
+
+	// json_encode all params values that are not strings
+	foreach ($params as $key => $value) {
+	  if (!is_string($value)) {
+		$params[$key] = json_encode($value);
+	  }
+	}
+
+	return $this->makeRequest($url, $params);
   }
 
   /**
@@ -923,7 +923,7 @@ 
    * @return string The sha256 hash of the access_token
    */
   protected function getAppSecretProof($access_token) {
-    return hash_hmac('sha256', $access_token, $this->getAppSecret());
+	return hash_hmac('sha256', $access_token, $this->getAppSecret());
   }
 
   /**
@@ -938,71 +938,71 @@ 
    * @return string The response text
    */
   protected function makeRequest($url, $params, $ch=null) {
-    if (!$ch) {
-      $ch = curl_init();
-    }
-
-    $opts = self::$CURL_OPTS;
-    if ($this->getFileUploadSupport()) {
-      $opts[CURLOPT_POSTFIELDS] = $params;
-    } else {
-      $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
-    }
-    $opts[CURLOPT_URL] = $url;
-
-    // disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
-    // for 2 seconds if the server does not support this header.
-    if (isset($opts[CURLOPT_HTTPHEADER])) {
-      $existing_headers = $opts[CURLOPT_HTTPHEADER];
-      $existing_headers[] = 'Expect:';
-      $opts[CURLOPT_HTTPHEADER] = $existing_headers;
-    } else {
-      $opts[CURLOPT_HTTPHEADER] = array('Expect:');
-    }
-
-    curl_setopt_array($ch, $opts);
-    $result = curl_exec($ch);
-
-    if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
-      self::errorLog('Invalid or no certificate authority found, '.
-                     'using bundled information');
-      curl_setopt($ch, CURLOPT_CAINFO,
-                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
-      $result = curl_exec($ch);
-    }
-
-    // With dual stacked DNS responses, it's possible for a server to
-    // have IPv6 enabled but not have IPv6 connectivity.  If this is
-    // the case, curl will try IPv4 first and if that fails, then it will
-    // fall back to IPv6 and the error EHOSTUNREACH is returned by the
-    // operating system.
-    if ($result === false && empty($opts[CURLOPT_IPRESOLVE])) {
-        $matches = array();
-        $regex = '/Failed to connect to ([^:].*): Network is unreachable/';
-        if (preg_match($regex, curl_error($ch), $matches)) {
-          if (strlen(@inet_pton($matches[1])) === 16) {
-            self::errorLog('Invalid IPv6 configuration on server, '.
-                           'Please disable or get native IPv6 on your server.');
-            self::$CURL_OPTS[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V4;
-            curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-            $result = curl_exec($ch);
-          }
-        }
-    }
-
-    if ($result === false) {
-      $e = new FacebookApiException(array(
-        'error_code' => curl_errno($ch),
-        'error' => array(
-        'message' => curl_error($ch),
-        'type' => 'CurlException',
-        ),
-      ));
-      curl_close($ch);
-      throw $e;
-    }
-    curl_close($ch);
-    return $result;
+	if (!$ch) {
+	  $ch = curl_init();
+	}
+
+	$opts = self::$CURL_OPTS;
+	if ($this->getFileUploadSupport()) {
+	  $opts[CURLOPT_POSTFIELDS] = $params;
+	} else {
+	  $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
+	}
+	$opts[CURLOPT_URL] = $url;
+
+	// disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
+	// for 2 seconds if the server does not support this header.
+	if (isset($opts[CURLOPT_HTTPHEADER])) {
+	  $existing_headers = $opts[CURLOPT_HTTPHEADER];
+	  $existing_headers[] = 'Expect:';
+	  $opts[CURLOPT_HTTPHEADER] = $existing_headers;
+	} else {
+	  $opts[CURLOPT_HTTPHEADER] = array('Expect:');
+	}
+
+	curl_setopt_array($ch, $opts);
+	$result = curl_exec($ch);
+
+	if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
+	  self::errorLog('Invalid or no certificate authority found, '.
+					 'using bundled information');
+	  curl_setopt($ch, CURLOPT_CAINFO,
+				  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
+	  $result = curl_exec($ch);
+	}
+
+	// With dual stacked DNS responses, it's possible for a server to
+	// have IPv6 enabled but not have IPv6 connectivity.  If this is
+	// the case, curl will try IPv4 first and if that fails, then it will
+	// fall back to IPv6 and the error EHOSTUNREACH is returned by the
+	// operating system.
+	if ($result === false && empty($opts[CURLOPT_IPRESOLVE])) {
+		$matches = array();
+		$regex = '/Failed to connect to ([^:].*): Network is unreachable/';
+		if (preg_match($regex, curl_error($ch), $matches)) {
+		  if (strlen(@inet_pton($matches[1])) === 16) {
+			self::errorLog('Invalid IPv6 configuration on server, '.
+						   'Please disable or get native IPv6 on your server.');
+			self::$CURL_OPTS[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V4;
+			curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+			$result = curl_exec($ch);
+		  }
+		}
+	}
+
+	if ($result === false) {
+	  $e = new FacebookApiException(array(
+		'error_code' => curl_errno($ch),
+		'error' => array(
+		'message' => curl_error($ch),
+		'type' => 'CurlException',
+		),
+	  ));
+	  curl_close($ch);
+	  throw $e;
+	}
+	curl_close($ch);
+	return $result;
   }
 
   /**
@@ -1012,27 +1012,27 @@ 
    * @return array The payload inside it or null if the sig is wrong
    */
   protected function parseSignedRequest($signed_request) {
-    list($encoded_sig, $payload) = explode('.', $signed_request, 2);
-
-    // decode the data
-    $sig = self::base64UrlDecode($encoded_sig);
-    $data = json_decode(self::base64UrlDecode($payload), true);
-
-    if (strtoupper($data['algorithm']) !== self::SIGNED_REQUEST_ALGORITHM) {
-      self::errorLog(
-        'Unknown algorithm. Expected ' . self::SIGNED_REQUEST_ALGORITHM);
-      return null;
-    }
-
-    // check sig
-    $expected_sig = hash_hmac('sha256', $payload,
-                              $this->getAppSecret(), $raw = true);
-    if ($sig !== $expected_sig) {
-      self::errorLog('Bad Signed JSON signature!');
-      return null;
-    }
-
-    return $data;
+	list($encoded_sig, $payload) = explode('.', $signed_request, 2);
+
+	// decode the data
+	$sig = self::base64UrlDecode($encoded_sig);
+	$data = json_decode(self::base64UrlDecode($payload), true);
+
+	if (strtoupper($data['algorithm']) !== self::SIGNED_REQUEST_ALGORITHM) {
+	  self::errorLog(
+		'Unknown algorithm. Expected ' . self::SIGNED_REQUEST_ALGORITHM);
+	  return null;
+	}
+
+	// check sig
+	$expected_sig = hash_hmac('sha256', $payload,
+							  $this->getAppSecret(), $raw = true);
+	if ($sig !== $expected_sig) {
+	  self::errorLog('Bad Signed JSON signature!');
+	  return null;
+	}
+
+	return $data;
   }
 
   /**
@@ -1042,17 +1042,17 @@ 
    * @return string The signed request.
    */
   protected function makeSignedRequest($data) {
-    if (!is_array($data)) {
-      throw new InvalidArgumentException(
-        'makeSignedRequest expects an array. Got: ' . print_r($data, true));
-    }
-    $data['algorithm'] = self::SIGNED_REQUEST_ALGORITHM;
-    $data['issued_at'] = time();
-    $json = json_encode($data);
-    $b64 = self::base64UrlEncode($json);
-    $raw_sig = hash_hmac('sha256', $b64, $this->getAppSecret(), $raw = true);
-    $sig = self::base64UrlEncode($raw_sig);
-    return $sig.'.'.$b64;
+	if (!is_array($data)) {
+	  throw new InvalidArgumentException(
+		'makeSignedRequest expects an array. Got: ' . print_r($data, true));
+	}
+	$data['algorithm'] = self::SIGNED_REQUEST_ALGORITHM;
+	$data['issued_at'] = time();
+	$json = json_encode($data);
+	$b64 = self::base64UrlEncode($json);
+	$raw_sig = hash_hmac('sha256', $b64, $this->getAppSecret(), $raw = true);
+	$sig = self::base64UrlEncode($raw_sig);
+	return $sig.'.'.$b64;
   }
 
   /**
@@ -1062,74 +1062,74 @@ 
    * @return string The URL for the given parameters
    */
   protected function getApiUrl($method) {
-    static $READ_ONLY_CALLS =
-      array('admin.getallocation' => 1,
-            'admin.getappproperties' => 1,
-            'admin.getbannedusers' => 1,
-            'admin.getlivestreamvialink' => 1,
-            'admin.getmetrics' => 1,
-            'admin.getrestrictioninfo' => 1,
-            'application.getpublicinfo' => 1,
-            'auth.getapppublickey' => 1,
-            'auth.getsession' => 1,
-            'auth.getsignedpublicsessiondata' => 1,
-            'comments.get' => 1,
-            'connect.getunconnectedfriendscount' => 1,
-            'dashboard.getactivity' => 1,
-            'dashboard.getcount' => 1,
-            'dashboard.getglobalnews' => 1,
-            'dashboard.getnews' => 1,
-            'dashboard.multigetcount' => 1,
-            'dashboard.multigetnews' => 1,
-            'data.getcookies' => 1,
-            'events.get' => 1,
-            'events.getmembers' => 1,
-            'fbml.getcustomtags' => 1,
-            'feed.getappfriendstories' => 1,
-            'feed.getregisteredtemplatebundlebyid' => 1,
-            'feed.getregisteredtemplatebundles' => 1,
-            'fql.multiquery' => 1,
-            'fql.query' => 1,
-            'friends.arefriends' => 1,
-            'friends.get' => 1,
-            'friends.getappusers' => 1,
-            'friends.getlists' => 1,
-            'friends.getmutualfriends' => 1,
-            'gifts.get' => 1,
-            'groups.get' => 1,
-            'groups.getmembers' => 1,
-            'intl.gettranslations' => 1,
-            'links.get' => 1,
-            'notes.get' => 1,
-            'notifications.get' => 1,
-            'pages.getinfo' => 1,
-            'pages.isadmin' => 1,
-            'pages.isappadded' => 1,
-            'pages.isfan' => 1,
-            'permissions.checkavailableapiaccess' => 1,
-            'permissions.checkgrantedapiaccess' => 1,
-            'photos.get' => 1,
-            'photos.getalbums' => 1,
-            'photos.gettags' => 1,
-            'profile.getinfo' => 1,
-            'profile.getinfooptions' => 1,
-            'stream.get' => 1,
-            'stream.getcomments' => 1,
-            'stream.getfilters' => 1,
-            'users.getinfo' => 1,
-            'users.getloggedinuser' => 1,
-            'users.getstandardinfo' => 1,
-            'users.hasapppermission' => 1,
-            'users.isappuser' => 1,
-            'users.isverified' => 1,
-            'video.getuploadlimits' => 1);
-    $name = 'api';
-    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
-      $name = 'api_read';
-    } else if (strtolower($method) == 'video.upload') {
-      $name = 'api_video';
-    }
-    return self::getUrl($name, 'restserver.php');
+	static $READ_ONLY_CALLS =
+	  array('admin.getallocation' => 1,
+			'admin.getappproperties' => 1,
+			'admin.getbannedusers' => 1,
+			'admin.getlivestreamvialink' => 1,
+			'admin.getmetrics' => 1,
+			'admin.getrestrictioninfo' => 1,
+			'application.getpublicinfo' => 1,
+			'auth.getapppublickey' => 1,
+			'auth.getsession' => 1,
+			'auth.getsignedpublicsessiondata' => 1,
+			'comments.get' => 1,
+			'connect.getunconnectedfriendscount' => 1,
+			'dashboard.getactivity' => 1,
+			'dashboard.getcount' => 1,
+			'dashboard.getglobalnews' => 1,
+			'dashboard.getnews' => 1,
+			'dashboard.multigetcount' => 1,
+			'dashboard.multigetnews' => 1,
+			'data.getcookies' => 1,
+			'events.get' => 1,
+			'events.getmembers' => 1,
+			'fbml.getcustomtags' => 1,
+			'feed.getappfriendstories' => 1,
+			'feed.getregisteredtemplatebundlebyid' => 1,
+			'feed.getregisteredtemplatebundles' => 1,
+			'fql.multiquery' => 1,
+			'fql.query' => 1,
+			'friends.arefriends' => 1,
+			'friends.get' => 1,
+			'friends.getappusers' => 1,
+			'friends.getlists' => 1,
+			'friends.getmutualfriends' => 1,
+			'gifts.get' => 1,
+			'groups.get' => 1,
+			'groups.getmembers' => 1,
+			'intl.gettranslations' => 1,
+			'links.get' => 1,
+			'notes.get' => 1,
+			'notifications.get' => 1,
+			'pages.getinfo' => 1,
+			'pages.isadmin' => 1,
+			'pages.isappadded' => 1,
+			'pages.isfan' => 1,
+			'permissions.checkavailableapiaccess' => 1,
+			'permissions.checkgrantedapiaccess' => 1,
+			'photos.get' => 1,
+			'photos.getalbums' => 1,
+			'photos.gettags' => 1,
+			'profile.getinfo' => 1,
+			'profile.getinfooptions' => 1,
+			'stream.get' => 1,
+			'stream.getcomments' => 1,
+			'stream.getfilters' => 1,
+			'users.getinfo' => 1,
+			'users.getloggedinuser' => 1,
+			'users.getstandardinfo' => 1,
+			'users.hasapppermission' => 1,
+			'users.isappuser' => 1,
+			'users.isverified' => 1,
+			'video.getuploadlimits' => 1);
+	$name = 'api';
+	if (isset($READ_ONLY_CALLS[strtolower($method)])) {
+	  $name = 'api_read';
+	} else if (strtolower($method) == 'video.upload') {
+	  $name = 'api_video';
+	}
+	return self::getUrl($name, 'restserver.php');
   }
 
   /**
@@ -1142,59 +1142,59 @@ 
    * @return string The URL for the given parameters
    */
   protected function getUrl($name, $path='', $params=array()) {
-    $url = self::$DOMAIN_MAP[$name];
-    if ($path) {
-      if ($path[0] === '/') {
-        $path = substr($path, 1);
-      }
-      $url .= $path;
-    }
-    if ($params) {
-      $url .= '?' . http_build_query($params, null, '&');
-    }
-
-    return $url;
+	$url = self::$DOMAIN_MAP[$name];
+	if ($path) {
+	  if ($path[0] === '/') {
+		$path = substr($path, 1);
+	  }
+	  $url .= $path;
+	}
+	if ($params) {
+	  $url .= '?' . http_build_query($params, null, '&');
+	}
+
+	return $url;
   }
 
   protected function getHttpHost() {
-    if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-      return $_SERVER['HTTP_X_FORWARDED_HOST'];
-    }
-    return $_SERVER['HTTP_HOST'];
+	if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+	  return $_SERVER['HTTP_X_FORWARDED_HOST'];
+	}
+	return $_SERVER['HTTP_HOST'];
   }
 
   protected function getHttpProtocol() {
-    if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-      if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-        return 'https';
-      }
-      return 'http';
-    }
-    /*apache + variants specific way of checking for https*/
-    if (isset($_SERVER['HTTPS']) &&
-        ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] == 1)) {
-      return 'https';
-    }
-    /*nginx way of checking for https*/
-    if (isset($_SERVER['SERVER_PORT']) &&
-        ($_SERVER['SERVER_PORT'] === '443')) {
-      return 'https';
-    }
-    return 'http';
+	if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+	  if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+		return 'https';
+	  }
+	  return 'http';
+	}
+	/*apache + variants specific way of checking for https*/
+	if (isset($_SERVER['HTTPS']) &&
+		($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] == 1)) {
+	  return 'https';
+	}
+	/*nginx way of checking for https*/
+	if (isset($_SERVER['SERVER_PORT']) &&
+		($_SERVER['SERVER_PORT'] === '443')) {
+	  return 'https';
+	}
+	return 'http';
   }
 
   /**
    * Get the base domain used for the cookie.
    */
   protected function getBaseDomain() {
-    // The base domain is stored in the metadata cookie if not we fallback
-    // to the current hostname
-    $metadata = $this->getMetadataCookie();
-    if (array_key_exists('base_domain', $metadata) &&
-        !empty($metadata['base_domain'])) {
-      return trim($metadata['base_domain'], '.');
-    }
-    return $this->getHttpHost();
+	// The base domain is stored in the metadata cookie if not we fallback
+	// to the current hostname
+	$metadata = $this->getMetadataCookie();
+	if (array_key_exists('base_domain', $metadata) &&
+		!empty($metadata['base_domain'])) {
+	  return trim($metadata['base_domain'], '.');
+	}
+	return $this->getHttpHost();
   }
 
   /**
@@ -1206,36 +1206,36 @@ 
    * @return string The current URL
    */
   protected function getCurrentUrl() {
-    $protocol = $this->getHttpProtocol() . '://';
-    $host = $this->getHttpHost();
-    $currentUrl = $protocol.$host.$_SERVER['REQUEST_URI'];
-    $parts = parse_url($currentUrl);
-
-    $query = '';
-    if (!empty($parts['query'])) {
-      // drop known fb params
-      $params = explode('&', $parts['query']);
-      $retained_params = array();
-      foreach ($params as $param) {
-        if ($this->shouldRetainParam($param)) {
-          $retained_params[] = $param;
-        }
-      }
-
-      if (!empty($retained_params)) {
-        $query = '?'.implode($retained_params, '&');
-      }
-    }
-
-    // use port if non default
-    $port =
-      isset($parts['port']) &&
-      (($protocol === 'http://' && $parts['port'] !== 80) ||
-       ($protocol === 'https://' && $parts['port'] !== 443))
-      ? ':' . $parts['port'] : '';
-
-    // rebuild
-    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+	$protocol = $this->getHttpProtocol() . '://';
+	$host = $this->getHttpHost();
+	$currentUrl = $protocol.$host.$_SERVER['REQUEST_URI'];
+	$parts = parse_url($currentUrl);
+
+	$query = '';
+	if (!empty($parts['query'])) {
+	  // drop known fb params
+	  $params = explode('&', $parts['query']);
+	  $retained_params = array();
+	  foreach ($params as $param) {
+		if ($this->shouldRetainParam($param)) {
+		  $retained_params[] = $param;
+		}
+	  }
+
+	  if (!empty($retained_params)) {
+		$query = '?'.implode($retained_params, '&');
+	  }
+	}
+
+	// use port if non default
+	$port =
+	  isset($parts['port']) &&
+	  (($protocol === 'http://' && $parts['port'] !== 80) ||
+	   ($protocol === 'https://' && $parts['port'] !== 443))
+	  ? ':' . $parts['port'] : '';
+
+	// rebuild
+	return $protocol . $parts['host'] . $port . $parts['path'] . $query;
   }
 
   /**
@@ -1250,13 +1250,13 @@ 
    * @return boolean
    */
   protected function shouldRetainParam($param) {
-    foreach (self::$DROP_QUERY_PARAMS as $drop_query_param) {
-      if (strpos($param, $drop_query_param.'=') === 0) {
-        return false;
-      }
-    }
+	foreach (self::$DROP_QUERY_PARAMS as $drop_query_param) {
+	  if (strpos($param, $drop_query_param.'=') === 0) {
+		return false;
+	  }
+	}
 
-    return true;
+	return true;
   }
 
   /**
@@ -1268,25 +1268,25 @@ 
    *                      by a failed API call.
    */
   protected function throwAPIException($result) {
-    $e = new FacebookApiException($result);
-    switch ($e->getType()) {
-      // OAuth 2.0 Draft 00 style
-      case 'OAuthException':
-        // OAuth 2.0 Draft 10 style
-      case 'invalid_token':
-        // REST server errors are just Exceptions
-      case 'Exception':
-        $message = $e->getMessage();
-        if ((strpos($message, 'Error validating access token') !== false) ||
-            (strpos($message, 'Invalid OAuth access token') !== false) ||
-            (strpos($message, 'An active access token must be used') !== false)
-        ) {
-          $this->destroySession();
-        }
-        break;
-    }
-
-    throw $e;
+	$e = new FacebookApiException($result);
+	switch ($e->getType()) {
+	  // OAuth 2.0 Draft 00 style
+	  case 'OAuthException':
+		// OAuth 2.0 Draft 10 style
+	  case 'invalid_token':
+		// REST server errors are just Exceptions
+	  case 'Exception':
+		$message = $e->getMessage();
+		if ((strpos($message, 'Error validating access token') !== false) ||
+			(strpos($message, 'Invalid OAuth access token') !== false) ||
+			(strpos($message, 'An active access token must be used') !== false)
+		) {
+		  $this->destroySession();
+		}
+		break;
+	}
+
+	throw $e;
   }
 
 
@@ -1296,14 +1296,14 @@ 
    * @param string $msg Log message
    */
   protected static function errorLog($msg) {
-    // disable error log if we are running in a CLI environment
-    // @codeCoverageIgnoreStart
-    if (php_sapi_name() != 'cli') {
-      error_log($msg);
-    }
-    // uncomment this if you want to see the errors on the page
-    // print 'error_log: '.$msg."\n";
-    // @codeCoverageIgnoreEnd
+	// disable error log if we are running in a CLI environment
+	// @codeCoverageIgnoreStart
+	if (php_sapi_name() != 'cli') {
+	  error_log($msg);
+	}
+	// uncomment this if you want to see the errors on the page
+	// print 'error_log: '.$msg."\n";
+	// @codeCoverageIgnoreEnd
   }
 
   /**
@@ -1317,7 +1317,7 @@ 
    * @return string
    */
   protected static function base64UrlDecode($input) {
-    return base64_decode(strtr($input, '-_', '+/'));
+	return base64_decode(strtr($input, '-_', '+/'));
   }
 
   /**
@@ -1330,38 +1330,38 @@ 
    * @return string base64Url encoded string
    */
   protected static function base64UrlEncode($input) {
-    $str = strtr(base64_encode($input), '+/', '-_');
-    $str = str_replace('=', '', $str);
-    return $str;
+	$str = strtr(base64_encode($input), '+/', '-_');
+	$str = str_replace('=', '', $str);
+	return $str;
   }
 
   /**
    * Destroy the current session
    */
   public function destroySession() {
-    $this->accessToken = null;
-    $this->signedRequest = null;
-    $this->user = null;
-    $this->clearAllPersistentData();
-
-    // Javascript sets a cookie that will be used in getSignedRequest that we
-    // need to clear if we can
-    $cookie_name = $this->getSignedRequestCookieName();
-    if (array_key_exists($cookie_name, $_COOKIE)) {
-      unset($_COOKIE[$cookie_name]);
-      if (!headers_sent()) {
-        $base_domain = $this->getBaseDomain();
-        setcookie($cookie_name, '', 1, '/', '.'.$base_domain);
-      } else {
-        // @codeCoverageIgnoreStart
-        self::errorLog(
-          'There exists a cookie that we wanted to clear that we couldn\'t '.
-          'clear because headers was already sent. Make sure to do the first '.
-          'API call before outputing anything.'
-        );
-        // @codeCoverageIgnoreEnd
-      }
-    }
+	$this->accessToken = null;
+	$this->signedRequest = null;
+	$this->user = null;
+	$this->clearAllPersistentData();
+
+	// Javascript sets a cookie that will be used in getSignedRequest that we
+	// need to clear if we can
+	$cookie_name = $this->getSignedRequestCookieName();
+	if (array_key_exists($cookie_name, $_COOKIE)) {
+	  unset($_COOKIE[$cookie_name]);
+	  if (!headers_sent()) {
+		$base_domain = $this->getBaseDomain();
+		setcookie($cookie_name, '', 1, '/', '.'.$base_domain);
+	  } else {
+		// @codeCoverageIgnoreStart
+		self::errorLog(
+		  'There exists a cookie that we wanted to clear that we couldn\'t '.
+		  'clear because headers was already sent. Make sure to do the first '.
+		  'API call before outputing anything.'
+		);
+		// @codeCoverageIgnoreEnd
+	  }
+	}
   }
 
   /**
@@ -1370,44 +1370,44 @@ 
    * @return  an array mapping key to value
    */
   protected function getMetadataCookie() {
-    $cookie_name = $this->getMetadataCookieName();
-    if (!array_key_exists($cookie_name, $_COOKIE)) {
-      return array();
-    }
-
-    // The cookie value can be wrapped in "-characters so remove them
-    $cookie_value = trim($_COOKIE[$cookie_name], '"');
-
-    if (empty($cookie_value)) {
-      return array();
-    }
-
-    $parts = explode('&', $cookie_value);
-    $metadata = array();
-    foreach ($parts as $part) {
-      $pair = explode('=', $part, 2);
-      if (!empty($pair[0])) {
-        $metadata[urldecode($pair[0])] =
-          (count($pair) > 1) ? urldecode($pair[1]) : '';
-      }
-    }
-
-    return $metadata;
+	$cookie_name = $this->getMetadataCookieName();
+	if (!array_key_exists($cookie_name, $_COOKIE)) {
+	  return array();
+	}
+
+	// The cookie value can be wrapped in "-characters so remove them
+	$cookie_value = trim($_COOKIE[$cookie_name], '"');
+
+	if (empty($cookie_value)) {
+	  return array();
+	}
+
+	$parts = explode('&', $cookie_value);
+	$metadata = array();
+	foreach ($parts as $part) {
+	  $pair = explode('=', $part, 2);
+	  if (!empty($pair[0])) {
+		$metadata[urldecode($pair[0])] =
+		  (count($pair) > 1) ? urldecode($pair[1]) : '';
+	  }
+	}
+
+	return $metadata;
   }
 
   protected static function isAllowedDomain($big, $small) {
-    if ($big === $small) {
-      return true;
-    }
-    return self::endsWith($big, '.'.$small);
+	if ($big === $small) {
+	  return true;
+	}
+	return self::endsWith($big, '.'.$small);
   }
 
   protected static function endsWith($big, $small) {
-    $len = strlen($small);
-    if ($len === 0) {
-      return true;
-    }
-    return substr($big, -$len) === $small;
+	$len = strlen($small);
+	if ($len === 0) {
+	  return true;
+	}
+	return substr($big, -$len) === $small;
   }
 
   /**

bundles/ext/facebook/facebook.php

Doc Comments +3 added lines

@@ -150,6 +150,9 @@
     return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
   }
 
+  /**
+   * @param string $key
+   */
   protected function constructSessionVariableName($key) {
     $parts = array('fb', $this->getAppId(), $key);
     if ($this->sharedSessionID) {

Indentation +77 added lines, -77 removed lines

@@ -45,52 +45,52 @@ 
    * @see BaseFacebook::__construct in facebook.php
    */
   public function __construct($config) {
-    if (!session_id()) {
-      session_start();
-    }
-    parent::__construct($config);
-    if (!empty($config['sharedSession'])) {
-      $this->initSharedSession();
-    }
+	if (!session_id()) {
+	  session_start();
+	}
+	parent::__construct($config);
+	if (!empty($config['sharedSession'])) {
+	  $this->initSharedSession();
+	}
   }
 
   protected static $kSupportedKeys =
-    array('state', 'code', 'access_token', 'user_id');
+	array('state', 'code', 'access_token', 'user_id');
 
   protected function initSharedSession() {
-    $cookie_name = $this->getSharedSessionCookieName();
-    if (isset($_COOKIE[$cookie_name])) {
-      $data = $this->parseSignedRequest($_COOKIE[$cookie_name]);
-      if ($data && !empty($data['domain']) &&
-          self::isAllowedDomain($this->getHttpHost(), $data['domain'])) {
-        // good case
-        $this->sharedSessionID = $data['id'];
-        return;
-      }
-      // ignoring potentially unreachable data
-    }
-    // evil/corrupt/missing case
-    $base_domain = $this->getBaseDomain();
-    $this->sharedSessionID = md5(uniqid(mt_rand(), true));
-    $cookie_value = $this->makeSignedRequest(
-      array(
-        'domain' => $base_domain,
-        'id' => $this->sharedSessionID,
-      )
-    );
-    $_COOKIE[$cookie_name] = $cookie_value;
-    if (!headers_sent()) {
-      $expire = time() + self::FBSS_COOKIE_EXPIRE;
-      setcookie($cookie_name, $cookie_value, $expire, '/', '.'.$base_domain);
-    } else {
-      // @codeCoverageIgnoreStart
-      self::errorLog(
-        'Shared session ID cookie could not be set! You must ensure you '.
-        'create the Facebook instance before headers have been sent. This '.
-        'will cause authentication issues after the first request.'
-      );
-      // @codeCoverageIgnoreEnd
-    }
+	$cookie_name = $this->getSharedSessionCookieName();
+	if (isset($_COOKIE[$cookie_name])) {
+	  $data = $this->parseSignedRequest($_COOKIE[$cookie_name]);
+	  if ($data && !empty($data['domain']) &&
+		  self::isAllowedDomain($this->getHttpHost(), $data['domain'])) {
+		// good case
+		$this->sharedSessionID = $data['id'];
+		return;
+	  }
+	  // ignoring potentially unreachable data
+	}
+	// evil/corrupt/missing case
+	$base_domain = $this->getBaseDomain();
+	$this->sharedSessionID = md5(uniqid(mt_rand(), true));
+	$cookie_value = $this->makeSignedRequest(
+	  array(
+		'domain' => $base_domain,
+		'id' => $this->sharedSessionID,
+	  )
+	);
+	$_COOKIE[$cookie_name] = $cookie_value;
+	if (!headers_sent()) {
+	  $expire = time() + self::FBSS_COOKIE_EXPIRE;
+	  setcookie($cookie_name, $cookie_value, $expire, '/', '.'.$base_domain);
+	} else {
+	  // @codeCoverageIgnoreStart
+	  self::errorLog(
+		'Shared session ID cookie could not be set! You must ensure you '.
+		'create the Facebook instance before headers have been sent. This '.
+		'will cause authentication issues after the first request.'
+	  );
+	  // @codeCoverageIgnoreEnd
+	}
   }
 
   /**
@@ -100,61 +100,61 @@ 
    * access tokens.
    */
   protected function setPersistentData($key, $value) {
-    if (!in_array($key, self::$kSupportedKeys)) {
-      self::errorLog('Unsupported key passed to setPersistentData.');
-      return;
-    }
+	if (!in_array($key, self::$kSupportedKeys)) {
+	  self::errorLog('Unsupported key passed to setPersistentData.');
+	  return;
+	}
 
-    $session_var_name = $this->constructSessionVariableName($key);
-    $_SESSION[$session_var_name] = $value;
+	$session_var_name = $this->constructSessionVariableName($key);
+	$_SESSION[$session_var_name] = $value;
   }
 
   protected function getPersistentData($key, $default = false) {
-    if (!in_array($key, self::$kSupportedKeys)) {
-      self::errorLog('Unsupported key passed to getPersistentData.');
-      return $default;
-    }
-
-    $session_var_name = $this->constructSessionVariableName($key);
-    return isset($_SESSION[$session_var_name]) ?
-      $_SESSION[$session_var_name] : $default;
+	if (!in_array($key, self::$kSupportedKeys)) {
+	  self::errorLog('Unsupported key passed to getPersistentData.');
+	  return $default;
+	}
+
+	$session_var_name = $this->constructSessionVariableName($key);
+	return isset($_SESSION[$session_var_name]) ?
+	  $_SESSION[$session_var_name] : $default;
   }
 
   protected function clearPersistentData($key) {
-    if (!in_array($key, self::$kSupportedKeys)) {
-      self::errorLog('Unsupported key passed to clearPersistentData.');
-      return;
-    }
+	if (!in_array($key, self::$kSupportedKeys)) {
+	  self::errorLog('Unsupported key passed to clearPersistentData.');
+	  return;
+	}
 
-    $session_var_name = $this->constructSessionVariableName($key);
-    unset($_SESSION[$session_var_name]);
+	$session_var_name = $this->constructSessionVariableName($key);
+	unset($_SESSION[$session_var_name]);
   }
 
   protected function clearAllPersistentData() {
-    foreach (self::$kSupportedKeys as $key) {
-      $this->clearPersistentData($key);
-    }
-    if ($this->sharedSessionID) {
-      $this->deleteSharedSessionCookie();
-    }
+	foreach (self::$kSupportedKeys as $key) {
+	  $this->clearPersistentData($key);
+	}
+	if ($this->sharedSessionID) {
+	  $this->deleteSharedSessionCookie();
+	}
   }
 
   protected function deleteSharedSessionCookie() {
-    $cookie_name = $this->getSharedSessionCookieName();
-    unset($_COOKIE[$cookie_name]);
-    $base_domain = $this->getBaseDomain();
-    setcookie($cookie_name, '', 1, '/', '.'.$base_domain);
+	$cookie_name = $this->getSharedSessionCookieName();
+	unset($_COOKIE[$cookie_name]);
+	$base_domain = $this->getBaseDomain();
+	setcookie($cookie_name, '', 1, '/', '.'.$base_domain);
   }
 
   protected function getSharedSessionCookieName() {
-    return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
+	return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
   }
 
   protected function constructSessionVariableName($key) {
-    $parts = array('fb', $this->getAppId(), $key);
-    if ($this->sharedSessionID) {
-      array_unshift($parts, $this->sharedSessionID);
-    }
-    return implode('_', $parts);
+	$parts = array('fb', $this->getAppId(), $key);
+	if ($this->sharedSessionID) {
+	  array_unshift($parts, $this->sharedSessionID);
+	}
+	return implode('_', $parts);
   }
 }

bundles/lib/Cache/File.php

Doc Comments +2 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sName name of the session
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function delete(string $sName)
 	{
@@ -108,7 +108,6 @@ 
 	 * flush the cache
 	 *
 	 * @access public
-	 * @param  string $sName name of the session
 	 * @return mixed
 	 */
 	public function flush()
@@ -121,7 +120,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sName name of the session
-	 * @return mixed
+	 * @return string
 	 */
 	private function _getSubDirectory($sName)
 	{

bundles/lib/Cache/Mock.php

Doc Comments +5 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 	 * @param  string $sName name of the session
 	 * @param  int $iFlags flags
 	 * @param  int $iTimeout expiration of cache
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
 	{ 
@@ -52,7 +52,7 @@ 
 	 * @param  mixed $mValue value of this sesion var
 	 * @param  int $iFlag unused
 	 * @param  int $iExpire expiration of cache
-	 * @return \Venus\lib\Cache\Apc
+	 * @return boolean
 	 */
 	public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
 	{ 
@@ -63,7 +63,7 @@ 
 	 * flush the cache
 	 *
 	 * @access public
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function flush()
 	{
@@ -75,7 +75,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sName name of the session
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function delete(string $sName)
 	{
@@ -88,9 +88,8 @@ 
 	 * @access public
 	 * @param  string $sName name of the session
 	 * @param  mixed $mValue value of this sesion var
-	 * @param  int $iFlag unused
 	 * @param  int $iExpire expiration of cache
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function add($sName, $mValue, $iExpire = false)
 	{ 

Indentation +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
 	{ 
-	    return false;
+		return false;
 	}
 	
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function delete(string $sName)
 	{
-        return false;
+		return false;
 	}
 
 	/**