first bits of working FRI! woop!

2 files changed, 14 insertions, 6 deletions

diff --git a/fs_selfservice/fri/includes/login.php b/fs_selfservice/fri/includes/login.php
index d91b711a4..41bb7a64d 100644
--- a/fs_selfservice/fri/includes/login.php
+++ b/fs_selfservice/fri/includes/login.php
@@ -280,33 +280,40 @@ class Login {
       }
 
       // freeside login
-      $freeside = new FreesideSelfService()
+      $freeside = new FreesideSelfService();
       $domain = 'svc_phone';
       $response = $freeside->login( array( 
-        'username' => strtolower($_username),
+        'username' => strtolower($username),
         'domain'   => $domain,
         'password' => strtolower($password),
       ) );
       error_log("[login] received response from freeside: $response");
       $error = $response['error'];
 
-      if ( ! $error ) {
+      if ( ! $error && $response['session_id'] ) {
 
           // sucessful freeside login
           error_log("[login] logged into freeside with session_id=$session_id");
       
           // store session id in your session store, to be used for other calls
           //$fs_session_id = $response['session_id'];
-          $_SESSION['fs_session'] = $response['session_id'];
+          $_SESSION['freeside_session_id'] = $response['session_id'];
+
+          $customer_info = $freeside->customer_info( array(
+            'session_id' => $_SESSION['freeside_session_id'] ,
+          ) );
+          //XXX error checking here too
+          $displayname = $customer_info['name'];
       
       } else {
       
           // unsucessful login
           error_log("[login] error logging into freeside: $error");
           $auth = false;
+          $extension = '';
 
           // display error message to user
-          $_SESSION=['ari_error'] = _("Incorrect Username or Password");
+          $_SESSION['ari_error'] = _("Incorrect Username or Password");
       
       }
 
diff --git a/fs_selfservice/fri/includes/main.conf.php b/fs_selfservice/fri/includes/main.conf.php
index 31592cac6..cedf60cc6 100644
--- a/fs_selfservice/fri/includes/main.conf.php
+++ b/fs_selfservice/fri/includes/main.conf.php
@@ -108,7 +108,8 @@ $ARI_DEFAULT_ADMIN_PAGE = "callmonitor";
 # sets the default user page
 #   option: Comma delimited list of module names (ie voicemail,callmonitor,help,settings)
 #
-$ARI_DEFAULT_USER_PAGE = "voicemail";
+#$ARI_DEFAULT_USER_PAGE = "voicemail";
+$ARI_DEFAULT_USER_PAGE = "dashboard";
 
 #
 # enables ajax page refresh