@@ -187,34 +187,28 @@ sub sql_request ($) {

 sub massive_send_sms {

     my $request = shift;

-    my @results = sql_request("SELECT * FROM __tables__ WHERE phone = '$request->{phone}' AND table_id = '$request->{table}'");

-    if (scalar(@results) == 1) {

-        if ($to_gtalksms_queue->pending() > 0) {

-            $to_gtalksms_queue->insert(0, [$request->{phone}, "un envoi massif est déjà en cours, lancé par " . $cfg::config{last_sender} . ", reste " . $to_gtalksms_queue->pending() . ", annulation"]);

-            return;

+    if ($to_gtalksms_queue->pending() > 0) {

+        $to_gtalksms_queue->insert(0, [$request->{phone}, "un envoi massif est déjà en cours, lancé par " . $cfg::config{last_sender} . ", reste " . $to_gtalksms_queue->pending() . ", annulation"]);

+        return;

+    }

+    $cfg::config{last_sender} = $request->{phone_owner};

+    my @results = sql_request("SELECT phone, firstname, gender FROM " . $cfg::config{table} . " WHERE " . $cfg::config{group_prefix} . $request->{table} . " > '0'");

+    my $qty = scalar(@results);

+    my $start_msg = "envoi de " . $qty . " SMS (fin prévue entre ". strftime("%H:%M", localtime(time() + $qty * 60)) . " et " . strftime("%H:%M", localtime(time() + $qty * 90)) . ")";

+    $to_gtalksms_queue->enqueue([$request->{phone}, $start_msg]);

+    foreach my $contact (@results) {

+        $contact->{phone} =~ s/[\s\.]//g;

+        $_ = $request->{body};

+        s/\@prénom/$contact->{firstname}/g;

+        if ($contact->{gender} eq 'F') {

+            s/\@\(\s*(\w+)\s*,\s*\w+\s*\)/$1/g;

         }

-        $cfg::config{last_sender} = $request->{phone_owner};

-        my @results = sql_request("SELECT * FROM $request->{table}");

-        my $qty = scalar(@results);

-        my $start_msg = "envoi de " . $qty . " SMS (fin prévue entre ". strftime("%H:%M", localtime(time() + $qty * 60)) . " et " . strftime("%H:%M", localtime(time() + $qty * 90)) . ")";

-        $to_gtalksms_queue->enqueue([$request->{phone}, $start_msg]);

-        foreach my $contact (@results) {

-            $contact->{phone} =~ s/[\s\.]//g;

-            $_ = $request->{body};

-            s/\@prénom/$contact->{firstname}/g;

-            if ($contact->{gender} eq 'F') {

-                s/\@\(\s*(\w+)\s*,\s*\w+\s*\)/$1/g;

-            }

-            else {

-                s/\@\(\s*\w+\s*,\s*(\w+)\s*\)/$1/g;

-            }

-            $to_gtalksms_queue->enqueue([$contact->{phone}, $_])

+        else {

+            s/\@\(\s*\w+\s*,\s*(\w+)\s*\)/$1/g;

         }

-        $to_gtalksms_queue->enqueue([$request->{phone}, "envoi des SMS terminé !"]);

-    }

-    else {

-        $to_gtalksms_queue->enqueue([$request->{phone}, "pas la bonne base $request->{table} pour $request->{phone}"]);

+        $to_gtalksms_queue->enqueue([$contact->{phone}, $_])

     }

+    $to_gtalksms_queue->enqueue([$request->{phone}, "envoi des SMS terminé !"]);

 }

 sub control_sms_flow {

@@ -283,10 +277,9 @@ sub wait_open_time ($$) {

 sub xmpp_send_sms {

     while (my $ref = $to_gtalksms_queue->dequeue) {

-        wait_open_time(21, 8); # pas d'envoi entre 21h et 8h

+        wait_open_time($cfg::config{close_hour}, $cfg::config{begin_hour}); # pas d'envoi entre 21h et 8h

 #        TODO lock($next_sms);

 #        TODO $next_sms = $$ref[0];

-#        control_sms_flow(\$$ref[1], 30, 1800); # pas plus de 30 messages de 140 caractères par demi-heure

         xmpp_send(\"sms:$$ref[0]:$$ref[1]");

         log_bot("envoi à $$ref[0] : $$ref[1]");

         sleep 60 + int(rand(30)); # en attendant la maîtrise de cond_wait et cond_signal: cond_signal() called on unlocked variable at ./bot line 348

@@ -296,79 +289,46 @@ sub xmpp_send_sms {

 sub is_authorized {

     my ($request) = @_;

-    my @results = sql_request("SELECT * FROM __authorized__ WHERE phone = '$request->{phone}'");

+    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$request->{phone}'");

     if (scalar(@results) == 1) {

-        $request->{address} = $results[0]->{address};

-        return 1;

+        my $_results = $results[0];

+        foreach my $column (keys(%$_results)) {

+            if ($column =~ /^$cfg::config{group_prefix}/) {

+                if ($results[0]->{$column} == 2) {

+                    $request->{address} = $results[0]->{address};

+                    return 1; # true

+                }

+            }

+        }

+        return 0; # false

     }

     else {

-        return 0;

+        return 0; # false

     }

 }

 sub authorized_on_table {

     my %request = @_;

-    $request{writeable} = (defined($request{writeable})) ? "AND write_auth = '1'" : "";

-    my @results = sql_request("SELECT * FROM __tables__ WHERE table_id = '$request{table}' AND phone = '$request{id}' $request{writeable}");

-    if (scalar(@results) == 0) {

-        my @list = sql_request("SELECT * FROM __tables__ WHERE phone = '$request{id}'");

-        my $list_str = "";

-        foreach (@list) {

-            $list_str .= "\n- $_->{table_id}";

+    my $table_name = $cfg::config{group_prefix} . $request{groupe};

+    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$request{id}'");

+    if (scalar(@results) == 1) {

+        if (! defined($results[0]->{$table_name})) {

+            $request{error} = "le groupe $request{groupe} n'existe pas";

+            $to_gtalksms_queue->insert(0, [$request{id}, $request{error}]);

+            return 0; # false

         }

-        ${$request{error}} = sprintf("%s%s%s%s", 

-                "désolé, $request{table} n'est pas autorisé pour toi", 

-                ($request{writeable} ne "")? " en écriture" : "", 

-                "... ou n'existe pas:",

-                $list_str);

-    }

-    return (scalar(@results) == 1);

-}

-

-sub is_table {

-    my %request = @_;

-    my @results = sql_request("SHOW TABLES WHERE Tables_in_sms = '$request{table}'");

-    if (scalar(@results) == 0) {

-        ${$request{error}} = "$request{table} n'existe pas... essaie la commande 'liste' pour voir tes tables";

     }

-    return (scalar(@results) == 1);

-}

-

-sub copy {

-    my $request = shift;

-    my $rmsg = "";

-    if (authorized_on_table(table => $request->{origin}, id => $request->{phone}, error => \$rmsg)) {

-        if (! is_table(table => $request->{destination}, error => \$rmsg)) {

-            sql_request("CREATE TABLE $request->{destination} SELECT * FROM $request->{origin}");

-            sql_request("INSERT INTO __tables__ (phone,table_id,creation_date,update_date,comment,write_auth) values('"

-                    . $request->{phone} . "','"

-                    . $request->{destination} . "','"

-                    . strftime("%Y-%m-%d %H:%M:%S", localtime) . "','"

-                    . strftime("%Y-%m-%d %H:%M:%S", localtime) . "','"

-                    . $request->{comment} . "','1')"

-                    );

-            $rmsg = "copie de $request->{origin} vers $request->{destination} faite";

-        }

-        else { # on change le message d'erreur fourni par is_table()

-            $rmsg = "$request->{destination} existe déjà !"; 

+    @results = sql_request("SELECT $table_name FROM $cfg::config{table} WHERE phone = '$request{id}'");

+    if (scalar(@results) == 1) {

+        if ($results[0]->{$table_name} != 2) {

+            $request{error} = "désolé, écrire au groupe $request{groupe} n'est pas autorisé pour toi";

+            $to_gtalksms_queue->insert(0, [$request{id}, $request{error}]);

+            return 0; # false

         }

-    }

-    $to_gtalksms_queue->enqueue([$request->{phone}, $rmsg]);

-}

-

-sub insert {

-    my $request = shift;

-    my $rmsg = "";

-    if (authorized_on_table(table => $request->{table}, id => $request->{phone}, writeable => 1, error => \$rmsg)) {

-        my $contact_number = 0;

-        foreach my $contact (split("\n", $request->{body})) {

-            my ($firstname, $lastname, $phone, $gender) = split(";", $contact);

-            sql_request("INSERT INTO $request->{table} (firstname,lastname,phone,gender) values ($firstname, $lastname, $phone, $gender)");

-            $contact_number++;

+        else {

+            return 1; # true

         }

-        $rmsg = "$contact_number contacts ajoutés dans $request->{table}"

     }

-    $to_gtalksms_queue->enqueue([$request->{phone}, $rmsg]);

 }

 sub react_on_message {

@@ -392,11 +352,11 @@ sub from_gtalksms_parse {

     while (my $msg = $from_gtalksms_queue->dequeue) {

         my %request = (body => $msg->GetBody);

         my %part_from_gtalksms = (

-            $cfg::gtalksms{"from"} => sub { # Message de +33612345678 :

+            $cfg::gtalksms{from} => sub { # Message de +33612345678 :

                 $request{phone} = "0" . $1;

                 $request{phone_owner} = '';

                 $request{email} = '';

-                my @results = sql_request("SELECT * FROM section WHERE phone = '$request{phone}'");

+                my @results = sql_request("SELECT * FROM " . $cfg::config{table} . " WHERE phone = '$request{phone}'");

                 my $number_of_candidates = @results;

                 $number_of_candidates == 0 and return;

                 $request{phone_owner} .= '(';

@@ -405,7 +365,7 @@ sub from_gtalksms_parse {

                     --$number_of_candidates > 0 and $request{phone_owner} .= ' ou ';

                     $request{email} = $_->{email};

                 } 

-                $request{"phone_owner"} .= ')';

+                $request{phone_owner} .= ')';

                 log_bot("message de $request{phone} $request{phone_owner}");

             },

             $cfg::gtalksms{"delivered"} => sub { # SMS "un contenu de SMS" pour 0612345678 délivré.

@@ -460,21 +420,13 @@ sub from_gtalksms_parse {

             },

             $cfg::user{"message de groupe"} => sub {

                 $request{table} = lc $1;

-                &massive_send_sms(\%request);

+                if (authorized_on_table(groupe => $request{table}, id => $request{phone})) {

+                    &massive_send_sms(\%request);

+                }

             },

             $cfg::user{"message pour un destinataire"} => sub {

                 $to_gtalksms_queue->enqueue([$1, $2]);

             },

-            $cfg::user{"copie d'une base"} => sub {

-                $request{origin} = lc $1;

-                $request{destination} = lc $2;

-                $request{comment} = $3 =~ s/^\s*//r;

-                &copy(\%request);

-            },

-            $cfg::user{"ajout d'une entrée dans un base"} => sub {

-                $request{table} = lc $1;

-                &insert(\%request);

-            },

             $cfg::user{"ping"} => sub {

                 my $envoi_en_cours = "";

                 if ($to_gtalksms_queue->pending() > 0) {

@@ -547,5 +499,10 @@ $roster->add($cfg::config{xmpp}->{phoneBuddy});

 while(defined($bot->Process())) { 

     $bot->RosterGet();

     my $status = $roster->query($cfg::config{xmpp}->{phoneBuddy},'resources');

-    $phone_status = $status->{GTalkSMS}->{status} =~ s/^GTalkSMS - //r if $status;

+    if ($status) {

+        $phone_status = $status->{GTalkSMS}->{status} =~ s/^GTalkSMS - //r;

+    }

+    else {

+        $phone_status = "";

+    }

 }