--- D:\src\drupal\4.7\modules\smsgateway\smsgateway.module	Mon Dec 18 22:27:38 2006 UTC
+++ D:\src\htdocs\sms\modules\tools\smsgateway\smsgateway.module	Mon Jan 29 16:02:04 2007 UTC
@@ -93,7 +93,9 @@
  *   the response received from the gateway.
  */
 function _smsgateway_smslog($destination, $message, $response, $incoming = false) {
-  db_query('INSERT INTO {smslog} (direction, number, message, response, timestamp) VALUES ( \'%s\', \'%s\', \'%s\', \'%s\', \'%d\')', $incoming ? 'IN' : 'OUT', $destination, $message, $response, time());
+  $id = db_next_id('{smslog}_sid');
+  db_query('INSERT INTO {smslog} (sid, direction, number, message, response, timestamp) VALUES ( \'%d\', \'%s\', \'%s\', \'%s\', \'%s\', \'%d\')', $id, $incoming ? 'IN' : 'OUT', $destination, $message, $response, time());
+  return $id;
 }
 
 /**
@@ -111,7 +113,7 @@
     _smsgateway_ensuregateway( $smsgateway_gateway);
     $message = _smsgateway_invoke('parsereceived', $smsgateway_gateway);
 
-    _smsgateway_smslog( $message['sender_number'], $message['body'], $message['timestamp'], true);
+    $message['sid'] = _smsgateway_smslog( $message['sender_number'], $message['body'], $message['timestamp'], true);
 
     module_invoke_all( 'smsgateway_newmessage', $message);
 
@@ -303,7 +305,7 @@
     $message['message_body'] = $message_body;
     _smsgateway_ensuregateway( $smsgateway_gateway);
     $result = _smsgateway_invoke('sendsingle', $smsgateway_gateway, $smssettings, $message);
-    _smsgateway_smslog($destination_number, $message_body, $result['response']);
+    $result['sid'] = _smsgateway_smslog($destination_number, $message_body, $result['response']);
   }
   else {
     $result = array();
@@ -337,7 +339,7 @@
     _smsgateway_ensuregateway( $smsgateway_gateway);
     $result = _smsgateway_invoke('sendbatch', $smsgateway_gateway, $smssettings, $sms_messages);
     foreach( $sms_messages as $msgid => $message) {
-      _smsgateway_smslog($message['destination_number'], $message['message_body'], $result[ $msgid]);
+      $result[$msgid] = _smsgateway_smslog($message['destination_number'], $message['message_body'], $result[ $msgid]);
     }
   }
   else {