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

Author: Dave-Morton

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -277,16 +277,24 @@ function parse_get_tag($convoArr, $element, $parentName, $level)
       $response = 'undefined';
     if (empty ($response))
     {
-      $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))
+      
+      if((isset($convoArr['client_properties'][(string)$var_name])) && ($convoArr['client_properties'][(string)$var_name]!=""))
       {
-        $row = mysql_fetch_assoc($result);
-        $response = $row['value'];
-      }
-      else $response = 'undefined';
-      mysql_free_result($result);
+          $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);
+	}
     }
     runDebug(__FILE__, __FUNCTION__, __LINE__, "The value for $var_name is $response.", 4);
     return $response;

chatbot/core/conversation/intialise_conversation.php

@@ -422,18 +422,19 @@ function log_conversation_state($convoArr)
   **/
   function get_conversation_state($convoArr)
   {
-    global $con, $dbn;
+    global $con, $dbn,$unknown_user;
     runDebug(__FILE__, __FUNCTION__, __LINE__, "getting state", 4);
     $user_id = $convoArr['conversation']['user_id'];
     $sql = "SELECT * FROM `$dbn`.`users` WHERE `id` = '$user_id' LIMIT 1";
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Getting conversation state SQL: $sql", 3);
     $result = db_query($sql, $con);
     if (($result) && (mysql_num_rows($result) > 0))
     {
-      $row = mysql_fetch_assoc($result);
-      $convoArr = unserialize($row['state']);
-      $convoArr['conversation']['user_name'] = $row['user_name'];
-      $convoArr['client_properties']['name'] = $row['user_name'];
+      	$row = mysql_fetch_assoc($result);
+      	$convoArr = unserialize($row['state']);
+    	$user_name = (!empty ($row['user_name'])) ? $row['user_name'] : $unknown_user;
+    	$convoArr['conversation']['user_name'] = $user_name;
+    	$convoArr['client_properties']['name'] = $user_name;
     }
     mysql_free_result($result);
     return $convoArr;
@@ -450,7 +451,7 @@ function check_set_bot($convoArr)
   {
     global  $form_vars;
     runDebug(__FILE__, __FUNCTION__, __LINE__, 'Checking and/or setting the current bot.', 2);
-    global $con, $dbn, $bot_id, $error_response, $format;
+    global $con, $dbn, $bot_id, $error_response, $format,$unknown_user;
     //check to see if bot_id has been passed if not load default
     if ((isset ($form_vars['bot_id'])) && (trim($form_vars['bot_id']) != ""))
     {
@@ -473,9 +474,11 @@ function check_set_bot($convoArr)
       $row = mysql_fetch_assoc($result);
       $bot_name = $row['bot_name'];
       $error_response = $row['error_response'];
+      $unknown_user = $row['unknown_user'];
       $convoArr['conversation']['bot_name'] = $bot_name;
       $convoArr['conversation']['bot_id'] = $bot_id;
       $convoArr['conversation']['format'] = $row['format'];
+      $convoArr['conversation']['unknown_user'] = $unknown_user;
       runDebug(__FILE__, __FUNCTION__, __LINE__, "BOT ID: $bot_id", 2);
     }
     else