Cleanup: reservation_session.php is not following programming style

The referenced code is not calling unset() as necessary according to this projects coding practices.

diff --git a/program/reservation/reservation_session.php b/program/reservation/reservation_session.php
index 230e7f9c0f076a442ae63cc826a61db01eb9737d..f9c07ecfef1be77644bd9269c06a6695cf61e0aa 100644 (file)
--- a/program/reservation/reservation_session.php
+++ b/program/reservation/reservation_session.php
@@ -101,25 +101,34 @@
    *   FALSE with error bit set is returned on error.
    */
   function reservation_ensure_user_account($settings, $user_name) {
-    $socket_family = AF_INET;
-    $socket_protocol = SOL_TCP;
-    $socket_type = SOCK_STREAM;
+    if (!is_array($settings)) {
+      return c_base_return_error::s_false();
+    }
 
-    $packet_size_target = 63;
-    $packet_size_client = 1;
+    if (!is_string($user_name)) {
+      return c_base_return_error::s_false();
+    }
 
-    $socket = socket_create($socket_family, $socket_type, $socket_protocol);
+    $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     if ($socket === FALSE) {
       socket_close($socket);
+      unset($socket);
+
       return c_base_return_error::s_false();
     }
 
     $connected = socket_connect($socket, $settings['database_create_account_host'], $settings['database_create_account_port']);
     if ($connected === FALSE) {
       socket_close($socket);
+      unset($socket);
+      unset($connected);
+
       return c_base_return_error::s_false();
     }
 
+    $packet_size_target = 63;
+    $packet_size_client = 1;
+
     $name_length = strlen(trim($user_name));
     $difference = $packet_size_target - $name_length;
 
@@ -132,14 +141,30 @@
     }
 
     $written = socket_write($socket, $packet, $packet_size_target);
+
+    unset($packet);
+    unset($packet_size_target);
+    unset($name_length);
+    unset($difference);
+
     if ($written === FALSE) {
       socket_close($socket);
+      unset($written);
+      unset($socket);
+      unset($packet_size_client);
+
       return c_base_return_error::s_false();
     }
+    unset($written);
 
     $response = socket_read($socket, $packet_size_client);
     socket_close($socket);
+    unset($socket);
+    unset($packet_size_client);
+
     if (!is_string($response) || strlen($response) == 0) {
+      unset($response);
+
       return c_base_return_error::s_false();
     }
 
@@ -147,6 +172,8 @@
     $response_packet = unpack('C', $response);
     $response_value = (int) $response_packet[1];
 
+    unset($response);
+
     // response codes as defined in the c source file:
     //    0 = no problems detected.
     //    1 = invalid user name, bad characters, or name too long.