Session Checking & Readme

readme.md

@@ -15,7 +15,7 @@ Usage
 The [examples][examples] are a good place to start. The minimal you'll need to
 have is:
 
-    require 'facebook-php-sdk/src/facebook.php';
+    require_once 'facebook-php-sdk/src/facebook.php';
 
     $facebook = new Facebook(array(
       'appId'  => 'YOUR_APP_ID',

src/base_facebook.php

@@ -130,7 +130,7 @@ abstract class BaseFacebook
   /**
    * Default options for curl.
    */
-  public static $CURL_OPTS = array(
+  public $CURL_OPTS = array(
     CURLOPT_CONNECTTIMEOUT => 10,
     CURLOPT_RETURNTRANSFER => true,
     CURLOPT_TIMEOUT        => 60,
@@ -150,7 +150,7 @@ abstract class BaseFacebook
   /**
    * Maps aliases to Facebook domains.
    */
-  public static $DOMAIN_MAP = array(
+  public $DOMAIN_MAP = array(
     'api'         => 'https://api.facebook.com/',
     'api_video'   => 'https://api-video.facebook.com/',
     'api_read'    => 'https://api-read.facebook.com/',
@@ -231,6 +231,14 @@ public function __construct($config) {
     if (isset($config['trustForwarded']) && $config['trustForwarded']) {
       $this->trustForwarded = true;
     }
+    if(isset($config['useragent'])) {
+        $CURL_OPTS = array(
+          CURLOPT_CONNECTTIMEOUT => 10,
+          CURLOPT_RETURNTRANSFER => true,
+          CURLOPT_TIMEOUT        => 60,
+          CURLOPT_USERAGENT      => $config['useragent'],
+      );
+    }
     $state = $this->getPersistentData('state');
     if (!empty($state)) {
       $this->state = $state;

src/facebook.php

@@ -45,7 +45,7 @@ class Facebook extends BaseFacebook
    * @see BaseFacebook::__construct in facebook.php
    */
   public function __construct($config) {
-    if (!session_id()) {
+    if (strlen(session_id()) > 1)  {
       session_start();
     }
     parent::__construct($config);