Add email address request when creating a sflphone.org account

Signed-off-by: Cyrille Béraud <cyrille.béraud@savoirfairelinux.com>

sflphone-gtk/src/assistant.h

@@ -41,6 +41,7 @@ struct _wizard
   GtkWidget *account_type;
   GtkWidget *protocols;
   GtkWidget *sip;
+  GtkWidget *email;
   GtkWidget *iax;
   /** Page 2 - SIP account creation */
   GtkWidget *sip_account;
@@ -100,6 +101,7 @@ GtkWidget* build_nat_settings( void );
 GtkWidget* build_iax_account_configuration( void );
 GtkWidget* build_summary( void );
 GtkWidget* build_registration_error( void );
+GtkWidget* build_email_configuration( void );
 GtkWidget* build_sfl_or_account (void);
 
 /**

sflphone-gtk/src/reqaccount.c

@@ -99,12 +99,14 @@ int req(char *host, int port, char *req, char *ret) {
   return 0;
 }
 
-rest_account get_rest_account(char *host) {
+rest_account get_rest_account(char *host,char *email) {
   char ret[4096];
   rest_account ra;
   bzero(ret, sizeof(ret));
 	printf("HOST: %s\n", host);
-  if (req(host, 80, "GET /rest/accountcreator", ret) != -1) {
+	strcpy(ret,"GET /rest/accountcreator?email=");
+	strcat(ret, email);
+  if (req(host, 80, ret, ret) != -1) {
     strcpy(ra.user, strtok(ret, "\n"));
     strcpy(ra.passwd, strtok(NULL, "\n"));\
     ra.success = 1;
@@ -120,7 +122,7 @@ rest_account get_rest_account(char *host) {
 #ifdef BUILD_EXAMPLE
 
 int main (void) {
-  rest_account acc = get_rest_account("sip.sflphone.org");
+  rest_account acc = get_rest_account("sip.sflphone.org","email@email.com");
   if (acc.success) {
     puts(acc.user);
     puts(acc.passwd);

sflphone-gtk/src/reqaccount.h

 /*
- *  Copyright (C) 2009 Jean Schurger <jean@schurger.org>
- *  and Savoir-Faire Linux inc.
+ *  Copyright (C) 2009 Savoir-faire Linux inc. 
+ *  Author Jean Schurger <jean.schurger@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,4 +24,4 @@ typedef struct {
   char passwd[200];
 } rest_account;
 
-rest_account get_rest_account(char *host);
+rest_account get_rest_account(char *host, char *email);

www/contact.php

@@ -11,7 +11,7 @@ include('include/header.php');
                                     <tbody>
                                     <tr>
                                     	<td >
-                                            <h5>SAVOIR-FAIRE LINUX - À MONTRÉAL</h5>                 	
+                                            <h5>SAVOIR-FAIRE LINUX - IN MONTREAL</h5>                 	
                                             <p>7275 Saint Urbain Bureau 306</p>
                                             <p>Montréal (Québec) H2R 2Y5</p>
                                             <p>Tél. (514) 276-5468</p>
@@ -22,7 +22,7 @@ include('include/header.php');
 
                                     	</td >
                                         <td >  
-                                    	    <h5>À QUÉBEC :</h5>
+                                    	    <h5>IN QUEBEC :</h5>
                                             <p>275, rue du Parvis </p>
                                             <p>Bureau 310 </p>
                                             <p>Québec (Québec) G1K 6G7 </p>
@@ -34,7 +34,7 @@ include('include/header.php');
                                     </tr> 
                                     <tr> 
                                         <td > 
-                                            <h5>À OTTAWA / Gatineau :</h5>
+                                            <h5>IN OTTAWA / Gatineau :</h5>
                                             <p>151, rue Slater</p>
                                             <p>Bureau 504</p>
                                             <p>Ottawa, ON, K1P 5H3</p>