Merge branch 'master' of https://github.com/Program-O/Program-O

Author: Dave-Morton

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -34,6 +34,9 @@ function parse_aiml_as_XML($convoArr)
     $botsay = trim(implode_recursive(' ', $responseArray, __FILE__, __FUNCTION__, __LINE__));
     $botsay = str_replace(' .', '.', $botsay);
     $botsay = str_replace('  ', ' ', $botsay);
+    $botsay = str_replace(' ?', '?', $botsay);
+    $botsay = str_replace(' ,', ',', $botsay);
+    $botsay = str_replace(' s ', 's ', $botsay);
     $convoArr['aiml']['parsed_template'] = $botsay;
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Completed parsing the template. The bot will say: $botsay", 4);
     return $convoArr;
@@ -277,24 +280,17 @@ function parse_get_tag($convoArr, $element, $parentName, $level)
       $response = 'undefined';
     if (empty ($response))
     {
-      
-      if((isset($convoArr['client_properties'][(string)$var_name])) && ($convoArr['client_properties'][(string)$var_name]!=""))
-      {
-          $response = $convoArr['client_properties'][(string)$var_name];
-      } else {
-      
-	      $sql = "select `value` from `$dbn`.`client_properties` where `user_id` = $user_id and `bot_id` = $bot_id and `name` = '$var_name';";
-	      runDebug(__FILE__, __FUNCTION__, __LINE__, "Checking the DB for $var_name - sql:\n$sql", 3);
-	      $result = db_query($sql, $con);
-	      if (($result) and (mysql_num_rows($result) > 0)) {
-	        $row = mysql_fetch_assoc($result);
-	        $response = $row['value'];
-	      }
-	      else {
-	       $response = 'undefined'; 
-	       }
-	      mysql_free_result($result);
+     	$sql = "select `value` from `$dbn`.`client_properties` where `user_id` = $user_id and `bot_id` = $bot_id and `name` = '$var_name';";
+	runDebug(__FILE__, __FUNCTION__, __LINE__, "Checking the DB for $var_name - sql:\n$sql", 3);
+	$result = db_query($sql, $con);
+	if (($result) and (mysql_num_rows($result) > 0)) {
+		$row = mysql_fetch_assoc($result);
+		$response = $row['value'];
+	}
+	else {
+		$response = 'undefined'; 
 	}
+	mysql_free_result($result);	
     }
     runDebug(__FILE__, __FUNCTION__, __LINE__, "The value for $var_name is $response.", 4);
     return $response;
@@ -318,8 +314,6 @@ function parse_set_tag($convoArr, $element, $parentName, $level)
     if ($var_name == 'name')
     {
       $user_name = $var_value;
-      $convoArr['client_properties']['name'] = $var_value;
-      $convoArr['conversation']['user_name'] = $var_value;
       $sql = "UPDATE `$dbn`.`users` set `user_name` = '$var_value' where `id` = $user_id;";
       $sql = mysql_real_escape_string($sql);
       runDebug(__FILE__, __FUNCTION__, __LINE__, "Updating user name in the DB. SQL:\n$sql", 3);

chatbot/core/user/handle_user.php

@@ -94,14 +94,22 @@ function intisaliseUser($convoArr)
   }
 
   $sql = "INSERT INTO `$dbn`.`users` (`id`, `user_name`, `session_id`, `bot_id`, `chatlines` ,`ip` ,`referer` ,`browser` ,`date_logged_on` ,`last_update`, `state`)
-  VALUES ( NULL , '$unknown_user', '$convo_id', $bot_id, '0', '$sa', '$sr', '$sb', CURRENT_TIMESTAMP , '0000-00-00 00:00:00', '')";
+  VALUES ( NULL , '$unknown_user', '$convo_id', $bot_id, '0', '$sa', '$sr', '$sb', CURRENT_TIMESTAMP , CURRENT_TIMESTAMP, '')";
 
   mysql_query($sql,$con) or trigger_error('Error trying to add user. Error = ' . mysql_error());
   $user_id = mysql_insert_id($con);
   $convoArr['conversation']['user_id'] = $user_id;
   $convoArr['conversation']['totallines'] = 0;
   runDebug( __FILE__, __FUNCTION__, __LINE__, "intisaliseUser #$user_id SQL: $sql",3);
 
+  
+    //add the username to the client properties....
+  $sql = "INSERT INTO `$dbn`.`client_properties` (`id`,`user_id`,`bot_id`,`name`,`value`)
+  VALUES ( NULL , '$user_id', $bot_id, 'name', '$unknown_user')";
+
+  mysql_query($sql, $con) or trigger_error('Error trying to add username to client properties. Error = ' . mysql_error());
+  
+  
   return $convoArr;
 }